null value in HttpRequest.sendJson and HttpRequest.sendJsonable shoul…

…d be treated as json null - fixes #1436
vert-x3 · Oct 25, 2019 · de88aaa · gagarski · Oct 25, 2019 · vietj
1 parent bd7d5f2
commit de88aaa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/vertx-web-client/src/main/java/io/vertx/ext/web/client/impl/HttpContext.java b/vertx-web-client/src/main/java/io/vertx/ext/web/client/impl/HttpContext.java
@@ -430,15 +430,15 @@ private void handleSendRequest() {
     if (request.timeout > 0) {
       req.setTimeout(request.timeout);
     }
-    if (body != null) {
-      if (contentType != null) {
-        String prev = req.headers().get(HttpHeaders.CONTENT_TYPE);
-        if (prev == null) {
-          req.putHeader(HttpHeaders.CONTENT_TYPE, contentType);
-        } else {
-          contentType = prev;
-        }
+    if (contentType != null) {
+      String prev = req.headers().get(HttpHeaders.CONTENT_TYPE);
+      if (prev == null) {
+        req.putHeader(HttpHeaders.CONTENT_TYPE, contentType);
+      } else {
+        contentType = prev;
       }
+    }
+    if (body != null || "application/json".equals(contentType)) {
       if (body instanceof MultiMap) {
         MultipartForm parts = MultipartForm.create();
         MultiMap attributes = (MultiMap) body;

diff --git a/vertx-web-client/src/test/java/io/vertx/ext/web/client/WebClientTest.java b/vertx-web-client/src/test/java/io/vertx/ext/web/client/WebClientTest.java
@@ -305,6 +305,14 @@ public void testSendBufferBody() throws Exception {
     testSendBody(body, (contentType, buff) -> assertEquals(body, buff));
   }
 
+  @Test
+  public void testSendJsonNullBody() throws Exception {
+    testSendBody(null, (contentType, buff) -> {
+      assertEquals("application/json", contentType);
+//      assertEquals(body, buff.toJsonObject());
+    });
+  }
+
   private void testSendBody(Object body, BiConsumer<String, Buffer> checker) throws Exception {
     waitFor(2);
     server.requestHandler(req -> req.bodyHandler(buff -> {