side effect of #362. Should also bypass object mapper when dealing wi…

…th native json types
Kong · Aug 2, 2020 · 925ec01 · 925ec01
1 parent 664425f
commit 925ec01
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/unirest/src/main/java/kong/unirest/HttpRequestBody.java b/unirest/src/main/java/kong/unirest/HttpRequestBody.java
@@ -26,6 +26,7 @@
 package kong.unirest;
 
 import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONElement;
 import kong.unirest.json.JSONObject;
 
 import java.io.File;
@@ -109,6 +110,10 @@ public RequestBodyEntity body(String body) {
 	public RequestBodyEntity body(Object body) {
 		if(body instanceof String){
 			return body((String)body);
+		} else if (body instanceof JsonNode){
+			return body((JsonNode) body);
+		} else if (body instanceof JSONElement){
+			return body(body.toString());
 		}
 		return body(getObjectMapper().writeValue(body));
 	}

diff --git a/unirest/src/test/java/BehaviorTests/UniBodyPostingTest.java b/unirest/src/test/java/BehaviorTests/UniBodyPostingTest.java
@@ -189,4 +189,44 @@ void stringPassedToObjectGetsPassedToString() {
         Object value = request.getBody().get().uniPart().getValue();
         assertEquals("{\"body\": \"sample\"}", value);
     }
+
+    @Test
+    void jsonNodePassedToObjectGetsPassedToString() {
+        Object body = new JsonNode("{\"body\": \"sample\"}");
+        RequestBodyEntity request = Unirest.post(MockServer.POST)
+                .basicAuth("foo", "bar")
+                .header("Content-Type", "application/json")
+                .queryString("foo", "bar")
+                .body(body);
+
+        Object value = request.getBody().get().uniPart().getValue();
+        assertEquals("{\"body\":\"sample\"}", value);
+    }
+
+    @Test
+    void jsonObjectPassedToObjectGetsPassedToString() {
+        Object body = new JSONObject("{\"body\": \"sample\"}");
+        RequestBodyEntity request = Unirest.post(MockServer.POST)
+                .basicAuth("foo", "bar")
+                .header("Content-Type", "application/json")
+                .queryString("foo", "bar")
+                .body(body);
+
+        Object value = request.getBody().get().uniPart().getValue();
+        assertEquals("{\"body\":\"sample\"}", value);
+    }
+
+    @Test
+    void jsonArrayPassedToObjectGetsPassedToString() {
+        Object body = new JSONArray("[\"body\", \"sample\"]");
+        RequestBodyEntity request = Unirest.post(MockServer.POST)
+                .basicAuth("foo", "bar")
+                .header("Content-Type", "application/json")
+                .queryString("foo", "bar")
+                .body(body);
+
+        Object value = request.getBody().get().uniPart().getValue();
+        assertEquals("[\"body\",\"sample\"]", value);
+    }
+
 }