This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 985e96d1e803b230db9be5611e1dc9614152cac8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 20 13:09:14 2025 +0000
Fix IDE warnings
---
.../org/apache/catalina/core/ThreadLocalLeakPreventionListener.java | 4 ++--
java/org/apache/catalina/filters/ExpiresFilter.java | 3 +++
java/org/apache/catalina/ha/tcp/SendMessageData.java | 4 ++++
java/org/apache/catalina/mapper/WrapperMappingInfo.java | 5 +++++
java/org/apache/catalina/ssi/SSIServlet.java | 1 -
java/org/apache/coyote/UpgradeToken.java | 6 ++++++
.../apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java | 1 -
7 files changed, 20 insertions(+), 4 deletions(-)
diff --git
a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
index 29e32d29f6..018440be69 100644
--- a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
@@ -118,9 +118,9 @@ public class ThreadLocalLeakPreventionListener extends
FrameworkListener {
executor = handler.getExecutor();
}
- if (executor instanceof @SuppressWarnings("resource")
ThreadPoolExecutor threadPoolExecutor) {
+ if (executor instanceof ThreadPoolExecutor threadPoolExecutor)
{
threadPoolExecutor.contextStopping();
- } else if (executor instanceof @SuppressWarnings("resource")
StandardThreadExecutor stdThreadExecutor) {
+ } else if (executor instanceof StandardThreadExecutor
stdThreadExecutor) {
stdThreadExecutor.contextStopping();
}
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 1d532f5b47..34f18d2d7e 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -415,6 +415,9 @@ public class ExpiresFilter extends FilterBase {
/**
* Duration composed of an {@link #amount} and a {@link #unit}
+ *
+ * @param amount Magnitude of duration
+ * @param unit Unit of duration
*/
public record Duration(int amount, DurationUnit unit) {
public int getAmount() {
diff --git a/java/org/apache/catalina/ha/tcp/SendMessageData.java
b/java/org/apache/catalina/ha/tcp/SendMessageData.java
index 6dc828fb68..192a50f07a 100644
--- a/java/org/apache/catalina/ha/tcp/SendMessageData.java
+++ b/java/org/apache/catalina/ha/tcp/SendMessageData.java
@@ -20,6 +20,10 @@ import org.apache.catalina.tribes.Member;
/**
* @author Peter Rossbach
+ *
+ * @param message The message that was sent
+ * @param destination The destination of the message
+ * @param exception The exception, if any, when attempting to send the
message
*/
public record SendMessageData(Object message, Member destination, Exception
exception) {
diff --git a/java/org/apache/catalina/mapper/WrapperMappingInfo.java
b/java/org/apache/catalina/mapper/WrapperMappingInfo.java
index c92ba58c8f..aaeaa39233 100644
--- a/java/org/apache/catalina/mapper/WrapperMappingInfo.java
+++ b/java/org/apache/catalina/mapper/WrapperMappingInfo.java
@@ -20,6 +20,11 @@ import org.apache.catalina.Wrapper;
/**
* Encapsulates information used to register a Wrapper mapping.
+ *
+ * @param mapping The URL pattern)
+ * @param wrapper The wrapper for the Servlet
+ * @param jspWildCard Is this a mapping for JSP files?
+ * @param resourceOnly Is this a resource only mapping?
*/
public record WrapperMappingInfo(String mapping, Wrapper wrapper, boolean
jspWildCard,
boolean resourceOnly) {
diff --git a/java/org/apache/catalina/ssi/SSIServlet.java
b/java/org/apache/catalina/ssi/SSIServlet.java
index c092a4dc3c..d243026043 100644
--- a/java/org/apache/catalina/ssi/SSIServlet.java
+++ b/java/org/apache/catalina/ssi/SSIServlet.java
@@ -202,7 +202,6 @@ public class SSIServlet extends HttpServlet {
}
if (stringWriter != null) {
printWriter.flush();
- @SuppressWarnings("null")
String text = stringWriter.toString();
res.getWriter().write(text);
}
diff --git a/java/org/apache/coyote/UpgradeToken.java
b/java/org/apache/coyote/UpgradeToken.java
index 962a1a8537..b77cf25c5a 100644
--- a/java/org/apache/coyote/UpgradeToken.java
+++ b/java/org/apache/coyote/UpgradeToken.java
@@ -23,6 +23,12 @@ import org.apache.tomcat.InstanceManager;
/**
* Token used during the upgrade process.
+ *
+ * @param httpUpgradeHandler The handler for the HTTP upgrade
+ * @param contextBind The object to use to bind/unbind the current
thread to/from the web application class
+ * loader
+ * @param instanceManager The instance manager to use to create new
Servlets, Filters, Listeners etc
+ * @param protocol The desired protocol to upgrade to
*/
public record UpgradeToken(HttpUpgradeHandler httpUpgradeHandler, ContextBind
contextBind,
InstanceManager instanceManager, String protocol) {
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
index 8ceefe9b68..6d7f8ac98f 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
@@ -665,7 +665,6 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @throws IOException Any of the usual Input/Output related
exceptions.
* @throws ClassNotFoundException A class of a serialized object cannot be
found.
*/
- @SuppressWarnings("resource")
private void readObject(final ObjectInputStream in) throws IOException,
ClassNotFoundException {
in.defaultReadObject();
this.managers = readObjectImpl().managers;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
