Modify AsyncResponseHandler.handleResponse method signature

OpenFeign · Oct 10, 2022 · 4304656 · 4304656
1 parent 72536a7
commit 4304656
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/core/src/main/java/feign/AsyncResponseHandler.java b/core/src/main/java/feign/AsyncResponseHandler.java
@@ -36,6 +36,17 @@ public AsyncResponseHandler(Level logLevel, Logger logger, Decoder decoder,
         responseInterceptor);
   }
 
+  public CompletableFuture<Object> handleResponse(
+      String configKey, Response response, Type returnType, long elapsedTime) {
+    CompletableFuture<Object> resultFuture = new CompletableFuture<>();
+    handleResponse(resultFuture, configKey, response, returnType, elapsedTime);
+    return resultFuture;
+  }
+
+  /**
+   * @deprecated use {@link #handleResponse(String, Response, Type, long)} instead.
+   */
+  @Deprecated()
   public void handleResponse(CompletableFuture<Object> resultFuture,
                              String configKey,
                              Response response,

diff --git a/core/src/main/java/feign/AsynchronousMethodHandler.java b/core/src/main/java/feign/AsynchronousMethodHandler.java
@@ -188,16 +188,8 @@ private static Response ensureRequestIsSet(Response response,
   }
 
   private CompletableFuture<Object> handleResponse(Response response, long elapsedTime) {
-    CompletableFuture<Object> resultFuture = new CompletableFuture<>();
-
-    asyncResponseHandler.handleResponse(resultFuture, metadata.configKey(), response,
-        methodInfo.underlyingReturnType(), elapsedTime);
-
-    if (!resultFuture.isDone()) {
-      resultFuture.completeExceptionally(new IllegalStateException("Response handling not done"));
-    }
-
-    return resultFuture;
+    return asyncResponseHandler.handleResponse(
+        metadata.configKey(), response, methodInfo.underlyingReturnType(), elapsedTime);
   }
 
   private long elapsedTime(long start) {