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 2025/03/20 13:10:09 UTC
(tomcat) branch main updated (ffe5b8f196 -> 9c22fded0f)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from ffe5b8f196 Mostly revert changes
new a1afa1cddf Remove deprecated code
new 9c22fded0f Fix IDE warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/core/StandardContext.java | 16 ++-------
.../core/ThreadLocalLeakPreventionListener.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 3 ++
.../apache/catalina/ha/tcp/SendMessageData.java | 4 +++
.../apache/catalina/mapper/WrapperMappingInfo.java | 5 +++
java/org/apache/catalina/ssi/SSIServlet.java | 1 -
.../org/apache/catalina/startup/FailedContext.java | 10 ------
java/org/apache/coyote/UpgradeToken.java | 6 ++++
java/org/apache/tomcat/ContextBind.java | 42 +---------------------
.../dbcp2/datasources/PerUserPoolDataSource.java | 1 -
test/org/apache/tomcat/unittest/TesterContext.java | 10 ------
11 files changed, 23 insertions(+), 79 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Fix IDE warnings
Posted by ma...@apache.org.
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
commit 9c22fded0f75334d02e8242cf03835e7e7dcea2c
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Remove deprecated code
Posted by ma...@apache.org.
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
commit a1afa1cddf848fc258ee7723dac40a49782b86cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 20 13:05:08 2025 +0000
Remove deprecated code
---
java/org/apache/catalina/core/StandardContext.java | 16 ++-------
.../org/apache/catalina/startup/FailedContext.java | 10 ------
java/org/apache/tomcat/ContextBind.java | 42 +---------------------
test/org/apache/tomcat/unittest/TesterContext.java | 10 ------
4 files changed, 3 insertions(+), 75 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index b93e000d7f..b1a46ca3f4 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4971,7 +4971,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
*/
protected ClassLoader bindThread() {
- ClassLoader oldContextClassLoader = bind(false, null);
+ ClassLoader oldContextClassLoader = bind(null);
if (isUseNaming()) {
try {
@@ -4997,13 +4997,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
ContextBindings.unbindThread(this, getNamingToken());
}
- unbind(false, oldContextClassLoader);
- }
-
-
- @Override
- public ClassLoader bind(boolean usePrivilegedAction, ClassLoader originalClassLoader) {
- return bind(originalClassLoader);
+ unbind(oldContextClassLoader);
}
@@ -5042,12 +5036,6 @@ public class StandardContext extends ContainerBase implements Context, Notificat
}
- @Override
- public void unbind(boolean usePrivilegedAction, ClassLoader originalClassLoader) {
- unbind(originalClassLoader);
- }
-
-
@Override
public void unbind(ClassLoader originalClassLoader) {
if (originalClassLoader == null) {
diff --git a/java/org/apache/catalina/startup/FailedContext.java b/java/org/apache/catalina/startup/FailedContext.java
index a0566b95f6..199b0ffe30 100644
--- a/java/org/apache/catalina/startup/FailedContext.java
+++ b/java/org/apache/catalina/startup/FailedContext.java
@@ -1263,21 +1263,11 @@ public class FailedContext extends LifecycleMBeanBase implements Context {
// NO-OP
}
- @Override
- public ClassLoader bind(boolean usePrivilegedAction, ClassLoader originalClassLoader) {
- return null;
- }
-
@Override
public ClassLoader bind(ClassLoader originalClassLoader) {
return null;
}
- @Override
- public void unbind(boolean usePrivilegedAction, ClassLoader originalClassLoader) {
- // NO-OP
- }
-
@Override
public void unbind(ClassLoader originalClassLoader) {
// NO-OP
diff --git a/java/org/apache/tomcat/ContextBind.java b/java/org/apache/tomcat/ContextBind.java
index 2fb868a6f7..920c6dbfd5 100644
--- a/java/org/apache/tomcat/ContextBind.java
+++ b/java/org/apache/tomcat/ContextBind.java
@@ -38,7 +38,7 @@ public interface ContextBind {
/**
* Restore the current thread context class loader to the original class
- * loader in used before {@link #bind(boolean, ClassLoader)} was called. If
+ * loader in use before {@link #bind(ClassLoader)} was called. If
* no original class loader is passed to this method then no change will be
* made. If the class loader is changed and a
* {@link org.apache.catalina.ThreadBindingListener} is configured then
@@ -49,44 +49,4 @@ public interface ContextBind {
* The class loader to restore as the thread context class loader
*/
void unbind(ClassLoader originalClassLoader);
-
- /**
- * Change the current thread context class loader to the web application
- * class loader. If no web application class loader is defined, or if the
- * current thread is already using the web application class loader then no
- * change will be made. If the class loader is changed and a
- * {@link org.apache.catalina.ThreadBindingListener} is configured then
- * {@link org.apache.catalina.ThreadBindingListener#bind()} will be called
- * after the change has been made.
- *
- * @param usePrivilegedAction Unused
- * @param originalClassLoader The current class loader if known to save this
- * method having to look it up
- *
- * @return If the class loader has been changed by the method it will return
- * the thread context class loader in use when the method was called. If
- * no change was made then this method returns null.
- *
- * @deprecated Unused. Will be removed in Tomcat 12 onwards.
- */
- @Deprecated
- ClassLoader bind(boolean usePrivilegedAction, ClassLoader originalClassLoader);
-
- /**
- * Restore the current thread context class loader to the original class
- * loader in used before {@link #bind(boolean, ClassLoader)} was called. If
- * no original class loader is passed to this method then no change will be
- * made. If the class loader is changed and a
- * {@link org.apache.catalina.ThreadBindingListener} is configured then
- * {@link org.apache.catalina.ThreadBindingListener#unbind()} will be called
- * before the change is made.
- *
- * @param usePrivilegedAction Unused
- * @param originalClassLoader The class loader to restore as the thread
- * context class loader
- *
- * @deprecated Unused. Will be removed in Tomcat 12 onwards.
- */
- @Deprecated
- void unbind(boolean usePrivilegedAction, ClassLoader originalClassLoader);
}
diff --git a/test/org/apache/tomcat/unittest/TesterContext.java b/test/org/apache/tomcat/unittest/TesterContext.java
index 926e48a8de..e54a0e04e8 100644
--- a/test/org/apache/tomcat/unittest/TesterContext.java
+++ b/test/org/apache/tomcat/unittest/TesterContext.java
@@ -1215,21 +1215,11 @@ public class TesterContext implements Context {
@Override
public void setThreadBindingListener(ThreadBindingListener threadBindingListener) { /* NO-OP */ }
- @Override
- public ClassLoader bind(boolean usePrivilegedAction, ClassLoader originalClassLoader) {
- return null;
- }
-
@Override
public ClassLoader bind(ClassLoader originalClassLoader) {
return null;
}
- @Override
- public void unbind(boolean usePrivilegedAction, ClassLoader originalClassLoader) {
- // NO-OP
- }
-
@Override
public void unbind(ClassLoader originalClassLoader) {
// NO-OP
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org