Merge pull request OpenFeign#387 from padilo/completable_support

adriancole · adriancole · commit 816cf508318e · 2016-04-30T09:01:25.000+08:00
Added rx.Completable support
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Version 8.17
+* Adds support to RxJava Completable via `HystrixFeign` builder with fallback support
+* Upgraded hystrix-core to 1.4.26
+
 ### Version 8.16
 * Adds `@HeaderMap` annotation to support dynamic header fields and values
 * Add support for default and static methods on interfaces
diff --git a/hystrix/build.gradle b/hystrix/build.gradle
@@ -4,7 +4,7 @@ sourceCompatibility = 1.6
 
 dependencies {
     compile project(':feign-core')
-    compile 'com.netflix.hystrix:hystrix-core:1.4.21'
+    compile 'com.netflix.hystrix:hystrix-core:1.4.26'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
     testCompile 'com.squareup.okhttp:mockwebserver:2.7.5'
diff --git a/hystrix/src/main/java/feign/hystrix/HystrixDelegatingContract.java b/hystrix/src/main/java/feign/hystrix/HystrixDelegatingContract.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
+import rx.Completable;
 import rx.Observable;
 import rx.Single;
 
@@ -46,6 +47,9 @@ public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) {
           && ((ParameterizedType) type).getRawType().equals(Single.class)) {
         Type actualType = resolveLastTypeParameter(type, Single.class);
         metadata.returnType(actualType);
+      } else if (type instanceof ParameterizedType
+          && ((ParameterizedType) type).getRawType().equals(Completable.class)) {
+        metadata.returnType(void.class);
       }
     }
 
diff --git a/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java b/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java
@@ -29,6 +29,7 @@
 import java.lang.reflect.Proxy;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import rx.Completable;
 import rx.Observable;
 import rx.Single;
 
@@ -117,6 +118,9 @@ protected Object getFallback() {
               } else if (isReturnsSingle(method)) {
                 // Create a cold Observable as a Single
                 return ((Single) result).toObservable().toBlocking().first();
+              } else if (isReturnsCompletable(method)) {
+                ((Completable) result).await();
+                return null;
               } else {
                 return result;
               }
@@ -138,10 +142,16 @@ protected Object getFallback() {
     } else if (isReturnsSingle(method)) {
       // Create a cold Observable as a Single
       return hystrixCommand.toObservable().toSingle();
+    } else if (isReturnsCompletable(method)) {
+      return hystrixCommand.toObservable().toCompletable();
     }
     return hystrixCommand.execute();
   }
 
+  private boolean isReturnsCompletable(Method method) {
+    return Completable.class.isAssignableFrom(method.getReturnType());
+  }
+
   private boolean isReturnsHystrixCommand(Method method) {
     return HystrixCommand.class.isAssignableFrom(method.getReturnType());
   }
diff --git a/hystrix/src/test/java/feign/hystrix/HystrixBuilderTest.java b/hystrix/src/test/java/feign/hystrix/HystrixBuilderTest.java
@@ -23,6 +23,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import rx.Completable;
 import rx.Observable;
 import rx.Single;
 import rx.observers.TestSubscriber;
@@ -383,6 +384,81 @@ public void rxSingleListFallback() {
     assertThat(testSubscriber.getOnNextEvents().get(0)).containsExactly("fallback");
   }
 
+  @Test
+  public void rxCompletableEmptyBody() {
+    server.enqueue(new MockResponse());
+
+    TestInterface api = target();
+
+    Completable completable = api.completable();
+
+    assertThat(completable).isNotNull();
+    assertThat(server.getRequestCount()).isEqualTo(0);
+
+    TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+    completable.subscribe(testSubscriber);
+    testSubscriber.awaitTerminalEvent();
+
+    testSubscriber.assertCompleted();
+    testSubscriber.assertNoErrors();
+  }
+
+  @Test
+  public void rxCompletableWithBody() {
+    server.enqueue(new MockResponse().setBody("foo"));
+
+    TestInterface api = target();
+
+    Completable completable = api.completable();
+
+    assertThat(completable).isNotNull();
+    assertThat(server.getRequestCount()).isEqualTo(0);
+
+    TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+    completable.subscribe(testSubscriber);
+    testSubscriber.awaitTerminalEvent();
+
+    testSubscriber.assertCompleted();
+    testSubscriber.assertNoErrors();
+  }
+
+  @Test
+  public void rxCompletableFailWithoutFallback() {
+    server.enqueue(new MockResponse().setResponseCode(500));
+
+    TestInterface api =
+        HystrixFeign.builder().target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    Completable completable = api.completable();
+
+    assertThat(completable).isNotNull();
+    assertThat(server.getRequestCount()).isEqualTo(0);
+
+    TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+    completable.subscribe(testSubscriber);
+    testSubscriber.awaitTerminalEvent();
+
+    testSubscriber.assertError(HystrixRuntimeException.class);
+  }
+
+  @Test
+  public void rxCompletableFallback() {
+    server.enqueue(new MockResponse().setResponseCode(500));
+
+    TestInterface api = target();
+
+    Completable completable = api.completable();
+
+    assertThat(completable).isNotNull();
+    assertThat(server.getRequestCount()).isEqualTo(0);
+
+    TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+    completable.subscribe(testSubscriber);
+    testSubscriber.awaitTerminalEvent();
+
+    testSubscriber.assertCompleted();
+  }
+
   @Test
   public void plainString() {
     server.enqueue(new MockResponse().setBody("\"foo\""));
@@ -520,6 +596,9 @@ interface TestInterface {
     @RequestLine("GET /")
     @Headers("Accept: application/json")
     List<String> getList();
+
+    @RequestLine("GET /")
+    Completable completable();
   }
 
   class FallbackTestInterface implements TestInterface {
@@ -600,5 +679,10 @@ public List<String> getList() {
       fallbackResult.add("fallback");
       return fallbackResult;
     }
+
+    @Override
+    public Completable completable() {
+      return Completable.complete();
+    }
   }
 }
