Simplify JsonCreator and JsonProperty for constructors

jpfinne · jpfinne · commit a8fd5e078d21 · 2026-01-26T09:18:55.000+01:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -1161,19 +1161,22 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                 cm.vendorExtensions.put("x-java-no-args-constructor", true);
             }
 
-            if (!this.withXml &&
-                    cm.hasRequired &&
-                    this.generatedConstructorWithRequiredArgs &&
-                    !hasAllArgsConstructor &&
-                    cm.requiredVars.size() == cm.allVars.size() &&
-                    isJackson()) {
-                cm.vendorExtensions.put("x-java-required-constructor-jsoncreator", true);
-                /* add @JsonCreator and @JsonProperty on required argument constructor
-                 * currently only enabled for
-                 *   jackson and no withXml
-                 *   all fields are initialzed in the required constructor
-                 *   no all arg constructor
-                 */
+
+            // add @JsonCreator on constructor
+            if (!this.withXml && jackson) {
+                if (hasAllArgsConstructor) {
+                    // add @JsonCreator and @JsonProperty on the all argument constructor
+                    cm.vendorExtensions.put("java-all-args-constructor-jsoncreator", true);
+                    List<CodegenProperty> properties = (List<CodegenProperty>)cm.vendorExtensions.get("x-java-all-args-constructor-vars");
+                    properties.forEach(p -> p.vendorExtensions.put("x-java-all-args-jsonProperty", p.baseName));
+                } else if (this.generatedConstructorWithRequiredArgs && cm.hasRequired && cm.requiredVars.size() == cm.allVars.size()) {
+                    /* add @JsonCreator and @JsonProperty on the required argument constructor
+                     *   all fields are initialzed in the required constructor
+                     *   no all arg constructor
+                     */
+                    cm.vendorExtensions.put("x-java-required-constructor-jsoncreator", true);
+                    cm.requiredVars.forEach(p -> p.vendorExtensions.put("x-java-required-args-jsonProperty", p.baseName));
+                }
             }
 
         }
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -102,10 +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}}
    */
-  {{#vendorExtensions.x-java-required-constructor-jsoncreator}}
+   {{#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}}) {
+   {{/vendorExtensions.x-java-required-constructor-jsoncreator}}
+  public {{classname}}({{#requiredVars}}{{#vendorExtensions.x-java-required-args-jsonProperty}}@JsonProperty("{{.}}") {{/vendorExtensions.x-java-required-args-jsonProperty}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/requiredVars}}) {
     {{#parent}}
     super({{#parentRequiredVars}}{{name}}{{^-last}}, {{/-last}}{{/parentRequiredVars}});
     {{/parent}}
@@ -127,9 +127,11 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
 
   /**
    * Constructor with all args parameters
-   */{{#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}}) {
+   */
+   {{#vendorExtensions.java-all-args-constructor-jsoncreator}}
+  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+   {{/vendorExtensions.java-all-args-constructor-jsoncreator}}
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableAnnotation}}{{#vendorExtensions.x-java-all-args-jsonProperty}}@JsonProperty("{{.}}") {{/vendorExtensions.x-java-all-args-jsonProperty}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
   {{#parent}}
       super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
   {{/parent}}
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
@@ -41,8 +41,7 @@ public Category() {
   /**
    * Constructor with all args parameters
    */
-  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public Category(@Nullable @JsonProperty("id") Long id, @Nullable @JsonProperty("name") String name) {
+  public Category(@Nullable Long id, @Nullable String name) {
       this.id = id;
       this.name = name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -45,8 +45,7 @@ public ModelApiResponse() {
   /**
    * Constructor with all args parameters
    */
-  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public ModelApiResponse(@Nullable @JsonProperty("code") Integer code, @Nullable @JsonProperty("type") String type, @Nullable @JsonProperty("message") String message) {
+  public ModelApiResponse(@Nullable Integer code, @Nullable String type, @Nullable String message) {
       this.code = code;
       this.type = type;
       this.message = message;
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
@@ -90,8 +90,7 @@ public Order() {
   /**
    * Constructor with all args parameters
    */
-  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public Order(@Nullable @JsonProperty("id") Long id, @Nullable @JsonProperty("petId") Long petId, @Nullable @JsonProperty("quantity") Integer quantity, @Nullable @JsonProperty("shipDate") OffsetDateTime shipDate, @Nullable @JsonProperty("status") StatusEnum status, @JsonProperty("complete") Boolean complete) {
+  public Order(@Nullable Long id, @Nullable Long petId, @Nullable Integer quantity, @Nullable OffsetDateTime shipDate, @Nullable StatusEnum status, Boolean complete) {
       this.id = id;
       this.petId = petId;
       this.quantity = quantity;
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
@@ -103,8 +103,7 @@ public Pet(String name, List<String> photoUrls) {
   /**
    * Constructor with all args parameters
    */
-  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public Pet(@Nullable @JsonProperty("id") Long id, @Nullable @JsonProperty("category") Category category, @JsonProperty("name") String name, @JsonProperty("photoUrls") List<String> photoUrls, @JsonProperty("tags") List<@Valid Tag> tags, @Nullable @JsonProperty("status") StatusEnum status) {
+  public Pet(@Nullable Long id, @Nullable Category category, String name, List<String> photoUrls, List<@Valid Tag> tags, @Nullable StatusEnum status) {
       this.id = id;
       this.category = category;
       this.name = name;
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
@@ -41,8 +41,7 @@ public Tag() {
   /**
    * Constructor with all args parameters
    */
-  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public Tag(@Nullable @JsonProperty("id") Long id, @Nullable @JsonProperty("name") String name) {
+  public Tag(@Nullable Long id, @Nullable String name) {
       this.id = id;
       this.name = name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
@@ -53,8 +53,7 @@ public User() {
   /**
    * Constructor with all args parameters
    */
-  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public User(@Nullable @JsonProperty("id") Long id, @Nullable @JsonProperty("username") String username, @Nullable @JsonProperty("firstName") String firstName, @Nullable @JsonProperty("lastName") String lastName, @Nullable @JsonProperty("email") String email, @Nullable @JsonProperty("password") String password, @Nullable @JsonProperty("phone") String phone, @Nullable @JsonProperty("userStatus") Integer userStatus) {
+  public User(@Nullable Long id, @Nullable String username, @Nullable String firstName, @Nullable String lastName, @Nullable String email, @Nullable String password, @Nullable String phone, @Nullable Integer userStatus) {
       this.id = id;
       this.username = username;
       this.firstName = firstName;
