From cef1bec4666e7841c39a37eec97b2e81c96ad9f0 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 15 Jul 2020 00:50:37 +0800
Subject: [PATCH] fix null payload in java jersey2 (#6933)

---
 .../main/resources/Java/libraries/jersey2/ApiClient.mustache  | 4 ++--
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++--
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index 4e934eb0e33..a10302b183d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -874,9 +874,9 @@ public class ApiClient {
     } else {
       // We let jersey handle the serialization
       if (isBodyNullable) { // payload is nullable
-        entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);
+        entity = Entity.entity(obj == null ? "null" : obj, contentType);
       } else {
-        entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+        entity = Entity.entity(obj == null ? "" : obj, contentType);
       }
     }
     return entity;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index be654a23d82..a8ce193dc36 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -791,9 +791,9 @@ public class ApiClient {
     } else {
       // We let jersey handle the serialization
       if (isBodyNullable) { // payload is nullable
-        entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);
+        entity = Entity.entity(obj == null ? "null" : obj, contentType);
       } else {
-        entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+        entity = Entity.entity(obj == null ? "" : obj, contentType);
       }
     }
     return entity;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index 0e7b60361a5..2e37397e8ab 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -870,9 +870,9 @@ public class ApiClient {
     } else {
       // We let jersey handle the serialization
       if (isBodyNullable) { // payload is nullable
-        entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);
+        entity = Entity.entity(obj == null ? "null" : obj, contentType);
       } else {
-        entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+        entity = Entity.entity(obj == null ? "" : obj, contentType);
       }
     }
     return entity;