- fixes #1119

-- use 'x-www-form-urlencoded' for POST / PUT only

Author: r-brown

NetLicensingClient/src/main/java/com/labs64/netlicensing/provider/RestProviderJersey.java

@@ -18,6 +18,7 @@
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -63,18 +64,21 @@ public <REQ, RES> RestResponse<RES> call(final String httpMethod, final String u
         try {
             WebTarget target = getTarget(this.basePath);
             addAuthHeaders(target, getAuthentication());
-
-            final Entity<REQ> requestEntity = Entity.entity(request, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
-            final Response response;
             target = target.path(urlTemplate);
             if ((queryParams != null) && (queryParams.size() > 0)) {
                 for (final String paramKey : queryParams.keySet()) {
                     target = target.queryParam(paramKey, queryParams.get(paramKey));
                 }
             }
-            response = target.request(DEFAULT_ACCEPT_TYPES)
-                    .header(HttpHeaders.USER_AGENT, getUserAgent())
-                    .method(httpMethod, requestEntity);
+
+            Response response;
+            Builder builder = target.request(DEFAULT_ACCEPT_TYPES).header(HttpHeaders.USER_AGENT, getUserAgent());
+            if ("POST".equals(httpMethod) || "PUT".equals(httpMethod)) {
+                final Entity<REQ> requestEntity = Entity.entity(request, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
+                response = builder.method(httpMethod, requestEntity);
+            } else {
+                response = builder.method(httpMethod);
+            }
 
             final RestResponse<RES> restResponse = new RestResponse<RES>();
             restResponse.setStatusCode(response.getStatus());

README.md

@@ -19,13 +19,13 @@ Maven:
   <dependency>
     <groupId>com.labs64.netlicensing</groupId>
     <artifactId>netlicensing-client</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
   </dependency>
 </dependencies>
 ```
 Gradle:
 ```gradle
 dependencies {
-    compile 'com.labs64.netlicensing:netlicensing-client:2.3.0'
+    compile 'com.labs64.netlicensing:netlicensing-client:2.3.1'
 }
 ```

pom.xml

@@ -77,7 +77,7 @@
         <project.title>${project.name}</project.title>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <java.version>1.6</java.version>
+        <java.version>1.7</java.version>
         <maven.version>3.0.5</maven.version>
 
         <repo.releases.url>OVERRIDE_REPO_URL</repo.releases.url>