Charset and NoBodyContent bugfixes

Author: Crim

CHANGELOG.md

@@ -2,6 +2,10 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.1.1 Bugfix Release
+- Request Parameters/Body now uses UTF-8 Charset encoding
+- NoBodyContent now properly sends no request body.
+
 ## 0.1.0 Initial Release
 
 Initial release.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.sourcelab.http</groupId>
     <artifactId>http-client-wrapper</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <packaging>jar</packaging>
 
     <!-- Require Maven 3.3.9 -->

src/main/java/org/sourcelab/http/rest/HttpClientRestClient.java

@@ -57,6 +57,7 @@
 import org.sourcelab.http.rest.request.Request;
 import org.sourcelab.http.rest.request.RequestMethod;
 import org.sourcelab.http.rest.request.RequestParameter;
+import org.sourcelab.http.rest.request.body.NoBodyContent;
 import org.sourcelab.http.rest.request.body.RequestBodyContent;
 import org.sourcelab.http.rest.request.body.UrlEncodedFormBodyContent;
 
@@ -435,11 +436,15 @@ private HttpEntity buildEntity(final RequestBodyContent requestBodyContent, fina
 
             // Attach submitRequest params
             requestParameters
-                .forEach(parameter ->  params.add(new BasicNameValuePair(parameter.getName(), parameter.getValue()))
-            );
-            return new UrlEncodedFormEntity(params);
+                .forEach(parameter -> params.add(new BasicNameValuePair(parameter.getName(), parameter.getValue()))
+                );
+            return new UrlEncodedFormEntity(params, StandardCharsets.UTF_8);
+        } else if ( requestBodyContent instanceof NoBodyContent) {
+            return null;
         } else {
-            return new StringEntity(requestBodyContent.toString());
+            return new StringEntity(
+                requestBodyContent.toString(), StandardCharsets.UTF_8
+            );
         }
     }
 

src/main/java/org/sourcelab/http/rest/request/body/NoBodyContent.java

@@ -20,8 +20,14 @@
 /**
  * Submit no request body.
  */
-public class NoBodyContent extends StringBodyContent {
+public class NoBodyContent implements RequestBodyContent {
+    public static final RequestBodyContent INSTANCE = new NoBodyContent();
+
     public NoBodyContent() {
-        super(null);
+    }
+
+    @Override
+    public String toString() {
+        return null;
     }
 }

src/test/java/org/sourcelab/http/rest/HttpClientRestClientTest.java

@@ -21,13 +21,16 @@
 import org.junit.jupiter.api.Test;
 import org.sourcelab.http.rest.configuration.BasicConfiguration;
 import org.sourcelab.http.rest.configuration.Configuration;
+import org.sourcelab.http.rest.request.PostRequest;
 import org.sourcelab.http.rest.request.Request;
 import org.sourcelab.http.rest.request.RequestMethod;
+import org.sourcelab.http.rest.request.body.NoBodyContent;
 import org.sourcelab.http.rest.request.body.RequestBodyContent;
 import org.sourcelab.http.rest.request.body.StringBodyContent;
 import testserver.TestHttpServer;
 
 import java.io.File;
+import java.io.IOException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -151,6 +154,47 @@ public void doHttps_withClientValidation_withCertificateValidation_Test() throws
         }
     }
 
+    /**
+     * Test sending a nobody content request.
+     */
+    @Test
+    public void testPostWithNoBodyContent() throws Exception {
+
+        try (final TestHttpServer httpServer = new TestHttpServer()
+            .withHttp(HTTP_PORT)
+            .withMockData(RESPONSE_DATA)
+            .start()
+        ) {
+
+            // Create client
+            final Configuration configuration = new BasicConfiguration("http://localhost:" + HTTP_PORT);
+            final HttpClientRestClient restClient = new HttpClientRestClient();
+            restClient.init(configuration);
+
+            // Make request
+            final Request<String> request = new PostRequest<String>() {
+                @Override
+                public String getApiEndpoint() {
+                    return "/my/endpoint";
+                }
+
+                @Override
+                public RequestBodyContent getRequestBody() {
+                    return NoBodyContent.INSTANCE;
+                }
+
+                @Override
+                public String parseResponse(final String responseStr) throws IOException {
+                    return responseStr;
+                }
+            };
+            final RestResponse result = restClient.submitRequest(request);
+
+            // Validate response.
+            assertEquals(RESPONSE_DATA, result.getResponseStr());
+        }
+    }
+
     /**
      * Represents a dummy request.
      */