Add JsonCreator on constructor

Author: jpfinne

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

@@ -1155,10 +1155,21 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
         // conditionally force the generation of no args constructor
         for (CodegenModel cm : allModels.values()) {
             boolean hasLombokNoArgsConstructor = lombokAnnotations != null && lombokAnnotations.containsKey("NoArgsConstructor");
+            boolean hasAllArgsConstructor = cm.vendorExtensions.containsKey("x-java-all-args-constructor");
             if (!hasLombokNoArgsConstructor
-                    && (cm.hasRequired || cm.vendorExtensions.containsKey("x-java-all-args-constructor"))) {
+                    && (cm.hasRequired || hasAllArgsConstructor)) {
                 cm.vendorExtensions.put("x-java-no-args-constructor", true);
             }
+
+            if (cm.hasRequired &&
+                    this.generatedConstructorWithRequiredArgs &&
+                    !hasAllArgsConstructor &&
+                    cm.requiredVars.size() == cm.allVars.size() &&
+                    isJackson()) {
+                // add @JsonCreator and @JsonProperty on required argument constructor
+                cm.vendorExtensions.put("x-java-required-constructor-jsoncreator", true);
+            }
+
         }
         return objs;
     }

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

@@ -102,7 +102,10 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   /**
    * Constructor with only required parameters{{#generateConstructorWithAllArgs}}{{^vendorExtensions.x-java-all-args-constructor}} and all parameters{{/vendorExtensions.x-java-all-args-constructor}}{{/generateConstructorWithAllArgs}}
    */
-  public {{classname}}({{#requiredVars}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/requiredVars}}) {
+  {{#vendorExtensions.x-java-required-constructor-jsoncreator}}
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  {{/vendorExtensions.x-java-required-constructor-jsoncreator}}
+  public {{classname}}({{^vendorExtensions.x-java-required-constructor-jsoncreator}}{{#requiredVars}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/requiredVars}}{{/vendorExtensions.x-java-required-constructor-jsoncreator}}{{#vendorExtensions.x-java-required-constructor-jsoncreator}}{{#requiredVars}}@JsonProperty("{{baseName}}") {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/requiredVars}}{{/vendorExtensions.x-java-required-constructor-jsoncreator}}) {
     {{#parent}}
     super({{#parentRequiredVars}}{{name}}{{^-last}}, {{/-last}}{{/parentRequiredVars}});
     {{/parent}}
@@ -124,8 +127,9 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
 
   /**
    * Constructor with all args parameters
-   */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+   */{{#jackson}}
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES){{/jackson}}
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableAnnotation}}{{#jackson}}@JsonProperty("{{baseName}}") {{/jackson}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
   {{#parent}}
       super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
   {{/parent}}

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java

@@ -42,7 +42,8 @@ public TypeHolderDefault() {
   /**
    * Constructor with only required parameters
    */
-  public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List<Integer> arrayItem) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public TypeHolderDefault(@JsonProperty("string_item") String stringItem, @JsonProperty("number_item") BigDecimal numberItem, @JsonProperty("integer_item") Integer integerItem, @JsonProperty("bool_item") Boolean boolItem, @JsonProperty("array_item") List<Integer> arrayItem) {
     this.stringItem = stringItem;
     this.numberItem = numberItem;
     this.integerItem = integerItem;

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java

@@ -44,7 +44,8 @@ public TypeHolderExample() {
   /**
    * Constructor with only required parameters
    */
-  public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List<Integer> arrayItem) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public TypeHolderExample(@JsonProperty("string_item") String stringItem, @JsonProperty("number_item") BigDecimal numberItem, @JsonProperty("float_item") Float floatItem, @JsonProperty("integer_item") Integer integerItem, @JsonProperty("bool_item") Boolean boolItem, @JsonProperty("array_item") List<Integer> arrayItem) {
     this.stringItem = stringItem;
     this.numberItem = numberItem;
     this.floatItem = floatItem;

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java

@@ -42,7 +42,8 @@ public TypeHolderDefault() {
   /**
    * Constructor with only required parameters
    */
-  public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List<Integer> arrayItem) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public TypeHolderDefault(@JsonProperty("string_item") String stringItem, @JsonProperty("number_item") BigDecimal numberItem, @JsonProperty("integer_item") Integer integerItem, @JsonProperty("bool_item") Boolean boolItem, @JsonProperty("array_item") List<Integer> arrayItem) {
     this.stringItem = stringItem;
     this.numberItem = numberItem;
     this.integerItem = integerItem;

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java

@@ -44,7 +44,8 @@ public TypeHolderExample() {
   /**
    * Constructor with only required parameters
    */
-  public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List<Integer> arrayItem) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public TypeHolderExample(@JsonProperty("string_item") String stringItem, @JsonProperty("number_item") BigDecimal numberItem, @JsonProperty("float_item") Float floatItem, @JsonProperty("integer_item") Integer integerItem, @JsonProperty("bool_item") Boolean boolItem, @JsonProperty("array_item") List<Integer> arrayItem) {
     this.stringItem = stringItem;
     this.numberItem = numberItem;
     this.floatItem = floatItem;

samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java

@@ -37,7 +37,8 @@ public Apple() {
   /**
    * Constructor with only required parameters
    */
-  public Apple(Integer seeds) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public Apple(@JsonProperty("seeds") Integer seeds) {
     this.seeds = seeds;
     this.fruitType = fruitType;
   }

samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java

@@ -37,7 +37,8 @@ public Banana() {
   /**
    * Constructor with only required parameters
    */
-  public Banana(Integer length) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public Banana(@JsonProperty("length") Integer length) {
     this.length = length;
     this.fruitType = fruitType;
   }

samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java

@@ -37,7 +37,8 @@ public Apple() {
   /**
    * Constructor with only required parameters
    */
-  public Apple(Integer seeds) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public Apple(@JsonProperty("seeds") Integer seeds) {
     this.seeds = seeds;
     this.fruitType = fruitType;
   }

samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java

@@ -37,7 +37,8 @@ public Banana() {
   /**
    * Constructor with only required parameters
    */
-  public Banana(Integer length) {
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+  public Banana(@JsonProperty("length") Integer length) {
     this.length = length;
     this.fruitType = fruitType;
   }