(tomcat) branch 8.5.x updated: Fix 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 d81e4480e6 Fix IDE warnings
d81e4480e6 is described below
commit d81e4480e6c269190499e6e47a4293e753e0d003
Author: Mark Thomas
AuthorDate: Tue Mar 12 11:37:15 2024 +
Fix IDE warnings
---
java/org/apache/catalina/realm/RealmBase.java | 2 ++
java/org/apache/catalina/security/SecurityListener.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index b558106fd5..5a82b43667 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1385,6 +1385,8 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements org.apache
*
*
* @param args The parameters passed on the command line
+ *
+ * @throws IOException If an error occurs reading the password file
*/
public static void main(String args[]) throws IOException {
diff --git a/java/org/apache/catalina/security/SecurityListener.java
b/java/org/apache/catalina/security/SecurityListener.java
index adececd631..e92f7fbbc4 100644
--- a/java/org/apache/catalina/security/SecurityListener.java
+++ b/java/org/apache/catalina/security/SecurityListener.java
@@ -151,7 +151,7 @@ public class SecurityListener implements LifecycleListener {
} catch (NumberFormatException nfe) {
// Just use the default and warn the user
log.warn(sm.getString("SecurityListener.buildDateAgeUnreadable",
-ageDays, DEFAULT_BUILD_DATE_WARNING_AGE_DAYS));
+ageDays,
String.valueOf(DEFAULT_BUILD_DATE_WARNING_AGE_DAYS)));
}
}
@@ -235,7 +235,7 @@ public class SecurityListener implements LifecycleListener {
old.add(Calendar.DATE, -allowedAgeDays); // Subtract X days
from today
if (buildDate.before(old.getTime())) {
-log.warn(sm.getString("SecurityListener.buildDateIsOld",
allowedAgeDays));
+log.warn(sm.getString("SecurityListener.buildDateIsOld",
String.valueOf(allowedAgeDays)));
}
} catch (ParseException pe) {
log.warn(sm.getString("SecurityListener.buildDateUnreadable",
buildDateString));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix 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 8f17f57585 Fix IDE warnings
8f17f57585 is described below
commit 8f17f57585be4422cc5575b5e187befe739459c1
Author: Mark Thomas
AuthorDate: Tue Feb 13 00:07:49 2024 +
Fix IDE warnings
---
webapps/examples/WEB-INF/classes/RequestHeaderExample.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
index 0cff06402f..df2d2d51f7 100644
--- a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
+++ b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
@@ -89,7 +89,7 @@ public class RequestHeaderExample extends HttpServlet {
protected void renderHTML(HttpServletRequest request,
HttpServletResponse response)
-throws IOException, ServletException
+throws IOException
{
ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings",request.getLocale());
@@ -144,7 +144,7 @@ public class RequestHeaderExample extends HttpServlet {
}
protected void renderJSON(HttpServletRequest request, HttpServletResponse
response)
-throws IOException, ServletException
+throws IOException
{
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix 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 c98664fbfc Fix IDE warnings
c98664fbfc is described below
commit c98664fbfcf4c16b76dfd115a8f11d2b83fcdb5d
Author: Mark Thomas
AuthorDate: Sat Feb 3 10:48:27 2024 +
Fix IDE warnings
---
java/org/apache/jasper/compiler/Generator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 8d84f818a9..2b9e4636f5 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -632,7 +632,7 @@ class Generator {
// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
// contains 3 packages and is always added to the imports.
out.printin("_jspx_imports_packages = new java.util.LinkedHashSet<>(");
-out.print(Integer.valueOf(packages.size()));
+out.print(Integer.toString(packages.size()));
out.print(");");
out.println();
for (String packageName : packages) {
@@ -646,7 +646,7 @@ class Generator {
out.println();
} else {
out.printin("_jspx_imports_classes = new
java.util.LinkedHashSet<>(");
-out.print(Integer.valueOf(classes.size()));
+out.print(Integer.toString(classes.size()));
out.print(");");
out.println();
for (String className : classes) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix 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 d7a07bc446 Fix IDE warnings
d7a07bc446 is described below
commit d7a07bc4463c2992226f76488fee373e0228600f
Author: Mark Thomas
AuthorDate: Thu Sep 21 16:33:20 2023 +0100
Fix IDE warnings
---
java/org/apache/jasper/compiler/Node.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Node.java
b/java/org/apache/jasper/compiler/Node.java
index cc46b7399a..0306b16fcc 100644
--- a/java/org/apache/jasper/compiler/Node.java
+++ b/java/org/apache/jasper/compiler/Node.java
@@ -1680,7 +1680,8 @@ abstract class Node implements TagConstants {
this.nestedScriptingVars = vec;
break;
default:
-throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.varscope",
scope));
+throw new IllegalArgumentException(
+
Localizer.getMessage("jsp.error.page.invalid.varscope",
Integer.valueOf(scope)));
}
}
@@ -1702,7 +1703,8 @@ abstract class Node implements TagConstants {
vec = this.nestedScriptingVars;
break;
default:
-throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.varscope",
scope));
+throw new IllegalArgumentException(
+
Localizer.getMessage("jsp.error.page.invalid.varscope",
Integer.valueOf(scope)));
}
return vec;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix 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 4a1c7ddfaa Fix IDE warnings
4a1c7ddfaa is described below
commit 4a1c7ddfaa89d48700d80ddd240a99f4589f8bc2
Author: Mark Thomas
AuthorDate: Tue Jun 13 12:00:42 2023 +0100
Fix IDE warnings
---
.../apache/catalina/core/TestContextNamingInfoListener.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/org/apache/catalina/core/TestContextNamingInfoListener.java
b/test/org/apache/catalina/core/TestContextNamingInfoListener.java
index 875d0a574f..65f1d47e0a 100644
--- a/test/org/apache/catalina/core/TestContextNamingInfoListener.java
+++ b/test/org/apache/catalina/core/TestContextNamingInfoListener.java
@@ -16,17 +16,17 @@
*/
package org.apache.catalina.core;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.deploy.NamingResourcesImpl;
@@ -67,7 +67,7 @@ public class TestContextNamingInfoListener extends
TomcatBaseTest {
@Parameter(2)
public String displayName;
@Parameter(3)
-public Boolean emptyOnRoot;
+public boolean emptyOnRoot;
@Parameter(4)
public String expectedContextPath;
@Parameter(5)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix 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 0df94e05b0 Fix IDE warnings
0df94e05b0 is described below
commit 0df94e05b0bd2420c22036717fcb38191f23c127
Author: Mark Thomas
AuthorDate: Fri Mar 3 14:45:58 2023 +
Fix IDE warnings
---
.../apache/catalina/valves/JsonAccessLogValve.java | 46 +++---
java/org/apache/tomcat/util/json/JSONFilter.java | 6 +--
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/valves/JsonAccessLogValve.java
b/java/org/apache/catalina/valves/JsonAccessLogValve.java
index aae85b824f..c2564f9778 100644
--- a/java/org/apache/catalina/valves/JsonAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JsonAccessLogValve.java
@@ -68,28 +68,28 @@ public class JsonAccessLogValve extends AccessLogValve {
static {
// FIXME: finalize attribute names
Map pattern2AttributeName = new HashMap<>();
-pattern2AttributeName.put('a', "remoteAddr");
-pattern2AttributeName.put('A', "localAddr");
-pattern2AttributeName.put('b', "size"); /* byteSent -> size */
-pattern2AttributeName.put('B', "byteSentNC");
-pattern2AttributeName.put('D', "elapsedTime");
-pattern2AttributeName.put('F', "firstByteTime");
-pattern2AttributeName.put('h', "host");
-pattern2AttributeName.put('H', "protocol");
-pattern2AttributeName.put('l', "logicalUserName");
-pattern2AttributeName.put('m', "method");
-pattern2AttributeName.put('p', "port");
-pattern2AttributeName.put('q', "query");
-pattern2AttributeName.put('r', "request");
-pattern2AttributeName.put('s', "statusCode");
-pattern2AttributeName.put('S', "sessionId");
-pattern2AttributeName.put('t', "time"); /* dateTime -> time */
-pattern2AttributeName.put('T', "elapsedTimeS");
-pattern2AttributeName.put('u', "user");
-pattern2AttributeName.put('U', "path"); /* requestURI -> path */
-pattern2AttributeName.put('v', "localServerName");
-pattern2AttributeName.put('I', "threadName");
-pattern2AttributeName.put('X', "connectionStatus");
+pattern2AttributeName.put(Character.valueOf('a'), "remoteAddr");
+pattern2AttributeName.put(Character.valueOf('A'), "localAddr");
+pattern2AttributeName.put(Character.valueOf('b'), "size"); /* byteSent
-> size */
+pattern2AttributeName.put(Character.valueOf('B'), "byteSentNC");
+pattern2AttributeName.put(Character.valueOf('D'), "elapsedTime");
+pattern2AttributeName.put(Character.valueOf('F'), "firstByteTime");
+pattern2AttributeName.put(Character.valueOf('h'), "host");
+pattern2AttributeName.put(Character.valueOf('H'), "protocol");
+pattern2AttributeName.put(Character.valueOf('l'), "logicalUserName");
+pattern2AttributeName.put(Character.valueOf('m'), "method");
+pattern2AttributeName.put(Character.valueOf('p'), "port");
+pattern2AttributeName.put(Character.valueOf('q'), "query");
+pattern2AttributeName.put(Character.valueOf('r'), "request");
+pattern2AttributeName.put(Character.valueOf('s'), "statusCode");
+pattern2AttributeName.put(Character.valueOf('S'), "sessionId");
+pattern2AttributeName.put(Character.valueOf('t'), "time"); /* dateTime
-> time */
+pattern2AttributeName.put(Character.valueOf('T'), "elapsedTimeS");
+pattern2AttributeName.put(Character.valueOf('u'), "user");
+pattern2AttributeName.put(Character.valueOf('U'), "path"); /*
requestURI -> path */
+pattern2AttributeName.put(Character.valueOf('v'), "localServerName");
+pattern2AttributeName.put(Character.valueOf('I'), "threadName");
+pattern2AttributeName.put(Character.valueOf('X'), "connectionStatus");
PATTERNS = Collections.unmodifiableMap(pattern2AttributeName);
}
@@ -129,7 +129,7 @@ public class JsonAccessLogValve extends AccessLogValve {
@Override
protected AccessLogElement createAccessLogElement(char pattern) {
AccessLogElement ale = super.createAccessLogElement(pattern);
-String attributeName = PATTERNS.get(pattern);
+String attributeName = PATTERNS.get(Character.valueOf(pattern));
if (attributeName == null) {
attributeName = "other-" + new String(JSONFilter.escape(pattern));
}
diff --git a/java/org/apache/tomcat/util/json/JSONFilter.java
b/java/org/apache/tomcat/util/json/JSONFilter.java
index 43c23f331b..176867407d 100644
--- a/java/org/apache/tomcat/util/json/JSONFilter.java
+++ b/java/org/apache/tomcat/util/json/JSONFilter.java
@@ -29,8 +29,7 @@ public class JSONFilter {
* @return a char array with the escaped sequence
*/
public static
[tomcat] branch 8.5.x updated: Fix 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 ab31d4bc60 Fix IDE warnings
ab31d4bc60 is described below
commit ab31d4bc600e739d670912bbc902f0646ab14945
Author: Mark Thomas
AuthorDate: Thu Aug 11 16:15:06 2022 +0100
Fix IDE warnings
---
java/org/apache/catalina/users/MemoryUserDatabase.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 97e36ac3b8..5044c15db9 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -296,6 +296,7 @@ public class MemoryUserDatabase implements UserDatabase {
throw new IllegalArgumentException(msg);
}
+@SuppressWarnings("deprecation")
Group group = new MemoryGroup(this, groupname, description);
readLock.lock();
try {
@@ -321,6 +322,7 @@ public class MemoryUserDatabase implements UserDatabase {
throw new IllegalArgumentException(msg);
}
+@SuppressWarnings("deprecation")
Role role = new MemoryRole(this, rolename, description);
readLock.lock();
try {
@@ -348,6 +350,7 @@ public class MemoryUserDatabase implements UserDatabase {
throw new IllegalArgumentException(msg);
}
+@SuppressWarnings("deprecation")
User user = new MemoryUser(this, username, password, fullName);
readLock.lock();
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix 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 c0c7990 Fix IDE warnings
c0c7990 is described below
commit c0c799061091c0e5eee71be47245b14024c3051b
Author: Mark Thomas
AuthorDate: Mon May 4 15:50:10 2020 +0100
Fix IDE warnings
---
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
java/org/apache/juli/ClassLoaderLogManager.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 0aa96de..efdb8ac 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -86,7 +86,7 @@ public class RewriteRule {
* @return null if no rewrite took place
*/
public CharSequence evaluate(CharSequence url, Resolver resolver) {
-Pattern pattern = this.pattern.get();
+Pattern pattern = RewriteRule.pattern.get();
if (pattern == null) {
// Parse the pattern
int flags = 0;
@@ -94,7 +94,7 @@ public class RewriteRule {
flags |= Pattern.CASE_INSENSITIVE;
}
pattern = Pattern.compile(patternString, flags);
-this.pattern.set(pattern);
+RewriteRule.pattern.set(pattern);
}
Matcher matcher = pattern.matcher(url);
// Use XOR
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index cf3ad4c..c907056 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
return null;
}
-String prefix = this.prefix.get();
+String prefix = ClassLoaderLogManager.prefix.get();
String result = null;
// If a prefix is defined look for a prefixed property first
@@ -595,13 +595,13 @@ public class ClassLoaderLogManager extends LogManager {
}
}
try {
-this.prefix.set(prefix);
+ClassLoaderLogManager.prefix.set(prefix);
Handler handler = (Handler) classLoader.loadClass(
handlerClassName).getConstructor().newInstance();
// The specification strongly implies all configuration
should be done
// during the creation of the handler object.
// This includes setting level, filter, formatter and
encoding.
-this.prefix.set(null);
+ClassLoaderLogManager.prefix.set(null);
info.handlers.put(handlerName, handler);
if (rootHandlers == null) {
localRootLogger.addHandler(handler);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix 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 aa0881c Fix IDE warnings
aa0881c is described below
commit aa0881cd9eb965b80603f566cc31eb2041dade95
Author: Mark Thomas
AuthorDate: Tue Jan 14 21:04:15 2020 +
Fix IDE warnings
---
java/org/apache/catalina/manager/JMXProxyServlet.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java
b/java/org/apache/catalina/manager/JMXProxyServlet.java
index 7333e26..d6eeb70 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -262,10 +262,12 @@ public class JMXProxyServlet extends HttpServlet {
*call the requested operation.
* @return The value returned by the requested operation.
*/
+@SuppressWarnings("null") // parameters can't be null if signature.length
> 0
private Object invokeOperationInternal(String onameStr, String operation,
String[] parameters)
throws OperationsException, MBeanException, ReflectionException {
ObjectName oname = new ObjectName(onameStr);
-MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,
operation, (null == parameters ? 0 : parameters.length));
+int paramCount = null == parameters ? 0 : parameters.length;
+MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,
operation, paramCount);
if(null == methodInfo) {
// getMethodInfo returns null for both "object not found" and
"operation not found"
MBeanInfo info = null;
@@ -276,7 +278,9 @@ public class JMXProxyServlet extends HttpServlet {
} catch (Exception e) {
throw new
IllegalArgumentException(sm.getString("jmxProxyServlet.noBeanFound", onameStr),
e);
}
-throw new
IllegalArgumentException(sm.getString("jmxProxyServlet.noOperationOnBean",
operation, (null == parameters ? 0 : parameters.length), onameStr,
info.getClassName()));
+throw new IllegalArgumentException(
+sm.getString("jmxProxyServlet.noOperationOnBean",
+operation, Integer.valueOf(paramCount), onameStr,
info.getClassName()));
}
MBeanParameterInfo[] signature = methodInfo.getSignature();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
