[java][client] Don't include nullable attributes twice in serialized JSON (#3923)

* [java][client] Don't include nullable attributes twice in serialized JSON

* Get rid of the extra added whitespace

* Regenerate samples

Author: Slavek Kabrda

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

@@ -676,15 +676,17 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
                     var.getVendorExtensions().put("isJacksonOptionalNullable", isOptionalNullable);
                 }
                 if (addImports) {
-                    cm.imports.add("JsonNullable");
-                    Map<String, String> itemJsonNullable = new HashMap<String, String>();
-                    itemJsonNullable.put("import", "org.openapitools.jackson.nullable.JsonNullable");
-                    imports.add(itemJsonNullable);
-
-                    cm.imports.add("NoSuchElementException");
-                    Map<String, String> itemExc = new HashMap<String, String>();
-                    itemExc.put("import", "java.util.NoSuchElementException");
-                    imports.add(itemExc);
+                    Map<String, String> imports2Classnames = new HashMap<String, String>() {{
+                        put("JsonNullable", "org.openapitools.jackson.nullable.JsonNullable");
+                        put("NoSuchElementException", "java.util.NoSuchElementException");
+                        put("JsonIgnore", "com.fasterxml.jackson.annotation.JsonIgnore");
+                    }};
+                    for (Map.Entry<String, String> entry : imports2Classnames.entrySet()) {
+                        cm.imports.add(entry.getKey());
+                        Map<String, String> importsItem = new HashMap<String, String>();
+                        importsItem.put("import", entry.getValue());
+                        imports.add(importsItem);
+                    }
                 }
             }
         }

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -182,6 +182,10 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
+{{#vendorExtensions.isJacksonOptionalNullable}}
+  {{!unannotated, Jackson would pick this up automatically and add it *in addition* to the _JsonNullable getter field}}
+  @JsonIgnore
+{{/vendorExtensions.isJacksonOptionalNullable}}
 {{^vendorExtensions.isJacksonOptionalNullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.isJacksonOptionalNullable}}
   public {{{datatypeWithEnum}}} {{getter}}() {
     {{#vendorExtensions.isJacksonOptionalNullable}}
@@ -202,16 +206,15 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
-  {{/vendorExtensions.isJacksonOptionalNullable}}
-
-  {{^isReadOnly}}
-  {{#vendorExtensions.isJacksonOptionalNullable}}
+  {{/vendorExtensions.isJacksonOptionalNullable}}{{#vendorExtensions.isJacksonOptionalNullable}}
   @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
-  public void {{setter}}_JsonNullable(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
+  {{#isReadOnly}}private{{/isReadOnly}}{{^isReadOnly}}public{{/isReadOnly}} void {{setter}}_JsonNullable(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
+    {{! For getters/setters that have name differing from attribute name, we must include setter (albeit private) for jackson to be able to set the attribute}}
     this.{{name}} = {{name}};
   }
   {{/vendorExtensions.isJacksonOptionalNullable}}
 
+  {{^isReadOnly}}
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     {{#vendorExtensions.isJacksonOptionalNullable}}
     this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -57,7 +57,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -58,7 +58,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -57,7 +57,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -107,7 +107,6 @@ public Map<String, String> getMapString() {
   }
 
 
-
   public void setMapString(Map<String, String> mapString) {
     this.mapString = mapString;
   }
@@ -141,7 +140,6 @@ public Map<String, BigDecimal> getMapNumber() {
   }
 
 
-
   public void setMapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
   }
@@ -175,7 +173,6 @@ public Map<String, Integer> getMapInteger() {
   }
 
 
-
   public void setMapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
   }
@@ -209,7 +206,6 @@ public Map<String, Boolean> getMapBoolean() {
   }
 
 
-
   public void setMapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
   }
@@ -243,7 +239,6 @@ public Map<String, List<Integer>> getMapArrayInteger() {
   }
 
 
-
   public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
   }
@@ -277,7 +272,6 @@ public Map<String, List<Object>> getMapArrayAnytype() {
   }
 
 
-
   public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
   }
@@ -311,7 +305,6 @@ public Map<String, Map<String, String>> getMapMapString() {
   }
 
 
-
   public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
   }
@@ -345,7 +338,6 @@ public Map<String, Map<String, Object>> getMapMapAnytype() {
   }
 
 
-
   public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
   }
@@ -371,7 +363,6 @@ public Object getAnytype1() {
   }
 
 
-
   public void setAnytype1(Object anytype1) {
     this.anytype1 = anytype1;
   }
@@ -397,7 +388,6 @@ public Object getAnytype2() {
   }
 
 
-
   public void setAnytype2(Object anytype2) {
     this.anytype2 = anytype2;
   }
@@ -423,7 +413,6 @@ public Object getAnytype3() {
   }
 
 
-
   public void setAnytype3(Object anytype3) {
     this.anytype3 = anytype3;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -57,7 +57,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -58,7 +58,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -57,7 +57,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -57,7 +57,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java

@@ -66,7 +66,6 @@ public String getClassName() {
   }
 
 
-
   public void setClassName(String className) {
     this.className = className;
   }
@@ -92,7 +91,6 @@ public String getColor() {
   }
 
 
-
   public void setColor(String color) {
     this.color = color;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -66,7 +66,6 @@ public List<List<BigDecimal>> getArrayArrayNumber() {
   }
 
 
-
   public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = arrayArrayNumber;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -66,7 +66,6 @@ public List<BigDecimal> getArrayNumber() {
   }
 
 
-
   public void setArrayNumber(List<BigDecimal> arrayNumber) {
     this.arrayNumber = arrayNumber;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -74,7 +74,6 @@ public List<String> getArrayOfString() {
   }
 
 
-
   public void setArrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
   }
@@ -108,7 +107,6 @@ public List<List<Long>> getArrayArrayOfInteger() {
   }
 
 
-
   public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
   }
@@ -142,7 +140,6 @@ public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
   }
 
 
-
   public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -75,7 +75,6 @@ public String getSmallCamel() {
   }
 
 
-
   public void setSmallCamel(String smallCamel) {
     this.smallCamel = smallCamel;
   }
@@ -101,7 +100,6 @@ public String getCapitalCamel() {
   }
 
 
-
   public void setCapitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
   }
@@ -127,7 +125,6 @@ public String getSmallSnake() {
   }
 
 
-
   public void setSmallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
   }
@@ -153,7 +150,6 @@ public String getCapitalSnake() {
   }
 
 
-
   public void setCapitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
   }
@@ -179,7 +175,6 @@ public String getScAETHFlowPoints() {
   }
 
 
-
   public void setScAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
   }
@@ -205,7 +200,6 @@ public String getATTNAME() {
   }
 
 
-
   public void setATTNAME(String ATT_NAME) {
     this.ATT_NAME = ATT_NAME;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java

@@ -57,7 +57,6 @@ public Boolean isDeclawed() {
   }
 
 
-
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -55,7 +55,6 @@ public Boolean isDeclawed() {
   }
 
 
-
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java

@@ -59,7 +59,6 @@ public Long getId() {
   }
 
 
-
   public void setId(Long id) {
     this.id = id;
   }
@@ -84,7 +83,6 @@ public String getName() {
   }
 
 
-
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -56,7 +56,6 @@ public String getPropertyClass() {
   }
 
 
-
   public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java

@@ -55,7 +55,6 @@ public String getClient() {
   }
 
 
-
   public void setClient(String client) {
     this.client = client;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java

@@ -57,7 +57,6 @@ public String getBreed() {
   }
 
 
-
   public void setBreed(String breed) {
     this.breed = breed;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -55,7 +55,6 @@ public String getBreed() {
   }
 
 
-
   public void setBreed(String breed) {
     this.breed = breed;
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -131,7 +131,6 @@ public JustSymbolEnum getJustSymbol() {
   }
 
 
-
   public void setJustSymbol(JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
   }
@@ -165,7 +164,6 @@ public List<ArrayEnumEnum> getArrayEnum() {
   }
 
 
-
   public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
     this.arrayEnum = arrayEnum;
   }