Adds a space between header key and value

sitture · Aug 1, 2020 · 289c04f · 289c04f
1 parent 281954c
commit 289c04f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.1.1
+
+### Updated
+
+- Adds a space between header key and value. i.e. "--header Key: Value"
+- Splits query params into separate `--data` items
+
 ## 0.1.0
 
 ### Added

diff --git a/src/main/java/com/github/sitture/unirestcurl/CurlBuilder.java b/src/main/java/com/github/sitture/unirestcurl/CurlBuilder.java
@@ -13,7 +13,7 @@ class CurlBuilder {
     private static final String CURL_PREFIX = "curl --verbose";
     private static final String REQUEST_METHOD = "--request %s";
     private static final String REQUEST_URL = "--url \"%s\"";
-    private static final String REQUEST_HEADER = "--header \"%s:%s\"";
+    private static final String REQUEST_HEADER = "--header \"%s: %s\"";
     private static final String REQUEST_BODY = "--data '%s'";
     private static final String SPACE_DELIMITER = " ";
     private static final String EMPTY_STRING = "";
@@ -67,11 +67,10 @@ private String getBody() {
             if (request.getBody().get().multiParts().size() == 0) {
                 processedBody = String.format(REQUEST_BODY, request.getBody().get().uniPart().getValue());
             } else {
-                final String fields = request.getBody().get().multiParts().stream()
+                processedBody = request.getBody().get().multiParts().stream()
                         .filter(bodyPart -> bodyPart instanceof ParamPart)
-                        .map(bodyPart -> String.format("%s=%s", bodyPart.getName(), bodyPart.getValue()))
-                        .collect(Collectors.joining("&"));
-                processedBody = String.format(REQUEST_BODY, fields);
+                        .map(bodyPart -> String.format("--data '%s=%s'", bodyPart.getName(), bodyPart.getValue()))
+                        .collect(Collectors.joining(SPACE_DELIMITER));
             }
         }
         return processedBody;

diff --git a/src/test/java/com/github/sitture/unirestcurl/CurlBuilderTest.java b/src/test/java/com/github/sitture/unirestcurl/CurlBuilderTest.java
@@ -28,7 +28,7 @@ public void canTransformGetRequestWithHeaders() {
                 .header("Content-Type", "application/json")
                 .basicAuth("username", "password");
         final String generatedCurl = new CurlBuilder(request).build();
-        final String expectedCurl = String.format("curl --verbose --url \"%s\" --header \"Content-Type:application/json\" --header \"Authorization:Basic dXNlcm5hbWU6cGFzc3dvcmQ=\"", TEST_URL);
+        final String expectedCurl = String.format("curl --verbose --url \"%s\" --header \"Content-Type: application/json\" --header \"Authorization: Basic dXNlcm5hbWU6cGFzc3dvcmQ=\"", TEST_URL);
         assertEquals(expectedCurl, generatedCurl, UNEXPECTED_ERROR);
     }
 
@@ -37,7 +37,7 @@ public void canTransformPostRequestWithHeaders() {
         final HttpRequest<?> request = Unirest.post(TEST_URL)
                 .header("Accept", "application/json");
         final String generatedCurl = new CurlBuilder(request).build();
-        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"Accept:application/json\"", TEST_URL);
+        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"Accept: application/json\"", TEST_URL);
         assertEquals(expectedCurl, generatedCurl, UNEXPECTED_ERROR);
     }
 
@@ -47,7 +47,7 @@ public void canTransformPostRequestWithHeadersAndStringBody() {
                 .header("content-type", "application/xml")
                 .body("{\"test\": \"body\"}");
         final String generatedCurl = new CurlBuilder(request).build();
-        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"content-type:application/xml\" --data '{\"test\": \"body\"}'", TEST_URL);
+        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"content-type: application/xml\" --data '{\"test\": \"body\"}'", TEST_URL);
         assertEquals(expectedCurl, generatedCurl, UNEXPECTED_ERROR);
     }
 
@@ -61,7 +61,7 @@ public void canTransformPostRequestWithHeadersAndFieldsBodyMap() {
                 .header("Content-Type", "application/x-www-form-urlencoded")
                 .fields(bodyMap);
         final String generatedCurl = new CurlBuilder(request).build();
-        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"Accept:application/json\" --header \"Content-Type:application/x-www-form-urlencoded\" --data 'key1=value&key2=2'", TEST_URL);
+        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"Accept: application/json\" --header \"Content-Type: application/x-www-form-urlencoded\" --data 'key1=value' --data 'key2=2'", TEST_URL);
         assertEquals(expectedCurl, generatedCurl, UNEXPECTED_ERROR);
     }
 
@@ -72,7 +72,7 @@ public void canTransformPostRequestWithHeadersAndSingleFields() {
                 .field("key1", "value")
                 .field("key2", "value2");
         final String generatedCurl = new CurlBuilder(request).build();
-        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"Accept:application/xml\" --data 'key1=value&key2=value2'", TEST_URL);
+        final String expectedCurl = String.format("curl --verbose --request POST --url \"%s\" --header \"Accept: application/xml\" --data 'key1=value' --data 'key2=value2'", TEST_URL);
         assertEquals(expectedCurl, generatedCurl, UNEXPECTED_ERROR);
     }