Java7 multi-catch

E-Samir · Jan 28, 2015 · bfe4ed3 · bfe4ed3
1 parent 67deb5c
commit bfe4ed3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/...ca/src/main/java/com/netflix/hystrix/contrib/javanica/cache/HystrixCacheKeyGenerator.java b/...ca/src/main/java/com/netflix/hystrix/contrib/javanica/cache/HystrixCacheKeyGenerator.java
@@ -87,11 +87,7 @@ private Object getPropertyValue(String name, Object obj) throws HystrixCacheKeyG
         try {
             return new PropertyDescriptor(name, obj.getClass())
                     .getReadMethod().invoke(obj);
-        } catch (IllegalAccessException e) {
-            throw new HystrixCacheKeyGenerationException(e);
-        } catch (InvocationTargetException e) {
-            throw new HystrixCacheKeyGenerationException(e);
-        } catch (IntrospectionException e) {
+        } catch (IllegalAccessException | IntrospectionException | InvocationTargetException e) {
             throw new HystrixCacheKeyGenerationException(e);
         }
     }

diff --git a/...ica/src/main/java/com/netflix/hystrix/contrib/javanica/command/MethodExecutionAction.java b/...ica/src/main/java/com/netflix/hystrix/contrib/javanica/command/MethodExecutionAction.java
@@ -99,9 +99,7 @@ private Object execute(Object o, Method m, Object... args) throws CommandActionE
         try {
             m.setAccessible(true); // suppress Java language access
             result = m.invoke(o, args);
-        } catch (IllegalAccessException e) {
-            propagateCause(e);
-        } catch (InvocationTargetException e) {
+        } catch (IllegalAccessException | InvocationTargetException e) {
             propagateCause(e);
         }
         return result;

diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixObservableCommandTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixObservableCommandTest.java
@@ -106,9 +106,7 @@ public void call(Subscriber<? super Boolean> sub) {
         for (Future<Boolean> future : futures) {
             try {
                 future.get();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            } catch (ExecutionException e) {
+            } catch (InterruptedException | ExecutionException e) {
                 throw new RuntimeException(e);
             }
         }