errorprone :: EmptyCatch (#774)

NationalSecurityAgency · May 20, 2024 · 45abc17 · 45abc17
1 parent 85363e0
commit 45abc17
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 35 deletions.
diff --git a/src/main/java/emissary/util/Version.java b/src/main/java/emissary/util/Version.java
@@ -30,16 +30,14 @@ public Version() {
      * Does not create a Configurator due to logging restrictions on this method.
      */
     private void readHardWiredConfigInfo() {
-        InputStream rstream = null;
-        try {
-            // This configurator is not overridable by
-            // the normal config.pkg or config.dir mechanisms.
-            // It also cannot call any method in ConfigUtil that
-            // will end up calling a logger.* method, since we
-            // are here producing the header for the log file
-            String rez = Version.class.getName().replace('.', '/') + ConfigUtil.CONFIG_FILE_ENDING;
+        // This configurator is not overridable by
+        // the normal config.pkg or config.dir mechanisms.
+        // It also cannot call any method in ConfigUtil that
+        // will end up calling a logger.* method, since we
+        // are here producing the header for the log file
+        String rez = Version.class.getName().replace('.', '/') + ConfigUtil.CONFIG_FILE_ENDING;
+        try (InputStream rstream = new ResourceReader().getResourceAsStream(rez)) {
             // System.out.println("Reading " + rez);
-            rstream = new ResourceReader().getResourceAsStream(rez);
             if (rstream != null) {
                 byte[] data = IOUtils.toByteArray(rstream);
                 String sdata = new String(data);
@@ -58,13 +56,6 @@ private void readHardWiredConfigInfo() {
             }
         } catch (IOException iox) {
             // System.out.println("Bad read: " + iox);
-        } finally {
-            if (rstream != null) {
-                try {
-                    rstream.close();
-                } catch (IOException ignore) {
-                }
-            }
         }
     }
 

diff --git a/src/test/java/emissary/pickup/PickupQueueTest.java b/src/test/java/emissary/pickup/PickupQueueTest.java
@@ -109,6 +109,7 @@ public void run() {
                         pq.wait(0);
                         hitcount++;
                     } catch (InterruptedException ignored) {
+                        // Ignore
                     }
                 }
             }

diff --git a/src/test/java/emissary/place/ServiceProviderPlaceTest.java b/src/test/java/emissary/place/ServiceProviderPlaceTest.java
@@ -223,16 +223,15 @@ void testLocOnlyConstructorWithFileConfigDataAndPackage() throws IOException, Em
     }
 
     private void runFileConfiguredTest(boolean usePackage, int ctorType) throws IOException, EmissaryException {
-        Path cfg = null;
-        OutputStream fos = null;
-        try {
-            // Write out the config data to the temp config dir
-            if (usePackage) {
-                cfg = Paths.get(CFGDIR, thisPackage.getName() + ".MyFileConfigedTestPlace" + ConfigUtil.CONFIG_FILE_ENDING);
-            } else {
-                cfg = Paths.get(CFGDIR, "MyFileConfigedTestPlace" + ConfigUtil.CONFIG_FILE_ENDING);
-            }
-            fos = Files.newOutputStream(cfg);
+        Path cfg;
+        // Write out the config data to the temp config dir
+        if (usePackage) {
+            cfg = Paths.get(CFGDIR, thisPackage.getName() + ".MyFileConfigedTestPlace" + ConfigUtil.CONFIG_FILE_ENDING);
+        } else {
+            cfg = Paths.get(CFGDIR, "MyFileConfigedTestPlace" + ConfigUtil.CONFIG_FILE_ENDING);
+        }
+
+        try (OutputStream fos = Files.newOutputStream(cfg)) {
             fos.write(configData);
 
             MyFileConfigedTestPlace mtp = null;
@@ -260,15 +259,6 @@ private void runFileConfiguredTest(boolean usePackage, int ctorType) throws IOEx
             // Clean up the tmp config settings
             restoreConfig();
 
-            assert cfg != null;
-            Files.deleteIfExists(cfg);
-
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException ignore) {
-                }
-            }
             Files.deleteIfExists(cfg);
         }
     }

diff --git a/src/test/java/emissary/test/core/junit5/FunctionalTest.java b/src/test/java/emissary/test/core/junit5/FunctionalTest.java
@@ -86,12 +86,14 @@ protected void startJetty(int port) throws Exception {
             jserver = new EmissaryServer(cmd);
             jetty = jserver.startServer();
         } catch (Exception ignored) {
+            // Ignore
         }
 
         // Wait for jetty to come up
         try {
             Thread.sleep(500);
         } catch (InterruptedException ignored) {
+            // Ignore
         }
         referenceServices(port);
     }