add support for HTTP verbs (thanks to https://github.com/keijohyttinen)

kullfar · kullfar · commit 43ea452609f7 · 2016-12-07T16:55:48.000+03:00
diff --git a/changelog b/changelog
@@ -2,6 +2,7 @@
  * uncouple OAuthRequest and Service. OAuthRequest shouldn't know anything about OAuthservice.
    You don't need OAuthService to create OAuthRequest anymore. Async request should be sent via OAuthService method.
  * add support for byte[] and File (async only) payload in OAuth Requests (thanks to https://github.com/keijohyttinen)
+ * add support for  HTTP verbs (thanks to https://github.com/keijohyttinen)
 
 [3.3.0]
  * update Facebook v2.6 -> v2.8
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java
@@ -61,22 +61,31 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
     private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> headers, Verb httpVerb,
             String completeUrl, BodySetter bodySetter, OAuthAsyncRequestCallback<T> callback,
             OAuthRequestAsync.ResponseConverter<T> converter) {
-        final BoundRequestBuilder boundRequestBuilder;
+        BoundRequestBuilder boundRequestBuilder;
         switch (httpVerb) {
             case GET:
                 boundRequestBuilder = client.prepareGet(completeUrl);
                 break;
             case POST:
-                BoundRequestBuilder requestBuilder = client.preparePost(completeUrl);
-                if (!headers.containsKey(AbstractRequest.CONTENT_TYPE)) {
-                    requestBuilder = requestBuilder.addHeader(AbstractRequest.CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
-                }
-                boundRequestBuilder = bodySetter.setBody(requestBuilder);
+                boundRequestBuilder = client.preparePost(completeUrl);
+                break;
+            case PUT:
+                boundRequestBuilder = client.preparePut(completeUrl);
+                break;
+            case DELETE:
+                boundRequestBuilder = client.prepareDelete(completeUrl);
                 break;
             default:
                 throw new IllegalArgumentException("message build error: unknown verb type");
         }
 
+        if (httpVerb == Verb.POST || httpVerb == Verb.PUT || httpVerb == Verb.DELETE) {
+            if (!headers.containsKey(AbstractRequest.CONTENT_TYPE)) {
+                boundRequestBuilder = boundRequestBuilder.addHeader(AbstractRequest.CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
+            }
+            boundRequestBuilder = bodySetter.setBody(boundRequestBuilder);
+        }
+
         for (Map.Entry<String, String> header : headers.entrySet()) {
             boundRequestBuilder.addHeader(header.getKey(), header.getValue());
         }
diff --git a/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java b/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java
@@ -63,22 +63,31 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
     private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> headers, Verb httpVerb,
             String completeUrl, BodySetter bodySetter, OAuthAsyncRequestCallback<T> callback,
             OAuthRequestAsync.ResponseConverter<T> converter) {
-        final AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
+        AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
         switch (httpVerb) {
             case GET:
                 boundRequestBuilder = client.prepareGet(completeUrl);
                 break;
             case POST:
-                AsyncHttpClient.BoundRequestBuilder requestBuilder = client.preparePost(completeUrl);
-                if (!headers.containsKey(AbstractRequest.CONTENT_TYPE)) {
-                    requestBuilder = requestBuilder.addHeader(AbstractRequest.CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
-                }
-                boundRequestBuilder = bodySetter.setBody(requestBuilder);
+                boundRequestBuilder = client.preparePost(completeUrl);
+                break;
+            case PUT:
+                boundRequestBuilder = client.preparePut(completeUrl);
+                break;
+            case DELETE:
+                boundRequestBuilder = client.prepareDelete(completeUrl);
                 break;
             default:
                 throw new IllegalArgumentException("message build error: unknown verb type");
         }
 
+        if (httpVerb == Verb.POST || httpVerb == Verb.PUT || httpVerb == Verb.DELETE) {
+            if (!headers.containsKey(AbstractRequest.CONTENT_TYPE)) {
+                boundRequestBuilder = boundRequestBuilder.addHeader(AbstractRequest.CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
+            }
+            boundRequestBuilder = bodySetter.setBody(boundRequestBuilder);
+        }
+
         for (Map.Entry<String, String> header : headers.entrySet()) {
             boundRequestBuilder.addHeader(header.getKey(), header.getValue());
         }
