add body for PATCH HTTP method

kullfar · kullfar · commit bd9a43018147 · 2017-02-01T13:09:21.000+03:00
diff --git a/changelog b/changelog
@@ -1,3 +1,6 @@
+[SNAPSHOT]
+ * add body for PATCH HTTP method
+
 [4.0.0]
  * Remove OAuthRequestAsync, just OAuthRequest. Request should know about sync vs async. Move default Http engine to JDKHttpClient.
  * introduce SignatureType for OAuth2.0 to implement Bearer signing for the requests
diff --git a/pom.xml b/pom.xml
@@ -148,7 +148,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <source>1.7</source>
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClient.java b/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClient.java
@@ -96,7 +96,7 @@ private Response doExecute(String userAgent, Map<String, String> headers, Verb h
             connection.setReadTimeout(config.getReadTimeout());
         }
         addHeaders(connection, headers, userAgent);
-        if (httpVerb == Verb.POST || httpVerb == Verb.PUT || httpVerb == Verb.DELETE) {
+        if (httpVerb.isPermitBody()) {
             bodyType.setBody(connection, bodyContents);
         }
 
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
@@ -117,17 +117,13 @@ public void addQuerystringParameter(String key, String value) {
     }
 
     public void addParameter(String key, String value) {
-        if (hasBodyContent()) {
+        if (verb.isPermitBody()) {
             bodyParams.add(key, value);
         } else {
             querystringParams.add(key, value);
         }
     }
 
-    protected boolean hasBodyContent() {
-        return verb == Verb.PUT || verb == Verb.POST;
-    }
-
     /**
      * Set body payload. This method is used when the HTTP body is not a form-url-encoded string, but another thing.
      * Like for example XML. Note: The contents are not part of the OAuth signature
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Verb.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Verb.java
@@ -5,5 +5,15 @@
  */
 public enum Verb {
 
-    GET, POST, PUT, DELETE, HEAD, OPTIONS, TRACE, PATCH
+    GET(false), POST(true), PUT(true), DELETE(true), HEAD(false), OPTIONS(false), TRACE(false), PATCH(true);
+
+    private final boolean permitBody;
+
+    Verb(boolean permitBody) {
+        this.permitBody = permitBody;
+    }
+
+    public boolean isPermitBody() {
+        return permitBody;
+    }
 }
diff --git a/scribejava-httpclient-ahc/pom.xml b/scribejava-httpclient-ahc/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>2.0.24</version>
+            <version>2.0.26</version>
         </dependency>
     </dependencies>
 
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
@@ -76,7 +76,7 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade
                 throw new IllegalArgumentException("message build error: unknown verb type");
         }
 
-        if (httpVerb == Verb.POST || httpVerb == Verb.PUT || httpVerb == Verb.DELETE) {
+        if (httpVerb.isPermitBody()) {
             if (!headers.containsKey(CONTENT_TYPE)) {
                 boundRequestBuilder = boundRequestBuilder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
             }
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
@@ -84,7 +84,7 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade
                 throw new IllegalArgumentException("message build error: unknown verb type");
         }
 
-        if (httpVerb == Verb.POST || httpVerb == Verb.PUT || httpVerb == Verb.DELETE) {
+        if (httpVerb.isPermitBody()) {
             if (!headers.containsKey(CONTENT_TYPE)) {
                 boundRequestBuilder = boundRequestBuilder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
             }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private Response doExecute(String userAgent, Map<String, String> headers, Verb h`
`96`	`96`	`connection.setReadTimeout(config.getReadTimeout());`
`97`	`97`	`}`
`98`	`98`	`addHeaders(connection, headers, userAgent);`
`99`		`- if (httpVerb == Verb.POST \|\| httpVerb == Verb.PUT \|\| httpVerb == Verb.DELETE) {`
	`99`	`+ if (httpVerb.isPermitBody()) {`
`100`	`100`	`bodyType.setBody(connection, bodyContents);`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -117,17 +117,13 @@ public void addQuerystringParameter(String key, String value) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public void addParameter(String key, String value) {`
`120`		`- if (hasBodyContent()) {`
	`120`	`+ if (verb.isPermitBody()) {`
`121`	`121`	`bodyParams.add(key, value);`
`122`	`122`	`} else {`
`123`	`123`	`querystringParams.add(key, value);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		`- protected boolean hasBodyContent() {`
`128`		`- return verb == Verb.PUT \|\| verb == Verb.POST;`
`129`		`- }`
`130`		`-`
`131`	`127`	`/**`
`132`	`128`	`* Set body payload. This method is used when the HTTP body is not a form-url-encoded string, but another thing.`
`133`	`129`	`* Like for example XML. Note: The contents are not part of the OAuth signature`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade`
`76`	`76`	`throw new IllegalArgumentException("message build error: unknown verb type");`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (httpVerb == Verb.POST \|\| httpVerb == Verb.PUT \|\| httpVerb == Verb.DELETE) {`
	`79`	`+ if (httpVerb.isPermitBody()) {`
`80`	`80`	`if (!headers.containsKey(CONTENT_TYPE)) {`
`81`	`81`	`boundRequestBuilder = boundRequestBuilder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade`
`84`	`84`	`throw new IllegalArgumentException("message build error: unknown verb type");`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (httpVerb == Verb.POST \|\| httpVerb == Verb.PUT \|\| httpVerb == Verb.DELETE) {`
	`87`	`+ if (httpVerb.isPermitBody()) {`
`88`	`88`	`if (!headers.containsKey(CONTENT_TYPE)) {`
`89`	`89`	`boundRequestBuilder = boundRequestBuilder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);`
`90`	`90`	`}`