fix null payload in java jersey2 (#6933)

wing328 · web-flow · commit cef1bec4666e · 2020-07-15T00:50:37.000+08:00
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
@@ -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
@@ -791,9 +791,9 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
     } 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
@@ -870,9 +870,9 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
     } 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;

Original file line number	Diff line number	Diff line change
`@@ -874,9 +874,9 @@ public class ApiClient {`
`874`	`874`	`} else {`
`875`	`875`	`// We let jersey handle the serialization`
`876`	`876`	`if (isBodyNullable) { // payload is nullable`
`877`		`- entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);`
	`877`	`+ entity = Entity.entity(obj == null ? "null" : obj, contentType);`
`878`	`878`	`} else {`
`879`		`- entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);`
	`879`	`+ entity = Entity.entity(obj == null ? "" : obj, contentType);`
`880`	`880`	`}`
`881`	`881`	`}`
`882`	`882`	`return entity;`
Original file line number	Diff line number	Diff line change
`@@ -791,9 +791,9 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co`
`791`	`791`	`} else {`
`792`	`792`	`// We let jersey handle the serialization`
`793`	`793`	`if (isBodyNullable) { // payload is nullable`
`794`		`- entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);`
	`794`	`+ entity = Entity.entity(obj == null ? "null" : obj, contentType);`
`795`	`795`	`} else {`
`796`		`- entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);`
	`796`	`+ entity = Entity.entity(obj == null ? "" : obj, contentType);`
`797`	`797`	`}`
`798`	`798`	`}`
`799`	`799`	`return entity;`
Original file line number	Diff line number	Diff line change
`@@ -870,9 +870,9 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co`
`870`	`870`	`} else {`
`871`	`871`	`// We let jersey handle the serialization`
`872`	`872`	`if (isBodyNullable) { // payload is nullable`
`873`		`- entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);`
	`873`	`+ entity = Entity.entity(obj == null ? "null" : obj, contentType);`
`874`	`874`	`} else {`
`875`		`- entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);`
	`875`	`+ entity = Entity.entity(obj == null ? "" : obj, contentType);`
`876`	`876`	`}`
`877`	`877`	`}`
`878`	`878`	`return entity;`