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
commit 399238f4c6c427e89ed962014adbd9542d4ea1ae Author: Mark Thomas <[email protected]> AuthorDate: Thu Mar 5 10:22:45 2026 +0000 Fix IDe warnings / align with 11.0.x --- java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java | 6 +++--- java/org/apache/tomcat/util/openssl/openssl_h.java | 3 ++- java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java | 1 + java/org/apache/tomcat/util/openssl/openssl_h_Macros.java | 4 ++-- test/org/apache/catalina/manager/TestManagerWebapp.java | 2 +- test/org/apache/tomcat/integration/httpd/TesterHttpd.java | 2 +- test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 5 ++--- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java index 75fc86da56..cdddc14eed 100644 --- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java @@ -134,15 +134,15 @@ public abstract class AbstractJsseEndpoint<S, U> extends AbstractEndpoint<S,U> { List<String> clientRequestedApplicationProtocols) { List<String> clientRequestedProtocols = clientRequestedProtocolsThreadLocal.get(); if (clientRequestedProtocols == null) { - clientRequestedProtocols = new ArrayList<String>(); + clientRequestedProtocols = new ArrayList<>(); } List<Group> clientSupportedGroups = clientSupportedGroupsThreadLocal.get(); if (clientSupportedGroups == null) { - clientSupportedGroups = new ArrayList<Group>(); + clientSupportedGroups = new ArrayList<>(); } List<SignatureScheme> clientSignatureSchemes = clientSignatureSchemesThreadLocal.get(); if (clientSignatureSchemes == null) { - clientSignatureSchemes = new ArrayList<SignatureScheme>(); + clientSignatureSchemes = new ArrayList<>(); } SSLHostConfig sslHostConfig = getSSLHostConfig(sniHostName); diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java b/java/org/apache/tomcat/util/openssl/openssl_h.java index e5e0eb8915..6d1ac8f98a 100644 --- a/java/org/apache/tomcat/util/openssl/openssl_h.java +++ b/java/org/apache/tomcat/util/openssl/openssl_h.java @@ -3705,7 +3705,8 @@ public class openssl_h { } private static class X509_STORE_CTX_get1_issuer { - public static final FunctionDescriptor DESC = FunctionDescriptor.of(openssl_h.C_INT, openssl_h.C_POINTER, openssl_h.C_POINTER, openssl_h.C_POINTER); + public static final FunctionDescriptor DESC = + FunctionDescriptor.of(openssl_h.C_INT, openssl_h.C_POINTER, openssl_h.C_POINTER, openssl_h.C_POINTER); public static final MemorySegment ADDR = openssl_h.findOrThrow("X509_STORE_CTX_get1_issuer"); diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java index 3f4fb1b0b5..dfb231836d 100644 --- a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java +++ b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java @@ -26,6 +26,7 @@ import static org.apache.tomcat.util.openssl.openssl_h.OpenSSL_version_num; /** * Methods used present in older OpenSSL versions but not in the current major version or OpenSSL derivatives. */ +@SuppressWarnings("javadoc") public class openssl_h_Compatibility { public static final boolean OPENSSL; diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java b/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java index 9571a2c258..15528547b5 100644 --- a/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java +++ b/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java @@ -466,8 +466,8 @@ public class openssl_h_Macros { if (openssl_h_Compatibility.BORINGSSL) { class Holder { static final String NAME = "SSL_CTX_set1_groups_list"; - static final FunctionDescriptor DESC = FunctionDescriptor.of(openssl_h.C_LONG, openssl_h.C_POINTER, - openssl_h.C_POINTER); + static final FunctionDescriptor DESC = + FunctionDescriptor.of(openssl_h.C_LONG, openssl_h.C_POINTER, openssl_h.C_POINTER); static final MethodHandle MH = Linker.nativeLinker().downcallHandle(openssl_h.findOrThrow(NAME), DESC); } var mh$ = Holder.MH; diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java b/test/org/apache/catalina/manager/TestManagerWebapp.java index b4388190de..b8487ec435 100644 --- a/test/org/apache/catalina/manager/TestManagerWebapp.java +++ b/test/org/apache/catalina/manager/TestManagerWebapp.java @@ -537,7 +537,7 @@ public class TestManagerWebapp extends TomcatBaseTest { Assert.assertTrue(appRoot.mkdirs() && appRoot.isDirectory()); addDeleteOnTearDown(appRoot); - try (@SuppressWarnings("unused") TomcatBaseTest.ContainerInjector ignored = + try (TomcatBaseTest.ContainerInjector ignored = TomcatBaseTest.ContainerInjector.inject(ctx.getParent(), c -> c.getPath().equals("/bug57700"), c -> { diff --git a/test/org/apache/tomcat/integration/httpd/TesterHttpd.java b/test/org/apache/tomcat/integration/httpd/TesterHttpd.java index 7d87641a41..d6e4a22aa7 100644 --- a/test/org/apache/tomcat/integration/httpd/TesterHttpd.java +++ b/test/org/apache/tomcat/integration/httpd/TesterHttpd.java @@ -138,7 +138,7 @@ public class TesterHttpd { private boolean isHttpdReady() throws InterruptedException { long deadline = System.currentTimeMillis() + 1000; while (System.currentTimeMillis() < deadline) { - try (@SuppressWarnings("unused") Socket ignored = new Socket("localhost", this.httpdPort)) { + try (Socket ignored = new Socket("localhost", this.httpdPort)) { return true; } catch (IOException e) { Thread.sleep(100); diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java index 654da4fd2e..ead570e6fb 100644 --- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java +++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java @@ -32,8 +32,7 @@ import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.compat.JreCompat; /** - * Test case for the Endpoint implementations. The testing framework will ensure - * that each implementation is tested. + * Test case for the Endpoint implementations. The testing framework will ensure that each implementation is tested. */ public class TestXxxEndpoint extends TomcatBaseTest { @@ -49,7 +48,7 @@ public class TestXxxEndpoint extends TomcatBaseTest { tomcat.getConnector().stop(); Exception e = null; - try (ServerSocket s = new ServerSocket(port, 100, InetAddress.getByName("localhost"))){ + try (ServerSocket s = new ServerSocket(port, 100, InetAddress.getByName("localhost"))) { } catch (Exception e1) { e = e1; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
