You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/29 10:29:07 UTC
[tomcat] branch 8.5.x updated: Fix various Checkstyle and IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new ced38015ff Fix various Checkstyle and IDE warnings
ced38015ff is described below
commit ced38015fff60f3734b6e40f790bca608f81d459
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 | 5 +++--
.../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, 64 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 2dc44e9adb..796b06e9b8 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 ac247d24b6..292483a6fd 100644
--- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
+++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
@@ -27,6 +27,9 @@ import java.util.Map;
import javax.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;
@@ -39,8 +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;
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org