collapse catch blocks

hcoles · Apr 19, 2021 · afba928 · afba928
1 parent 5f7de25
commit afba928
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 25 deletions.
diff --git a/pitest-aggregator/src/main/java/org/pitest/aggregate/DataLoader.java b/pitest-aggregator/src/main/java/org/pitest/aggregate/DataLoader.java
@@ -82,11 +82,7 @@ static Document readDocument(final InputStream inputStream) throws ReportAggrega
     try {
       docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
       return docBuilder.parse(inputStream);
-    } catch (final IOException e) {
-      throw new ReportAggregationException(e.getMessage(), e);
-    } catch (final SAXException e) {
-      throw new ReportAggregationException(e.getMessage(), e);
-    } catch (final ParserConfigurationException e) {
+    } catch (final IOException | SAXException | ParserConfigurationException e) {
       throw new ReportAggregationException(e.getMessage(), e);
     } finally {
       try {

diff --git a/pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/PluginFilter.java b/pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/PluginFilter.java
@@ -29,9 +29,7 @@ public String apply(final ClientClasspathPlugin a) {
         try {
           return new File(a.getClass().getProtectionDomain().getCodeSource()
               .getLocation().toURI()).getCanonicalPath();
-        } catch (final IOException ex) {
-          throw createPitErrorForExceptionOnClass(ex, a);
-        } catch (final URISyntaxException ex) {
+        } catch (final IOException | URISyntaxException ex) {
           throw createPitErrorForExceptionOnClass(ex, a);
         }
       }

diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/execute/MutationAnalysisExecutor.java b/pitest-entry/src/main/java/org/pitest/mutationtest/execute/MutationAnalysisExecutor.java
@@ -50,9 +50,7 @@ public void run(final List<MutationAnalysisUnit> testUnits) {
 
     try {
       processResult(results);
-    } catch (final InterruptedException e) {
-      throw Unchecked.translateCheckedException(e);
-    } catch (final ExecutionException e) {
+    } catch (final InterruptedException | ExecutionException e) {
       throw Unchecked.translateCheckedException(e);
     }
 

diff --git a/pitest/src/main/java/org/pitest/boot/HotSwapAgent.java b/pitest/src/main/java/org/pitest/boot/HotSwapAgent.java
@@ -46,13 +46,7 @@ public static boolean hotSwap(final Class<?> mutateMe, final byte[] bytes) { //
       instrumentation.redefineClasses(definitions);
 
       return true;
-    } catch (final ClassNotFoundException e) {
-      // swallow
-    } catch (final UnmodifiableClassException e) {
-      // swallow
-    } catch (final java.lang.VerifyError e) {
-      // swallow
-    } catch (final java.lang.InternalError e) {
+    } catch (final ClassNotFoundException | UnmodifiableClassException | VerifyError | InternalError e) {
       // swallow
     }
     return false;

diff --git a/pitest/src/main/java/org/pitest/classinfo/ClassName.java b/pitest/src/main/java/org/pitest/classinfo/ClassName.java
@@ -115,12 +115,9 @@ public static Function<ClassName, Stream<Class<?>>> nameToClass(
         LOG.warning("Could not load " + className
             + " (NoClassDefFoundError: " + e2.getMessage() + ")");
         return Stream.empty();
-      } catch (final LinkageError e3) {
+      } catch (final LinkageError | SecurityException e3) {
         LOG.warning("Could not load " + className + " " + e3.getMessage());
         return Stream.empty();
-      } catch (final SecurityException e4) {
-        LOG.warning("Could not load " + className + " " + e4.getMessage());
-        return Stream.empty();
       }
     };
   }

diff --git a/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTimeoutDecorator.java b/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTimeoutDecorator.java
@@ -59,9 +59,7 @@ private void executeFutureWithTimeOut(final long maxTime,
       final FutureTask<?> future, final ResultCollector rc) {
     try {
       future.get(maxTime, TimeUnit.MILLISECONDS);
-    } catch (final TimeoutException ex) {
-      // swallow
-    } catch (final InterruptedException e) {
+    } catch (final TimeoutException | InterruptedException ex) {
       // swallow
     } catch (final ExecutionException e) {
       throw Unchecked.translateCheckedException(e);