errorprone :: CatchingUnchecked

NationalSecurityAgency · Oct 28, 2024 · 2c50a22 · 2c50a22
1 parent 76550b7
commit 2c50a22
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 67 deletions.
diff --git a/src/main/java/emissary/Emissary.java b/src/main/java/emissary/Emissary.java
@@ -88,6 +88,7 @@ protected Emissary(Map<String, EmissaryCommand> cmds) {
         }
     }
 
+    @SuppressWarnings("CatchingUnchecked")
     protected void execute(String[] args) {
         reconfigureLogHook(); // so we can capture everything for test, like the verbose output
         String shouldSetVerbose = System.getProperty("set.picocli.debug");

diff --git a/src/main/java/emissary/client/EmissaryResponse.java b/src/main/java/emissary/client/EmissaryResponse.java
@@ -79,17 +79,12 @@ public String getContentString() {
         if (content == null) {
             return null;
         }
-        try {
-            if (status == HttpStatus.SC_OK) {
-                return content.toString();
-            } else {
-                return "Bad request -> status: " + status + " message: " + content;
-            }
-        } catch (Exception e) {
-            logger.error("Error getting string content", e);
-            return e.getMessage();
-        }
 
+        if (status == HttpStatus.SC_OK) {
+            return content.toString();
+        } else {
+            return "Bad request -> status: " + status + " message: " + content;
+        }
     }
 
     public <T extends BaseEntity> T getContent(Class<T> mapper) {

diff --git a/src/main/java/emissary/command/MonitorCommand.java b/src/main/java/emissary/command/MonitorCommand.java
@@ -85,7 +85,7 @@ private void sendClusterRequests(final EmissaryClient client, final T entity) th
                 synchronized (lock) {
                     entity.append(response);
                 }
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 LOG.error("Problem hitting agents endpoint: {}\n{}", hostAndPort, e.getMessage());
                 synchronized (lock) {
                     entity.addError(e.getMessage());

diff --git a/src/main/java/emissary/command/TopologyCommand.java b/src/main/java/emissary/command/TopologyCommand.java
@@ -34,12 +34,8 @@ public void run(CommandLine c) {
         String endpoint = getScheme() + "://" + getHost() + ":" + getPort() + "/api/cluster/peers";
         LOG.info("Hitting " + endpoint);
         EmissaryClient client = new EmissaryClient();
-        try {
-            PeersResponseEntity entity = client.send(new HttpGet(endpoint)).getContent(PeersResponseEntity.class);
-            entity.dumpToConsole();
-        } catch (Exception e) {
-            LOG.error("Problem hitting peers endpoint: " + e.getMessage());
-        }
+        PeersResponseEntity entity = client.send(new HttpGet(endpoint)).getContent(PeersResponseEntity.class);
+        entity.dumpToConsole();
     }
 
 

diff --git a/src/main/java/emissary/config/ServiceConfigGuide.java b/src/main/java/emissary/config/ServiceConfigGuide.java
@@ -411,7 +411,7 @@ protected String substituteUtfChars(final String s, final String filename, final
                         final int digit = Integer.parseInt(s.substring(i + 2, epos), 16);
                         sb.appendCodePoint(digit);
                         i = epos - 1;
-                    } catch (Exception ex) {
+                    } catch (RuntimeException ex) {
                         throw new IOException("Unable to convert characters in " + s + ", from filename=" + filename + " line " + lnum, ex);
                     }
                 }

diff --git a/src/main/java/emissary/core/MobileAgent.java b/src/main/java/emissary/core/MobileAgent.java
@@ -188,7 +188,7 @@ public void killAgentAsync() {
         try {
             this.thread.setPriority(Thread.MIN_PRIORITY);
             this.thread.interrupt();
-        } catch (Exception ignored) {
+        } catch (RuntimeException ignored) {
             // empty catch block
         }
     }
@@ -619,7 +619,7 @@ protected DirectoryEntry nextKeyFromDirectory(final String dataId, final IServic
                 logger.debug("Added {} new key entries from the directory for {}", entries.size(), dataId);
             }
 
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             logger.warn("cannot get key, I was working on: {}", payloadArg.shortName(), e);
             // Returning instead of throwing will allow
             // the next form to be tried.

diff --git a/src/main/java/emissary/core/TimedResource.java b/src/main/java/emissary/core/TimedResource.java
@@ -72,7 +72,7 @@ void interruptAgent() {
                 LOG.debug("Found agent that needs interrupting {} in place {}", agent.getName(), placeName);
                 agent.interrupt();
             }
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             LOG.error("Unable to interrupt agent {}: {}", agent.getName(), e.getMessage(), e);
         } finally {
             lock.unlock();

diff --git a/src/main/java/emissary/core/sentinel/Sentinel.java b/src/main/java/emissary/core/sentinel/Sentinel.java
@@ -151,7 +151,7 @@ protected void init() {
                     } else {
                         logger.debug("Sentinel protocol disabled {}", protocol);
                     }
-                } catch (Exception e) {
+                } catch (RuntimeException e) {
                     logger.warn("Unable to configure Sentinel Protocol[{}]: {}", protocolConfig, e.getMessage());
                 }
             }

diff --git a/src/main/java/emissary/directory/DirectoryPlace.java b/src/main/java/emissary/directory/DirectoryPlace.java
@@ -804,7 +804,7 @@ protected void sendFailMessage(final DirectoryEntry directory, final String fail
 
         try {
             new DirectoryAdapter().outboundFailDirectory(directory.getKey(), failKey, permanent);
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             logger.error("Problem talking to directory {} to fail {}", directory.getKey(), failKey, ex);
         }
     }
@@ -931,7 +931,7 @@ protected void registerWith(final DirectoryEntry dir, final List<DirectoryEntry>
         try {
             new DirectoryAdapter().outboundAddPlaces(dir.getKey(), entryList, propagating);
             logger.debug("registration succeeded");
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             logger.warn("DirectoryPlace.registerWith: Problem talking to directory {} to add {} entries", dir.getKey(), entryList.size(), ex);
         }
     }
@@ -1269,7 +1269,7 @@ protected void deregisterFrom(final DirectoryEntry dir, final List<String> keys,
         try {
             // Follow the logic to irdRemovePlaces on the remote side
             new DirectoryAdapter().outboundRemovePlaces(dir.getKey(), keys, propagating);
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             logger.error("DirectoryPlace.deregisterFrom: " + "Problem talking to directory " + dir.getKey() + " to deregister keys", ex);
         }
     }

diff --git a/src/main/java/emissary/directory/HeartbeatManager.java b/src/main/java/emissary/directory/HeartbeatManager.java
@@ -319,7 +319,7 @@ public void run() {
                     heartbeat(dir);
                 }
                 logger.debug("Ending the HeartbeatTask run method");
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 logger.error("Unexpected problem in heartbeat timer", e);
             }
         }
@@ -345,7 +345,7 @@ public final boolean heartbeat(final String key) {
                 healthReport(key, false, response.getContentString());
                 isup = false;
             }
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             logger.error("Cannot perform heartbeat", e);
             healthReport(key, false, e.getMessage());
             isup = false;

diff --git a/src/main/java/emissary/jni/JNI.java b/src/main/java/emissary/jni/JNI.java
@@ -20,6 +20,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
+import java.rmi.RemoteException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -374,7 +375,7 @@ public byte[] returnFile(final String filename, final String[] errmsg) {
             // We have a repository of some sort, try using it
             return returnFile(filename, errmsg, repositoryKey);
 
-        } catch (Exception ve) {
+        } catch (RuntimeException ve) {
             errmsg[0] = "JNI.returnFile: " + ve;
             return null;
         }
@@ -396,7 +397,7 @@ public byte[] returnFile(final String filename, final String[] errmsg, final Str
             final String look = repositoryAddrString.substring(repositoryAddrString.indexOf("//"));
 
             repositoryProxy = (IJniRepositoryPlace) Namespace.lookup(look);
-        } catch (Exception e) {
+        } catch (NamespaceException | RuntimeException e) {
             errmsg[0] = "JNI.returnFile: " + e;
             return null;
         }
@@ -406,7 +407,7 @@ public byte[] returnFile(final String filename, final String[] errmsg, final Str
         final byte[] libContents;
         try {
             libContents = repositoryProxy.nativeLibraryDeliver(filename);
-        } catch (Exception e) {
+        } catch (RemoteException | RuntimeException e) {
             errmsg[0] = "Error calling nativeLibraryDeliver: " + e;
             return null;
         }
@@ -452,7 +453,7 @@ public long lastModified(final String filename, final String[] errmsg, final Str
 
         try {
             stamp = repositoryProxy.lastModified(filename);
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             errmsg[0] = "Error calling lastModified: " + e;
         }
 

diff --git a/src/main/java/emissary/kff/KffChainLoader.java b/src/main/java/emissary/kff/KffChainLoader.java
@@ -88,7 +88,7 @@ private static int loadFrom(KffChain chain, Map<String, String> m, FilterType fi
                 KffFilter k;
                 try {
                     k = (KffFilter) Factory.create(clazz, name, key, filterType);
-                } catch (Exception x) {
+                } catch (RuntimeException x) {
                     logger.warn("Cannot create KffFilter, using default", x);
                     k = new KffFile(name, key, filterType);
                 }

diff --git a/src/main/java/emissary/output/DropOffPlace.java b/src/main/java/emissary/output/DropOffPlace.java
@@ -130,7 +130,7 @@ protected void initializeFilters(final List<String> filterClasses) {
                 } else {
                     logger.error("Misconfigured filter {} is not an IDropOffFilter instance, ignoring it", clazz);
                 }
-            } catch (Exception ex) {
+            } catch (RuntimeException ex) {
                 logger.error("Unable to create or initialize {}", clazz, ex);
             }
         }
@@ -199,7 +199,7 @@ public List<IBaseDataObject> agentProcessHeavyDuty(final List<IBaseDataObject> p
 
                 // Process the payload item with HDcontext=true
                 processData(d, true);
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 logger.error("Place.process threw:", e);
                 d.addProcessingError("agentProcessHD(" + myKey + "): " + e);
 
@@ -435,7 +435,7 @@ protected void runOutputFilters(final Object target, final Map<String, Object> f
                     filterStatus = IDropOffFilter.STATUS_SUCCESS;
                 }
                 logger.debug("Filter {} took {}s - {}", filter.getFilterName(), ((System.currentTimeMillis() - start) / 1000.0), filterStatus);
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 logger.error("Filter {} failed", filter.getFilterName(), e);
             }
 

diff --git a/src/main/java/emissary/parser/ParserFactory.java b/src/main/java/emissary/parser/ParserFactory.java
@@ -176,7 +176,7 @@ protected SessionParser makeSessionParserClass(@Nullable String clazz, Object...
 
         try {
             sp = (SessionParser) Factory.create(clazz, args);
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             logger.error("Unable to instantiate {}", clazz, e);
         }
 
@@ -190,7 +190,7 @@ protected void makeIdEngine(String clazz) {
         try {
             DataIdentifier d = (DataIdentifier) Factory.create(clazz);
             idEngine = d;
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             logger.warn("Cannot make data identifier from " + clazz, ex);
         }
     }

diff --git a/src/main/java/emissary/pickup/PickUpSpace.java b/src/main/java/emissary/pickup/PickUpSpace.java
@@ -155,7 +155,7 @@ public boolean take() {
             WorkBundle path = null;
             try {
                 path = tpa.outboundWorkSpaceTake(openSpaceName, myKey);
-            } catch (Exception ex) {
+            } catch (RuntimeException ex) {
                 logger.error("Failed to take work from " + openSpaceName, ex);
             }
 

diff --git a/src/main/java/emissary/pickup/QueServer.java b/src/main/java/emissary/pickup/QueServer.java
@@ -77,7 +77,7 @@ public void run() {
             // Process something on the queue
             try {
                 checkQue();
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 logger.warn("Exception in checkQue():" + e, e);
             }
 
@@ -131,7 +131,7 @@ public void checkQue() {
                 boolean status = processQueueItem(paths);
                 logger.debug("Initiating bundle completed msg for {}, status={}", paths.getBundleId(), status);
                 space.bundleCompleted(paths.getBundleId(), status);
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 StringBuilder fnb = new StringBuilder();
                 // Report filenames on error
                 for (Iterator<String> i = paths.getFileNameIterator(); i.hasNext();) {

diff --git a/src/main/java/emissary/place/CoordinationPlace.java b/src/main/java/emissary/place/CoordinationPlace.java
@@ -135,7 +135,7 @@ protected void configurePlace() {
                         failedCoordPlaceCreation.add(s + " in " + configG.findStringEntry("PLACE_NAME"));
                         logger.error("Place does not exist and cannot be created: {}", s);
                     }
-                } catch (Exception e) {
+                } catch (RuntimeException e) {
                     failedCoordPlaceCreation.add(s + " in " + configG.findStringEntry("PLACE_NAME"));
                     logger.error("Place does not exist and cannot be created: {}", s, e);
                 }

diff --git a/src/main/java/emissary/place/MultiFileUnixCommandPlace.java b/src/main/java/emissary/place/MultiFileUnixCommandPlace.java
@@ -668,11 +668,8 @@ protected List<IBaseDataObject> processData(@Nullable IBaseDataObject tData, int
             if (files != null && !files.isEmpty()) {
                 sprouts = sproutResults(tData, files, f.getParent(), parentData);
             }
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             logger.error("Problem in command execution", ex);
-            if (ex instanceof InterruptedException) {
-                throw new ResourceException(ex); // framework notification to stop
-            }
         } finally {
             // Delete the temporary directory and all of its contents.
             if (f != null) {

diff --git a/src/main/java/emissary/place/ServiceProviderPlace.java b/src/main/java/emissary/place/ServiceProviderPlace.java
@@ -529,7 +529,7 @@ public void agentProcessCall(IBaseDataObject payload) throws ResourceException {
             rehash(payload);
         } catch (ResourceException r) {
             throw r;
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             logger.error("Place.process exception", e);
         }
     }
@@ -898,7 +898,7 @@ protected void registerWithDirectory(List<String> keylist) {
                 logger.debug("Registering my {} keys {}", keylist.size(), keylist);
                 localDirPlace.addPlaces(keylist);
             }
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             logger.warn("Register ERROR for keys {}", keylist, e);
         }
     }
@@ -921,7 +921,7 @@ protected void deregisterFromDirectory(List<String> keys) {
                 logger.debug("Deregistering my {} proxies {}", keys.size(), keys);
                 localDirPlace.removePlaces(keys);
             }
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             logger.warn("Deregister ERROR keys={}", keys, e);
         }
     }

diff --git a/src/main/java/emissary/pool/AgentPool.java b/src/main/java/emissary/pool/AgentPool.java
@@ -233,7 +233,7 @@ protected void emptyPool() {
                     try {
                         // destroys the object, needed to decrement the numIdle
                         returnAgent(a);
-                    } catch (Exception e) {
+                    } catch (RuntimeException e) {
                         logger.error("Error trying to returnAgent: {}", a.getName(), e);
                     }
                 }

diff --git a/src/main/java/emissary/pool/MoveSpool.java b/src/main/java/emissary/pool/MoveSpool.java
@@ -224,7 +224,7 @@ public void run() {
                     logger.error("Unable to start agent, payload " + itemName + " is irretrievably lost", t);
                     try {
                         pool.returnAgent(agent);
-                    } catch (Exception ex) {
+                    } catch (RuntimeException ex) {
                         logger.error("Unable to return agent to the pool", ex);
                     }
                 } else {

diff --git a/src/main/java/emissary/pool/PayloadLauncher.java b/src/main/java/emissary/pool/PayloadLauncher.java
@@ -21,6 +21,7 @@ public class PayloadLauncher {
     private static final Logger logger = LoggerFactory.getLogger(PayloadLauncher.class);
 
 
+    @SuppressWarnings("CatchingUnchecked")
     public static boolean launch(Object payload, IServiceProviderPlace place, int errorCount, List<DirectoryEntry> itineraryItems)
             throws EmissaryException {
         String payloadName = PayloadUtil.getName(payload);

diff --git a/src/main/java/emissary/roll/RollManager.java b/src/main/java/emissary/roll/RollManager.java
@@ -64,7 +64,7 @@ protected void init(Configurator configG) {
             try {
                 Map<String, String> map = configG.findStringMatchMap(roller + "_");
                 cfgRollers.add(RollUtil.buildRoller(map));
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 log.warn("Unable to configure Rollable for: {}", roller);
             }
         }

diff --git a/src/main/java/emissary/server/api/Shutdown.java b/src/main/java/emissary/server/api/Shutdown.java
@@ -46,13 +46,13 @@ protected Response shutdown(HttpServletRequest request, boolean force) {
                     } else {
                         EmissaryServer.stopServer();
                     }
-                } catch (Exception e) {
+                } catch (RuntimeException e) {
                     // swallow
                 }
                 System.exit(0);
             }).start();
             return Response.ok("Shutdown initiated. Come again soon!").build();
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             LOG.warn("Exception trying to initiate shutdown: {}", e.getMessage());
             return Response.serverError().entity("Error trying to initiate shutdown").build();
         }

diff --git a/src/main/java/emissary/server/mvc/internal/RollOutputsAction.java b/src/main/java/emissary/server/mvc/internal/RollOutputsAction.java
@@ -1,6 +1,7 @@
 package emissary.server.mvc.internal;
 
 import emissary.core.Namespace;
+import emissary.core.NamespaceException;
 import emissary.core.ResourceWatcher;
 import emissary.output.DropOffPlace;
 import emissary.output.filter.IDropOffFilter;
@@ -39,7 +40,7 @@ public Response rollOutputs(@QueryParam("filter") List<String> outputFilterNames
                         f.close();
                         outputNames.append(" ").append(filter);
                     }
-                } catch (Exception ex) {
+                } catch (RuntimeException ex) {
                     outputNames.append(" ").append(filter).append("-FAILED");
                     logger.error("Could not roll " + filter, ex);
                 }
@@ -53,7 +54,7 @@ public Response rollOutputs(@QueryParam("filter") List<String> outputFilterNames
             }
 
             return Response.ok().entity("Output Rolled: " + outputNames).build();
-        } catch (Exception ex) {
+        } catch (NamespaceException | RuntimeException ex) {
             logger.warn("Could not roll outputs", ex);
             return Response.ok().entity("Could not roll outputs: " + ex.toString()).build();
         }