HystrixObservableCollapser

Make the collapser support non-blocking HystrixObservableCommand
emedina · Apr 22, 2014 · fb96410 · fb96410
1 parent eea4a05
commit fb96410
Show file tree

Hide file tree

Showing 6 changed files with 754 additions and 7 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCollapser.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCollapser.java
@@ -78,7 +78,7 @@ public abstract class HystrixCollapser<BatchReturnType, ResponseType, RequestArg
      * <li>GLOBAL: Requests from any thread (ie. all HTTP requests) within the JVM will be collapsed. 1 queue for entire app.</li>
      * </ul>
      */
-    public static enum Scope {
+    public static enum Scope implements RequestCollapserFactory.Scope {
         REQUEST, GLOBAL
     }
 
@@ -185,7 +185,7 @@ public HystrixCollapserKey getCollapserKey() {
      * @return {@link Scope} that collapsing should be performed within.
      */
     public Scope getScope() {
-        return collapserFactory.getScope();
+        return Scope.valueOf(collapserFactory.getScope().name());
     }
 
     /**