Fix IDE warnings for unused code

apache · Dec 15, 2024 · 37fbd31 · 37fbd31
1 parent e4c9e00
commit 37fbd31
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/java/org/apache/catalina/startup/ExpandWar.java b/java/org/apache/catalina/startup/ExpandWar.java
@@ -83,7 +83,8 @@ public static String expand(Host host, URL war, String pathname) throws IOExcept
         File warTracker = new File(host.getAppBaseFile(), pathname + Constants.WarTracker);
         long warLastModified = -1;
 
-        try (InputStream is = jfuc.getInputStream()) {
+        try (@SuppressWarnings("unused")
+        InputStream is = jfuc.getInputStream()) {
             // Get the last modified time for the WAR
             warLastModified = jfuc.getLastModified();
         }

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -334,7 +334,8 @@ public URL getResource(String path) throws MalformedURLException {
         try {
             URI uri = new URI(myResourceBaseURL.toExternalForm() + path);
             url = uri.toURL();
-            try (InputStream is = url.openStream()) {
+            try (@SuppressWarnings("unused")
+            InputStream is = url.openStream()) {
             }
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
@@ -108,7 +108,8 @@ public void run() {
                 @Override
                 public void run() {
                     // Expected to fail
-                    try (Connection c = ds.getConnection()) {
+                    try (@SuppressWarnings("unused")
+                    Connection c = ds.getConnection()) {
                     } catch (Exception e) {
                         System.err.println("Step 2:"+e.getMessage());
                     }

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
@@ -34,7 +34,8 @@ public void testDefaultAbandon() throws Exception {
         this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
         this.datasource.getPoolProperties().setRemoveAbandoned(true);
         this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
-        try (Connection con = datasource.getConnection()) {
+        try (@SuppressWarnings("unused")
+        Connection con = datasource.getConnection()) {
             Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());
             Thread.sleep(2000);
             Assert.assertEquals("Number of connections active/busy should be 0",0,datasource.getPool().getActive());
@@ -51,7 +52,8 @@ public void testMaxedOutAbandon() throws Exception {
         this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
         this.datasource.getPoolProperties().setRemoveAbandoned(true);
         this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
-        try (Connection con = datasource.getConnection()) {
+        try (@SuppressWarnings("unused")
+        Connection con = datasource.getConnection()) {
             Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());
             Thread.sleep(2000);
             Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
@@ -32,7 +32,8 @@ public class TestException extends DefaultTestCase {
     public void testException() throws Exception {
         datasource.getPoolProperties().setJdbcInterceptors(TestInterceptor.class.getName());
         Connection con = datasource.getConnection();
-        try (Statement s = con.createStatement()){
+        try (@SuppressWarnings("unused")
+        Statement s = con.createStatement()){
         } catch (Exception x) {
             Assert.fail();
         }

diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -50,7 +50,8 @@ public void testStartStopBindOnInit() throws Exception {
 
         tomcat.getConnector().stop();
         Exception e = null;
-        try (ServerSocket s = new ServerSocket(port, 100, InetAddress.getByName("localhost"))){
+        try (@SuppressWarnings("unused")
+        ServerSocket s = new ServerSocket(port, 100, InetAddress.getByName("localhost"))){
         } catch (Exception e1) {
             e = e1;
         }
@@ -76,7 +77,8 @@ public void testStartStopBindOnStart() throws Exception {
 
         tomcat.getConnector().stop();
         Exception e = null;
-        try (ServerSocket s = new ServerSocket(port, 100, InetAddress.getByName("localhost"))) {
+        try (@SuppressWarnings("unused")
+        ServerSocket s = new ServerSocket(port, 100, InetAddress.getByName("localhost"))) {
             // This should not throw an Exception
         } catch (Exception e1) {
             e = e1;