From d1fe2e17f17b1accf8bc9c5f7ee809a97d07ddad Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 23 Jul 2020 15:01:22 +0800 Subject: [PATCH] update samples --- .../java/org/openapitools/client/ApiClient.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java index ed31d4f37de..543a3ae4ff1 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java @@ -672,9 +672,17 @@ public class ApiClient { } else { // We let jersey handle the serialization if (isBodyNullable) { // payload is nullable - entity = Entity.entity(obj == null ? "null" : obj, contentType); + if (obj instanceof String) { + entity = Entity.entity(obj == null ? "null" : "\"" + ((String)obj).replaceAll("\"", Matcher.quoteReplacement("\\\"")) + "\"", contentType); + } else { + entity = Entity.entity(obj == null ? "null" : obj, contentType); + } } else { - entity = Entity.entity(obj == null ? "" : obj, contentType); + if (obj instanceof String) { + entity = Entity.entity(obj == null ? "" : "\"" + ((String)obj).replaceAll("\"", Matcher.quoteReplacement("\\\"")) + "\"", contentType); + } else { + entity = Entity.entity(obj == null ? "" : obj, contentType); + } } } return entity; @@ -709,7 +717,7 @@ public class ApiClient { if (isBodyNullable) { return obj == null ? "null" : json.getMapper().writeValueAsString(obj); } else { - return json.getMapper().writeValueAsString(obj); + return obj == null ? "" : json.getMapper().writeValueAsString(obj); } } } catch (Exception ex) {