Merge pull request #1616 from dmgcodevil/iss1600

iss1600: Wrong hystrix event type for fallback missing

Author: mattrjacobs

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/AbstractHystrixCommand.java

@@ -167,14 +167,6 @@ Object process(Action action) throws Exception {
     @Override
     protected abstract T run() throws Exception;
 
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    protected T getFallback() {
-        throw new RuntimeException("No fallback available.", getExecutionException());
-    }
-
     /**
      * Clears cache for the specified hystrix command.
      */

hystrix-contrib/hystrix-javanica/src/test/java/com/netflix/hystrix/contrib/javanica/test/common/fallback/BasicCommandFallbackTest.java

@@ -218,8 +218,24 @@ public void testCommandThrowsHystrixBadRequestExceptionWithNoCause() {
         }
     }
 
+    @Test
+    public void testFallbackMissing(){
+        try {
+            userService.getUserWithoutFallback(null, null);
+        } catch (Exception e) {}
+
+        HystrixInvokableInfo<?> command = getHystrixCommandByKey("getUserWithoutFallback");
+        assertTrue("expected event: FALLBACK_MISSING", command.getExecutionEvents().contains(HystrixEventType.FALLBACK_MISSING));
+    }
+
     public static class UserService {
 
+        @HystrixCommand
+        public User getUserWithoutFallback(final String id, final String name) {
+            validate(id, name);
+            return new User(id, name);
+        }
+
         @HystrixCommand(fallbackMethod = "fallback")
         public Future<User> getUserAsync(final String id, final String name) {
             validate(id, name); // validate logic can be inside and outside of AsyncResult#invoke method