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
The following commit(s) were added to refs/heads/main by this push: new dab2b10275 Update the @SuppressWarnings for Eclipse 4.32M1 and Java 22 dab2b10275 is described below commit dab2b1027521ccad85685a7c2b868fc4abab82c8 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Apr 16 19:27:30 2024 +0100 Update the @SuppressWarnings for Eclipse 4.32M1 and Java 22 --- java/org/apache/catalina/authenticator/SpnegoAuthenticator.java | 1 + java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java | 2 ++ java/org/apache/catalina/valves/StuckThreadDetectionValve.java | 5 +++++ java/org/apache/catalina/webresources/CachedResource.java | 1 + java/org/apache/coyote/Request.java | 2 ++ java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java | 2 +- java/org/apache/tomcat/util/Diagnostics.java | 1 + test/org/apache/juli/TestThreadNameCache.java | 1 + 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java index ab4a8c3287..dab5cdfed3 100644 --- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java +++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java @@ -134,6 +134,7 @@ public class SpnegoAuthenticator extends AuthenticatorBase { } + @SuppressWarnings("removal") @Override protected boolean doAuthenticate(Request request, HttpServletResponse response) throws IOException { diff --git a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java index c413317186..8c70ac3401 100644 --- a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java +++ b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java @@ -119,9 +119,11 @@ public class ThreadLocalLeakPreventionListener extends FrameworkListener { } if (executor instanceof ThreadPoolExecutor) { + @SuppressWarnings("resource") ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor; threadPoolExecutor.contextStopping(); } else if (executor instanceof StandardThreadExecutor) { + @SuppressWarnings("resource") StandardThreadExecutor stdThreadExecutor = (StandardThreadExecutor) executor; stdThreadExecutor.contextStopping(); } diff --git a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java index a523029d75..0e451d5a0c 100644 --- a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java +++ b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java @@ -135,6 +135,7 @@ public class StuckThreadDetectionValve extends ValveBase { private void notifyStuckThreadDetected(MonitoredThread monitoredThread, long activeTime, int numStuckThreads) { if (log.isWarnEnabled()) { + @SuppressWarnings("deprecation") String msg = sm.getString("stuckThreadDetectionValve.notifyStuckThreadDetected", monitoredThread.getThread().getName(), Long.valueOf(activeTime), monitoredThread.getStartTime(), Integer.valueOf(numStuckThreads), monitoredThread.getRequestUri(), Integer.valueOf(threshold), @@ -171,6 +172,7 @@ public class StuckThreadDetectionValve extends ValveBase { // GC'ing, as the reference is removed from the Map in the finally clause Thread currentThread = Thread.currentThread(); + @SuppressWarnings("deprecation") Long key = Long.valueOf(currentThread.getId()); StringBuffer requestUrl = request.getRequestURL(); if (request.getQueryString() != null) { @@ -227,6 +229,7 @@ public class StuckThreadDetectionValve extends ValveBase { return stuckCount.get(); } + @SuppressWarnings("deprecation") public long[] getStuckThreadIds() { List<Long> idList = new ArrayList<>(); for (MonitoredThread monitoredThread : activeThreads.values()) { @@ -342,6 +345,7 @@ public class StuckThreadDetectionValve extends ValveBase { } try { if (log.isWarnEnabled()) { + @SuppressWarnings("deprecation") String msg = sm.getString("stuckThreadDetectionValve.notifyStuckThreadInterrupted", this.getThread().getName(), Long.valueOf(getActiveTimeInMillis()), this.getStartTime(), this.getRequestUri(), Long.valueOf(interruptThreadThreshold), @@ -369,6 +373,7 @@ public class StuckThreadDetectionValve extends ValveBase { private final long threadId; private final long totalActiveTime; + @SuppressWarnings("deprecation") CompletedStuckThread(Thread thread, long totalActiveTime) { this.threadName = thread.getName(); this.threadId = thread.getId(); diff --git a/java/org/apache/catalina/webresources/CachedResource.java b/java/org/apache/catalina/webresources/CachedResource.java index 14d2b378ca..7be8776097 100644 --- a/java/org/apache/catalina/webresources/CachedResource.java +++ b/java/org/apache/catalina/webresources/CachedResource.java @@ -341,6 +341,7 @@ public class CachedResource implements WebResource { try { CachedResourceURLStreamHandler handler = new CachedResourceURLStreamHandler(resourceURL, root, webAppPath, usesClassLoaderResources); + @SuppressWarnings("deprecation") URL result = new URL(null, resourceURL.toExternalForm(), handler); handler.setCacheURL(result); return result; diff --git a/java/org/apache/coyote/Request.java b/java/org/apache/coyote/Request.java index 245251b2e3..680aec6a7b 100644 --- a/java/org/apache/coyote/Request.java +++ b/java/org/apache/coyote/Request.java @@ -736,12 +736,14 @@ public final class Request { threadId = 0; } + @SuppressWarnings("deprecation") public void setRequestThread() { Thread t = Thread.currentThread(); threadId = t.getId(); getRequestProcessor().setWorkerThreadName(t.getName()); } + @SuppressWarnings("deprecation") public boolean isRequestThread() { return Thread.currentThread().getId() == threadId; } diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java index ff5d937fc4..9e5853894a 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java @@ -368,7 +368,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { } } - @SuppressWarnings("deprecation") // Need Commons DBCP to address this + @SuppressWarnings("removal") // Need Commons DBCP to address this @Override protected void finalize() throws Throwable { // This is required because of statement pooling. The poolable diff --git a/java/org/apache/tomcat/util/Diagnostics.java b/java/org/apache/tomcat/util/Diagnostics.java index 77091e5c49..e4fb8631be 100644 --- a/java/org/apache/tomcat/util/Diagnostics.java +++ b/java/org/apache/tomcat/util/Diagnostics.java @@ -487,6 +487,7 @@ public class Diagnostics { * @param requestedSm the StringManager to use * @return the formatted JVM information text */ + @SuppressWarnings("deprecation") public static String getVMInfo(StringManager requestedSm) { StringBuilder sb = new StringBuilder(); diff --git a/test/org/apache/juli/TestThreadNameCache.java b/test/org/apache/juli/TestThreadNameCache.java index 65c7a6e6b2..97316d603a 100644 --- a/test/org/apache/juli/TestThreadNameCache.java +++ b/test/org/apache/juli/TestThreadNameCache.java @@ -35,6 +35,7 @@ public class TestThreadNameCache { Method getThreadName = olf.getClass().getDeclaredMethod("getThreadName", long.class); getThreadName.setAccessible(true); Thread thread = new Thread() { + @SuppressWarnings("deprecation") @Override public void run() { setName(THREAD_NAME); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org