review items: unnecessary checks; numeric constant instead of loop var

rwilliams-r7 · Sep 2, 2016 · cbecc00 · cbecc00
1 parent 94ff54d
commit cbecc00
Showing 1 changed file with 1 addition and 6 deletions.
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
@@ -175,11 +175,6 @@ public MetaHolder create(Object proxy, Method collapserMethod, Object obj, Objec
             Class<?> collapserReturnType = collapserMethod.getReturnType();
             boolean observable = collapserReturnType.equals(Observable.class);
 
-            if (!batchReturnType.equals(List.class))
-                throw new IllegalStateException("required batch method for collapser is absent: "
-                        + "(java.util.List) " + obj.getClass().getCanonicalName() + "." +
-                        hystrixCollapser.batchMethod() + "(java.util.List)");
-
             if (!collapserMethod.getParameterTypes()[0]
                     .equals(getFirstGenericParameter(batchCommandMethod.getGenericParameterTypes()[0]))) {
                 throw new IllegalStateException("required batch method for collapser is absent, wrong generic type: expected "
@@ -276,7 +271,7 @@ private static Class<?> getFirstGenericParameter(final Type type, final int nest
         for (int cDept = 0; cDept < nestedDepth; cDept++) {
             if (!(tType instanceof ParameterizedType))
                 throw new IllegalStateException(String.format("Sub type at nesting level %d of %s is expected to be generic", cDepth, type));
-            tType = ((ParameterizedType) tType).getActualTypeArguments()[0];
+            tType = ((ParameterizedType) tType).getActualTypeArguments()[cDept];
         }
 
         if (tType instanceof ParameterizedType)