throw Throwable from callback (it got lost before)

kullfar · kullfar · commit 12c6b05b2839 · 2022-09-20T09:40:07.000+03:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/AbstractAsyncOnlyHttpClient.java b/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/AbstractAsyncOnlyHttpClient.java
@@ -1,6 +1,6 @@
 package com.github.scribejava.core.httpclient;
 
-import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
 import com.github.scribejava.core.model.Response;
 import com.github.scribejava.core.model.Verb;
 import java.io.File;
@@ -14,32 +14,89 @@ public abstract class AbstractAsyncOnlyHttpClient implements HttpClient {
     public Response execute(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
             byte[] bodyContents) throws InterruptedException, ExecutionException, IOException {
 
-        return executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents, null,
-                (OAuthRequest.ResponseConverter<Response>) null).get();
+        final OAuthAsyncRequestThrowableHolderCallback oAuthAsyncRequestThrowableHolderCallback
+                = new OAuthAsyncRequestThrowableHolderCallback();
+
+        final Response response = executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents,
+                oAuthAsyncRequestThrowableHolderCallback, null).get();
+
+        final Throwable throwable = oAuthAsyncRequestThrowableHolderCallback.getThrowable();
+        if (throwable != null) {
+            throw new ExecutionException(throwable);
+        }
+        return response;
     }
 
     @Override
     public Response execute(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
             com.github.scribejava.core.httpclient.multipart.MultipartPayload bodyContents)
             throws InterruptedException, ExecutionException, IOException {
 
-        return executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents, null,
-                (OAuthRequest.ResponseConverter<Response>) null).get();
+        final OAuthAsyncRequestThrowableHolderCallback oAuthAsyncRequestThrowableHolderCallback
+                = new OAuthAsyncRequestThrowableHolderCallback();
+
+        final Response response = executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents,
+                oAuthAsyncRequestThrowableHolderCallback, null).get();
+
+        final Throwable throwable = oAuthAsyncRequestThrowableHolderCallback.getThrowable();
+        if (throwable != null) {
+            throw new ExecutionException(throwable);
+        }
+
+        return response;
     }
 
     @Override
     public Response execute(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
             String bodyContents) throws InterruptedException, ExecutionException, IOException {
 
-        return executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents, null,
-                (OAuthRequest.ResponseConverter<Response>) null).get();
+        final OAuthAsyncRequestThrowableHolderCallback oAuthAsyncRequestThrowableHolderCallback
+                = new OAuthAsyncRequestThrowableHolderCallback();
+
+        final Response response = executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents,
+                oAuthAsyncRequestThrowableHolderCallback, null).get();
+
+        final Throwable throwable = oAuthAsyncRequestThrowableHolderCallback.getThrowable();
+        if (throwable != null) {
+            throw new ExecutionException(throwable);
+        }
+
+        return response;
     }
 
     @Override
     public Response execute(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
             File bodyContents) throws InterruptedException, ExecutionException, IOException {
 
-        return executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents, null,
-                (OAuthRequest.ResponseConverter<Response>) null).get();
+        final OAuthAsyncRequestThrowableHolderCallback oAuthAsyncRequestThrowableHolderCallback
+                = new OAuthAsyncRequestThrowableHolderCallback();
+
+        final Response response = executeAsync(userAgent, headers, httpVerb, completeUrl, bodyContents,
+                oAuthAsyncRequestThrowableHolderCallback, null).get();
+
+        final Throwable throwable = oAuthAsyncRequestThrowableHolderCallback.getThrowable();
+        if (throwable != null) {
+            throw new ExecutionException(throwable);
+        }
+
+        return response;
+    }
+
+    private class OAuthAsyncRequestThrowableHolderCallback implements OAuthAsyncRequestCallback<Response> {
+
+        private Throwable throwable;
+
+        @Override
+        public void onCompleted(Response response) {
+        }
+
+        @Override
+        public void onThrowable(Throwable t) {
+            throwable = t;
+        }
+
+        public Throwable getThrowable() {
+            return throwable;
+        }
     }
 }
