Merge branch 'fix_actions_on_parent_error_handler'

Author: pavlospt

errorhandler/src/main/java/com/workable/errorhandler/ErrorHandler.java

@@ -62,6 +62,12 @@ private ErrorHandler() {
         this.otherwiseActions = new ArrayList<>();
         this.alwaysActions = new ArrayList<>();
         this.errorCodeMap = new HashMap<>();
+        this.localContext = new ThreadLocal<Context>(){
+            @Override
+            protected Context initialValue() {
+                return new Context();
+            }
+        };
     }
 
     /**
@@ -273,7 +279,7 @@ public void run(BlockExecutor blockExecutor) {
         try {
             blockExecutor.invoke();
         } catch (Exception exception) {
-            handle(exception);
+            handle(exception, localContext);
         }
     }
 
@@ -283,12 +289,7 @@ public void run(BlockExecutor blockExecutor) {
      * @param error the error as a {@link Throwable}
      */
     public void handle(Throwable error) {
-        this.handle(error, new ThreadLocal<Context>() {
-            @Override
-            protected Context initialValue() {
-                return new Context();
-            }
-        });
+        this.handle(error, localContext);
     }
 
     /**

errorhandler/src/test/java/com/workable/errorhandler/ErrorHandlerTest.java

@@ -34,6 +34,8 @@ interface ActionDelegate {
 
         void defaultAction2();
 
+        void defaultAction3();
+
         void defaultOtherwise();
 
         void defaultAlways();
@@ -62,6 +64,7 @@ protected void setUp() {
                 })
                 .on(FooException.class, (throwable, errorHandler) -> actionDelegateMock.defaultAction1())
                 .on(500, (throwable, errorHandler) -> actionDelegateMock.defaultAction2())
+                .on("closed:bar", (throwable, errorHandler) -> actionDelegateMock.defaultAction3())
                 .otherwise((throwable, errorHandler) -> actionDelegateMock.defaultOtherwise())
                 .always((throwable, errorHandler) -> actionDelegateMock.defaultAlways());
     }
@@ -278,6 +281,36 @@ public void testErrorHandlerBlockExecutorIgnoresNotMatchedException() {
         Mockito.verifyNoMoreInteractions(actionDelegateMock);
     }
 
+    @Test
+    public void testErrorHandlerIfSkipDefaults() {
+        InOrder testVerifier = inOrder(actionDelegateMock);
+
+        ErrorHandler
+                .create()
+                .skipDefaults()
+                .on("closed:bar", (throwable, handler) -> {
+                    actionDelegateMock.action1();
+                })
+                .run(() -> {
+                    throw new BarException("", false);
+                });
+
+        testVerifier.verify(actionDelegateMock).action1();
+        Mockito.verifyNoMoreInteractions(actionDelegateMock);
+
+        ErrorHandler
+                .create()
+                .on("closed:bar", (throwable, handler) -> {
+                    actionDelegateMock.action2();
+                })
+                .run(() -> {
+                    throw new BarException("", false);
+                });
+
+        testVerifier.verify(actionDelegateMock).action2();
+        testVerifier.verify(actionDelegateMock).defaultAction3();
+    }
+
     private enum DBError {
         READ_ONLY,
         DEADLOCK,