This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 430ae2ec0a Fix various Checkstyle and IDE warnings 430ae2ec0a is described below commit 430ae2ec0a6c8de79a883bdbcab0b7f19e5b0a36 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Jun 29 11:27:20 2023 +0100 Fix various Checkstyle and IDE warnings --- .../catalina/core/PropertiesRoleMappingListener.java | 2 +- .../catalina/core/TestPropertiesRoleMappingListener.java | 9 +++++---- .../classes/com/example/prefixed-role-mapping.properties | 15 +++++++++++++++ .../WEB-INF/classes/com/example/role-mapping.properties | 15 +++++++++++++++ .../WEB-INF/prefixed-role-mapping.properties | 15 +++++++++++++++ test/webapp-role-mapping/WEB-INF/role-mapping.properties | 15 +++++++++++++++ 6 files changed, 66 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java index 60b135d27f..10a5d7215c 100644 --- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java +++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java @@ -160,7 +160,7 @@ public class PropertiesRoleMappingListener implements LifecycleListener { } if (log.isDebugEnabled()) { - log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount", linkCount)); + log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount", Integer.valueOf(linkCount))); } } } diff --git a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java index 9ba4fa38ce..04d0ed18c4 100644 --- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java +++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java @@ -25,6 +25,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import jakarta.servlet.http.HttpServletRequest; + +import org.junit.Assert; +import org.junit.Test; + import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.authenticator.BasicAuthenticator; @@ -37,10 +42,6 @@ import org.apache.tomcat.util.codec.binary.Base64; import org.apache.tomcat.util.descriptor.web.LoginConfig; import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityConstraint; -import org.junit.Assert; -import org.junit.Test; - -import jakarta.servlet.http.HttpServletRequest; public class TestPropertiesRoleMappingListener extends TomcatBaseTest { diff --git a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties index f2510d7841..2758c7fef2 100644 --- a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties +++ b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties @@ -1,2 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + app-roles.admin=de25f8f5-e534-4980-9351-e316384b1127 app-roles.user=13f6b886-cba8-4b5b-9a1b-06a6fe533356 diff --git a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties index b186493cf5..5091905865 100644 --- a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties +++ b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties @@ -1,2 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + admin=de25f8f5-e534-4980-9351-e316384b1127 user=13f6b886-cba8-4b5b-9a1b-06a6fe533356 diff --git a/test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties b/test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties index f2510d7841..2758c7fef2 100644 --- a/test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties +++ b/test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties @@ -1,2 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + app-roles.admin=de25f8f5-e534-4980-9351-e316384b1127 app-roles.user=13f6b886-cba8-4b5b-9a1b-06a6fe533356 diff --git a/test/webapp-role-mapping/WEB-INF/role-mapping.properties b/test/webapp-role-mapping/WEB-INF/role-mapping.properties index b186493cf5..5091905865 100644 --- a/test/webapp-role-mapping/WEB-INF/role-mapping.properties +++ b/test/webapp-role-mapping/WEB-INF/role-mapping.properties @@ -1,2 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + admin=de25f8f5-e534-4980-9351-e316384b1127 user=13f6b886-cba8-4b5b-9a1b-06a6fe533356 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org