Merge branch 'issue-587-async-header-fix' of https://github.com/breadfan/scribejava into breadfan-issue-587-async-header-fix

s-gromov · s-gromov · commit a662a0d473d7 · 2016-03-11T12:36:53.000+03:00
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
@@ -1,16 +1,19 @@
 package com.github.scribejava.core.model;
 
+import com.github.scribejava.core.exceptions.OAuthException;
+import com.github.scribejava.core.oauth.OAuthService;
 import com.ning.http.client.AsyncCompletionHandler;
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
 import com.ning.http.client.ProxyServer;
+
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.Future;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.oauth.OAuthService;
 
 public class OAuthRequestAsync extends AbstractRequest {
 
@@ -53,10 +56,16 @@ public <T> Future<T> sendAsync(OAuthAsyncRequestCallback<T> callback, ResponseCo
         final AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
         switch (getVerb()) {
             case GET:
-                boundRequestBuilder = service.getAsyncHttpClient().prepareGet(completeUrl);
+                boundRequestBuilder = service.getAsyncHttpClient()
+                        .prepareGet(completeUrl)
+                        .setHeaders(mapHeaders());
+
                 break;
             case POST:
-                boundRequestBuilder = service.getAsyncHttpClient().preparePost(completeUrl).setBody(getBodyContents());
+                boundRequestBuilder = service.getAsyncHttpClient().preparePost(completeUrl)
+                        .setBody(getBodyContents())
+                        .setHeaders(mapHeaders());
+
                 break;
             default:
                 throw new IllegalArgumentException("message build error: unknown verb type");
@@ -67,6 +76,26 @@ public <T> Future<T> sendAsync(OAuthAsyncRequestCallback<T> callback, ResponseCo
         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;
@@ -94,14 +123,6 @@ 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;
