Reorg @nullable and @JsonProperty

Author: jpfinne

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

@@ -131,7 +131,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
    {{#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}}) {
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#vendorExtensions.x-java-all-args-jsonProperty}}@JsonProperty("{{.}}") {{/vendorExtensions.x-java-all-args-jsonProperty}}{{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
   {{#parent}}
       super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
   {{/parent}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -5364,7 +5364,7 @@ public void shouldAnnotateNonRequiredFieldsAsNullable() throws IOException {
                 .fileContains(
                         "public Item(" +
                                 "@JsonProperty(\"mandatoryName\") String mandatoryName," +
-                                " @Nullable @JsonProperty(\"optionalDescription\") String optionalDescription," +
+                                " @JsonProperty(\"optionalDescription\") @Nullable String optionalDescription," +
                                 " @JsonProperty(\"optionalOneWithDefault\") String optionalOneWithDefault," +
                                 " @JsonProperty(\"nullableStr\") String nullableStr," +
                                 " @JsonProperty(\"mandatoryContainer\") List<String> mandatoryContainer," +
@@ -5399,7 +5399,7 @@ public void shouldAnnotateNonRequiredFieldsAsNullableWhenSetContainerDefaultToNu
         JavaFileAssert.assertThat(file)
                 .fileContains(
                         ", @JsonProperty(\"mandatoryContainer\") List<String> mandatoryContainer," +
-                                " @Nullable @JsonProperty(\"optionalContainer\") List<String> optionalContainer," +
+                                " @JsonProperty(\"optionalContainer\") @Nullable List<String> optionalContainer," +
                                 " @JsonProperty(\"optionalContainerWithDefault\") List<String> optionalContainerWithDefault," +
                                 " @JsonProperty(\"nullableContainer\") List<String> nullableContainer)"
                 );
@@ -5473,9 +5473,9 @@ public void shouldAnnotateNonRequiredFieldsAsNullableWhileNotUsingOpenApiNullabl
         JavaFileAssert.assertThat(file)
                 .fileContains(
                         " @JsonProperty(\"mandatoryContainer\") List<String> mandatoryContainer," +
-                                " @Nullable @JsonProperty(\"optionalContainer\") List<String> optionalContainer," +
+                                " @JsonProperty(\"optionalContainer\") @Nullable List<String> optionalContainer," +
                                 " @JsonProperty(\"optionalContainerWithDefault\") List<String> optionalContainerWithDefault," +
-                                " @Nullable @JsonProperty(\"nullableContainer\") List<String> nullableContainer)"
+                                " @JsonProperty(\"nullableContainer\") @Nullable List<String> nullableContainer)"
                 );
     }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -37,7 +37,7 @@ public AdditionalPropertiesAnyType() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesAnyType(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesAnyType(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -38,7 +38,7 @@ public AdditionalPropertiesArray() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesArray(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesArray(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -37,7 +37,7 @@ public AdditionalPropertiesBoolean() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesBoolean(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesBoolean(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -68,7 +68,7 @@ public AdditionalPropertiesClass() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesClass(@JsonProperty("map_string") Map<String, String> mapString, @JsonProperty("map_number") Map<String, BigDecimal> mapNumber, @JsonProperty("map_integer") Map<String, Integer> mapInteger, @JsonProperty("map_boolean") Map<String, Boolean> mapBoolean, @JsonProperty("map_array_integer") Map<String, List<Integer>> mapArrayInteger, @JsonProperty("map_array_anytype") Map<String, List<Object>> mapArrayAnytype, @JsonProperty("map_map_string") Map<String, Map<String, String>> mapMapString, @JsonProperty("map_map_anytype") Map<String, Map<String, Object>> mapMapAnytype, @Nullable @JsonProperty("anytype_1") Object anytype1, @JsonProperty("anytype_2") Object anytype2, @Nullable @JsonProperty("anytype_3") Object anytype3) {
+  public AdditionalPropertiesClass(@JsonProperty("map_string") Map<String, String> mapString, @JsonProperty("map_number") Map<String, BigDecimal> mapNumber, @JsonProperty("map_integer") Map<String, Integer> mapInteger, @JsonProperty("map_boolean") Map<String, Boolean> mapBoolean, @JsonProperty("map_array_integer") Map<String, List<Integer>> mapArrayInteger, @JsonProperty("map_array_anytype") Map<String, List<Object>> mapArrayAnytype, @JsonProperty("map_map_string") Map<String, Map<String, String>> mapMapString, @JsonProperty("map_map_anytype") Map<String, Map<String, Object>> mapMapAnytype, @JsonProperty("anytype_1") @Nullable Object anytype1, @JsonProperty("anytype_2") Object anytype2, @JsonProperty("anytype_3") @Nullable Object anytype3) {
       this.mapString = mapString;
       this.mapNumber = mapNumber;
       this.mapInteger = mapInteger;

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -37,7 +37,7 @@ public AdditionalPropertiesInteger() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesInteger(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesInteger(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -38,7 +38,7 @@ public AdditionalPropertiesNumber() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesNumber(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesNumber(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -38,7 +38,7 @@ public AdditionalPropertiesObject() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesObject(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesObject(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }
 

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -37,7 +37,7 @@ public AdditionalPropertiesString() {
    * Constructor with all args parameters
    */
   @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-  public AdditionalPropertiesString(@Nullable @JsonProperty("name") String name) {
+  public AdditionalPropertiesString(@JsonProperty("name") @Nullable String name) {
       this.name = name;
   }