Remove handleResponse that returning CompletableFuture

OpenFeign · Oct 10, 2022 · a57a3a9 · a57a3a9
1 parent 5c3d2a4
commit a57a3a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 42 deletions.
diff --git a/core/src/main/java/feign/AsynchronousMethodHandler.java b/core/src/main/java/feign/AsynchronousMethodHandler.java
@@ -188,16 +188,15 @@ private static Response ensureRequestIsSet(Response response,
   }
 
   private CompletableFuture<Object> handleResponse(Response response, long elapsedTime) {
-    CompletableFuture<Object> resultFuture = new CompletableFuture<>();
-
-    responseHandler.handleResponse(resultFuture, metadata.configKey(), response,
-        methodInfo.underlyingReturnType(), elapsedTime);
-
-    if (!resultFuture.isDone()) {
-      resultFuture.completeExceptionally(new IllegalStateException("Response handling not done"));
+    try {
+      final Object result = responseHandler.handleResponse(
+          metadata.configKey(), response, methodInfo.underlyingReturnType(), elapsedTime);
+      return CompletableFuture.completedFuture(result);
+    } catch (final Exception e) {
+      CompletableFuture<Object> resultFuture = new CompletableFuture<>();
+      resultFuture.completeExceptionally(e);
+      return resultFuture;
     }
-
-    return resultFuture;
   }
 
   private long elapsedTime(long start) {

diff --git a/core/src/main/java/feign/ResponseHandler.java b/core/src/main/java/feign/ResponseHandler.java
@@ -48,24 +48,10 @@ public ResponseHandler(Level logLevel, Logger logger, Decoder decoder,
     this.responseInterceptor = responseInterceptor;
   }
 
-  public void handleResponse(CompletableFuture<Object> resultFuture,
-                             String configKey,
-                             Response response,
-                             Type returnType,
-                             long elapsedTime) {
-    try {
-      resultFuture.complete(
-          handleResponse(configKey, response, returnType, elapsedTime)
-      );
-    } catch (Exception e) {
-      resultFuture.completeExceptionally(e);
-    }
-  }
-
-  private Object handleResponse(String configKey,
-                                Response response,
-                                Type returnType,
-                                long elapsedTime) throws Exception {
+  public Object handleResponse(String configKey,
+                               Response response,
+                               Type returnType,
+                               long elapsedTime) throws Exception {
     try {
       response = logAndRebufferResponseIfNeeded(configKey, logLevel, response, elapsedTime);
       if (returnType == Response.class) {

diff --git a/core/src/main/java/feign/SynchronousMethodHandler.java b/core/src/main/java/feign/SynchronousMethodHandler.java
@@ -117,22 +117,9 @@ Object executeAndDecode(RequestTemplate template, Options options) throws Throwa
       }
       throw errorExecuting(request, e);
     }
-    long elapsedTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
-
-    CompletableFuture<Object> resultFuture = new CompletableFuture<>();
-    responseHandler.handleResponse(resultFuture, metadata.configKey(), response,
-        metadata.returnType(), elapsedTime);
 
-    try {
-      if (!resultFuture.isDone())
-        throw new IllegalStateException("Response handling not done");
-      return resultFuture.join();
-    } catch (CompletionException e) {
-      Throwable cause = e.getCause();
-      if (cause != null)
-        throw cause;
-      throw e;
-    }
+    long elapsedTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
+    return responseHandler.handleResponse(metadata.configKey(), response, metadata.returnType(), elapsedTime);
   }
 
   long elapsedTime(long start) {