(tomcat) branch 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f04df5a8f6 Fix IDE warnings
f04df5a8f6 is described below
commit f04df5a8f66a08b39b50ef38f3207dc87b1bb9f6
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 6668eb14ee..a71a4cdab9 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1312,6 +1312,8 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements Realm {
*
*
* @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 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b09409adf9 Fix IDE warnings
b09409adf9 is described below
commit b09409adf95f9745550b5c2d496af5f9a2283d87
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 451a7a1ad1..eaa2f1af53 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 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 6e57860a66 Fix IDE warnings
6e57860a66 is described below
commit 6e57860a66845d8cab0286546fff9faa79ddd2fd
Author: Mark Thomas
AuthorDate: Mon Feb 12 14:14:53 2024 +
Fix IDE warnings
---
java/org/apache/catalina/session/StandardManager.java | 2 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 2 +-
java/org/apache/jasper/JspC.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/session/StandardManager.java
b/java/org/apache/catalina/session/StandardManager.java
index af4cfa191b..629c13ed89 100644
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -311,7 +311,7 @@ public class StandardManager extends ManagerBase {
// Expire all the sessions we just wrote
if (log.isDebugEnabled()) {
-log.debug(sm.getString("standardManager.expiringSessions",
list.size()));
+log.debug(sm.getString("standardManager.expiringSessions",
Integer.toString(list.size(;
}
for (StandardSession session : list) {
try {
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java
b/java/org/apache/coyote/ajp/AjpProcessor.java
index 2096a20c7b..d13e32635c 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -386,7 +386,7 @@ public class AjpProcessor extends AbstractProcessor {
// Unexpected packet type. Unread body packets should have
// been swallowed in finish().
if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("ajpprocessor.unexpectedMessage", type));
+
getLog().debug(sm.getString("ajpprocessor.unexpectedMessage",
Integer.toString(type)));
}
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, null);
break;
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index dc79af668b..d20a4f150c 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -1349,7 +1349,7 @@ public class JspC extends Task implements Options {
@Override
public void execute() {
if(log.isDebugEnabled()) {
-log.debug(Localizer.getMessage("jspc.start", pages.size()));
+log.debug(Localizer.getMessage("jspc.start",
Integer.toString(pages.size(;
}
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 5cfec37b9e Fix IDE warnings
5cfec37b9e is described below
commit 5cfec37b9e043d8f4a8450d051bdfc0f5643bdc7
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 5c86152b62..b305431ce7 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -625,7 +625,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) {
@@ -639,7 +639,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 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9de4514898 Fix IDE warnings
9de4514898 is described below
commit 9de4514898f57dc960a2051fc1411c9ad322e9db
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 b10d5cc90d..daa1675c49 100644
--- a/java/org/apache/jasper/compiler/Node.java
+++ b/java/org/apache/jasper/compiler/Node.java
@@ -1682,7 +1682,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)));
}
}
@@ -1704,7 +1705,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 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b84f55f81d Fix IDE warnings
b84f55f81d is described below
commit b84f55f81d8e28ae5c2020c239509ed217123886
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 10.1.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new eb11c5c6c2 Fix IDE warnings
eb11c5c6c2 is described below
commit eb11c5c6c27bdd7d570c6ab2e479700ebb47cfcf
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 cd48cfceb2..2a56d1763e 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);
}
@@ -117,7 +117,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
