send missed headers in async version (as in sync)

s-gromov · s-gromov · commit 1d9553f3f9a4 · 2016-03-11T12:54:53.000+03:00
diff --git a/changelog b/changelog
@@ -6,6 +6,7 @@
  * add response_type parameter to the ServiceBuilder/OAuthConfig to use not only "code" for authorization code
  * remove Verifier object, we just need Strings, 'code' for OAuth2 and 'oauthVerifier' for OAuth1
  * default HTTP verb for OAuth 2.0 Access Token EndPoint is POST (http://tools.ietf.org/html/rfc6749#section-3.2)
+ * send missed headers in async version (as in sync)
 
 [2.3.0]
  * Stack Exchange authentication via OAuth 2.0 (stackoverflow.com, askubuntu.com, etc.).
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequestAsync.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequestAsync.java
@@ -38,6 +38,21 @@ public OAuthRequestAsync(Verb verb, String url, OAuthService service) {
         super(verb, url, service);
     }
 
+    private Map<String, Collection<String>> mapHeaders() {
+        final Map<String, Collection<String>> mapped = new HashMap<>();
+
+        for (Map.Entry<String, String> header : getHeaders().entrySet()) {
+            final String headerName = header.getKey();
+            Collection<String> headerValues = mapped.get(headerName);
+            if (headerValues == null) {
+                headerValues = new ArrayList<>();
+                mapped.put(headerName, headerValues);
+            }
+            headerValues.add(header.getValue());
+        }
+        return mapped;
+    }
+
     public <T> Future<T> sendAsync(OAuthAsyncRequestCallback<T> callback, ResponseConverter<T> converter) {
         return sendAsync(callback, converter, null);
     }
@@ -54,48 +69,26 @@ public <T> Future<T> sendAsync(OAuthAsyncRequestCallback<T> callback, ResponseCo
         }
         final String completeUrl = getCompleteUrl();
         final AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
+        final AsyncHttpClient asyncHttpClient = service.getAsyncHttpClient();
         switch (getVerb()) {
             case GET:
-                boundRequestBuilder = service.getAsyncHttpClient()
-                        .prepareGet(completeUrl)
-                        .setHeaders(mapHeaders());
-
+                boundRequestBuilder = asyncHttpClient.prepareGet(completeUrl);
                 break;
             case POST:
-                boundRequestBuilder = service.getAsyncHttpClient().preparePost(completeUrl)
-                        .setBody(getBodyContents())
-                        .setHeaders(mapHeaders());
-
+                boundRequestBuilder = asyncHttpClient.preparePost(completeUrl).setBody(getBodyContents());
                 break;
             default:
                 throw new IllegalArgumentException("message build error: unknown verb type");
         }
+
+        boundRequestBuilder.setHeaders(mapHeaders());
+
         if (proxyServer != null) {
             boundRequestBuilder.setProxyServer(proxyServer);
         }
         return boundRequestBuilder.execute(new OAuthAsyncCompletionHandler<>(callback, converter));
     }
 
-    public Future<Response> sendAsync(OAuthAsyncRequestCallback<Response> callback) {
-        return sendAsync(callback, RESPONSE_CONVERTER, null);
-    }
-
-    public Future<Response> sendAsync(OAuthAsyncRequestCallback<Response> callback, ProxyServer proxyServer) {
-        return sendAsync(callback, RESPONSE_CONVERTER, proxyServer);
-    }
-
-    private Map<String, Collection<String>> mapHeaders() {
-        final Map<String, String> headers = getHeaders();
-        final Map<String, Collection<String>> mapped = new HashMap<>();
-
-        for(Map.Entry<String, String> entry: headers.entrySet()) {
-            final ArrayList<String> list = new ArrayList<>();
-            list.add(entry.getValue());
-            mapped.put(entry.getKey(), list);
-        }
-        return mapped;
-    }
-
     private static class OAuthAsyncCompletionHandler<T> extends AsyncCompletionHandler<T> {
 
         private final OAuthAsyncRequestCallback<T> callback;
@@ -123,6 +116,14 @@ public void onThrowable(Throwable t) {
         }
     };
 
+    public Future<Response> sendAsync(OAuthAsyncRequestCallback<Response> callback) {
+        return sendAsync(callback, RESPONSE_CONVERTER, null);
+    }
+
+    public Future<Response> sendAsync(OAuthAsyncRequestCallback<Response> callback, ProxyServer proxyServer) {
+        return sendAsync(callback, RESPONSE_CONVERTER, proxyServer);
+    }
+
     public interface ResponseConverter<T> {
 
         T convert(com.ning.http.client.Response response) throws IOException;
