Adding option to raise HystrixRuntimeException instead of cause

rwilliams-r7 · Oct 20, 2016 · 8d8a8b3 · 8d8a8b3
1 parent 4e08f1a
commit 8d8a8b3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/...avanica/src/main/java/com/netflix/hystrix/contrib/javanica/annotation/HystrixCommand.java b/...avanica/src/main/java/com/netflix/hystrix/contrib/javanica/annotation/HystrixCommand.java
@@ -100,7 +100,8 @@
     HystrixProperty[] threadPoolProperties() default {};
 
     /**
-     * Defines exceptions which should be ignored and wrapped to throw in HystrixBadRequestException.
+     * Defines exceptions which should be ignored.
+     * Optionally these can be wrapped in a HystrixRuntimeException if raiseHystrixExceptions is set to true.
      *
      * @return exceptions to ignore
      */
@@ -113,5 +114,11 @@
      * @return observable execution mode
      */
     ObservableExecutionMode observableExecutionMode() default ObservableExecutionMode.EAGER;
+
+    /**
+     * When set to true, any exceptions that are not ignored are wrapped in HystrixRuntimeException.
+     * @return true to raise HystrixRuntimeException instead of their cause.
+     */
+    boolean raiseHystrixRuntimeExceptions() default false;
 }
 
diff --git a/.../src/main/java/com/netflix/hystrix/contrib/javanica/aop/aspectj/HystrixCommandAspect.java b/.../src/main/java/com/netflix/hystrix/contrib/javanica/aop/aspectj/HystrixCommandAspect.java
@@ -103,6 +103,9 @@ public Object methodsAnnotatedWithHystrixCommand(final ProceedingJoinPoint joinP
         } catch (HystrixBadRequestException e) {
             throw e.getCause();
         } catch (HystrixRuntimeException e) {
+            if (metaHolder.getRaiseHystrixRuntimeExceptions()) {
+                throw e;
+            }
             throw getCause(e);
         }
         return result;
@@ -253,6 +256,7 @@ public MetaHolder create(Object proxy, Method method, Object obj, Object[] args,
             return builder.defaultCommandKey(method.getName())
                             .hystrixCommand(hystrixCommand)
                             .observableExecutionMode(hystrixCommand.observableExecutionMode())
+                            .raiseHystrixRuntimeExceptions(hystrixCommand.raiseHystrixRuntimeExceptions())
                             .executionType(executionType)
                             .observable(ExecutionType.OBSERVABLE == executionType)
                             .build();

diff --git a/...strix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/MetaHolder.java b/...strix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/MetaHolder.java
@@ -67,6 +67,7 @@ public final class MetaHolder {
     private final JoinPoint joinPoint;
     private final boolean observable;
     private final ObservableExecutionMode observableExecutionMode;
+    private final boolean raiseHystrixRuntimeExceptions;
 
     private static final Function identityFun = new Function<Object, Object>() {
         @Nullable
@@ -101,6 +102,7 @@ private MetaHolder(Builder builder) {
         this.extendedParentFallback = builder.extendedParentFallback;
         this.observable = builder.observable;
         this.observableExecutionMode = builder.observableExecutionMode;
+        this.raiseHystrixRuntimeExceptions = builder.raiseHystrixRuntimeExceptions;
     }
 
     public static Builder builder() {
@@ -299,6 +301,10 @@ public ObservableExecutionMode getObservableExecutionMode() {
         return observableExecutionMode;
     }
 
+    public boolean getRaiseHystrixRuntimeExceptions() {
+        return raiseHystrixRuntimeExceptions;
+    }
+
     private String get(String key, String defaultKey) {
         return StringUtils.isNotBlank(key) ? key : defaultKey;
     }
@@ -353,6 +359,7 @@ public static final class Builder {
         private boolean observable;
         private JoinPoint joinPoint;
         private ObservableExecutionMode observableExecutionMode;
+        private boolean raiseHystrixRuntimeExceptions;
 
         public Builder hystrixCollapser(HystrixCollapser hystrixCollapser) {
             this.hystrixCollapser = hystrixCollapser;
@@ -474,6 +481,11 @@ public Builder observableExecutionMode(ObservableExecutionMode observableExecuti
             return this;
         }
 
+        public Builder raiseHystrixRuntimeExceptions(boolean raiseHystrixRuntimeExceptions) {
+            this.raiseHystrixRuntimeExceptions = raiseHystrixRuntimeExceptions;
+            return this;
+        }
+
         public MetaHolder build() {
             return new MetaHolder(this);
         }

diff --git a/.../netflix/hystrix/contrib/javanica/test/common/error/BasicDefaultIgnoreExceptionsTest.java b/.../netflix/hystrix/contrib/javanica/test/common/error/BasicDefaultIgnoreExceptionsTest.java
@@ -33,7 +33,7 @@ public void testCommandOverridesDefaultIgnoreExceptions() {
         service.commandOverridesDefaultIgnoreExceptions(SpecificException.class);
     }
 
-    @Test(expected = BadRequestException.class)
+    @Test(expected = HystrixRuntimeException.class)
     public void testCommandOverridesDefaultIgnoreExceptions_nonIgnoreExceptionShouldBePropagated() {
         // method throws BadRequestException that isn't ignored
         service.commandOverridesDefaultIgnoreExceptions(BadRequestException.class);
@@ -64,7 +64,7 @@ public Object commandInheritsDefaultIgnoreExceptions() throws BadRequestExceptio
             throw new BadRequestException("from 'commandInheritsIgnoreExceptionsFromDefault'");
         }
 
-        @HystrixCommand(ignoreExceptions = SpecificException.class)
+        @HystrixCommand(ignoreExceptions = SpecificException.class, raiseHystrixRuntimeExceptions = true)
         public Object commandOverridesDefaultIgnoreExceptions(Class<? extends Throwable> errorType) throws BadRequestException, SpecificException  {
             if(errorType.equals(BadRequestException.class)){
                 // isn't ignored because command doesn't specify this exception type in 'ignoreExceptions'