diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
index e4e1115bb81e..aaceead37856 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
@@ -130,7 +130,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
   /**
    * Constructor with all args parameters
    */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{>nullableArgumentWithEnum}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
 {{#parent}}
     super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
 {{/parent}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
index e9cb30b15220..1e2434f2437d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
@@ -130,7 +130,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   /**
    * Constructor with all args parameters
    */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{>nullableArgumentWithEnum}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
 {{#parent}}
     super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
 {{/parent}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
index f13da87167ab..a91077750ee1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
@@ -130,7 +130,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
   /**
    * Constructor with all args parameters
    */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{>nullableArgumentWithEnum}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
 {{#parent}}
     super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
 {{/parent}}
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index e09c78fa90f2..ca3d6fe826d3 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -133,7 +133,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   /**
    * Constructor with all args parameters
    */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(value = JSON_PROPERTY_{{nameInSnakeCase}}, required = {{#isNullable}}false{{/isNullable}}{{^isNullable}}{{required}}{{/isNullable}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(value = JSON_PROPERTY_{{nameInSnakeCase}}, required = {{#isNullable}}false{{/isNullable}}{{^isNullable}}{{required}}{{/isNullable}}){{/jackson}} {{>nullable_var_annotations}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
 {{#parent}}
     super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
 {{/parent}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
index dc5e1378ee6e..6cf2b30839f7 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -2748,9 +2748,10 @@ public void generateAllArgsConstructor() {
                 .hasParameter("type").toConstructor()
                 .toFileAssert()
                 .assertConstructor("LocalDate", "String", "String")
-                .hasParameter("dateOfBirth").toConstructor()
-                .hasParameter("name").toConstructor()
-                .hasParameter("type").toConstructor();
+                // all-args constructor parameters must carry the same nullability annotations as the fields/setters (#24109)
+                .hasParameter("dateOfBirth").assertParameterAnnotations().containsWithName("javax.annotation.Nullable").toParameter().toConstructor()
+                .hasParameter("name").assertParameterAnnotations().containsWithName("javax.annotation.Nullable").toParameter().toConstructor()
+                .hasParameter("type").assertParameterAnnotations().containsWithName("javax.annotation.Nonnull").toParameter().toConstructor();
         JavaFileAssert.assertThat(files.get("Cat.java"))
                 .assertConstructor("Integer", "String", "LocalDate", "String", "String");
 
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java
index a5d7d82d79cb..860bdf7c34f5 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java
@@ -47,7 +47,7 @@ public Category() {
   /**
    * Constructor with all args parameters
    */
-  public Category(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
+  public Category(@JsonProperty(JSON_PROPERTY_ID) @jakarta.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_NAME) @jakarta.annotation.Nullable String name) {
     this.id = id;
     this.name = name;
   }
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b539fb38a0da..07b5eb45801c 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -53,7 +53,7 @@ public ModelApiResponse() {
   /**
    * Constructor with all args parameters
    */
-  public ModelApiResponse(@JsonProperty(JSON_PROPERTY_CODE) Integer code, @JsonProperty(JSON_PROPERTY_TYPE) String type, @JsonProperty(JSON_PROPERTY_MESSAGE) String message) {
+  public ModelApiResponse(@JsonProperty(JSON_PROPERTY_CODE) @jakarta.annotation.Nullable Integer code, @JsonProperty(JSON_PROPERTY_TYPE) @jakarta.annotation.Nullable String type, @JsonProperty(JSON_PROPERTY_MESSAGE) @jakarta.annotation.Nullable String message) {
     this.code = code;
     this.type = type;
     this.message = message;
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java
index e873164fd476..0b0f417e6dc6 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -105,7 +105,7 @@ public Order() {
   /**
    * Constructor with all args parameters
    */
-  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
+  public Order(@JsonProperty(JSON_PROPERTY_ID) @jakarta.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_PET_ID) @jakarta.annotation.Nullable Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) @jakarta.annotation.Nullable Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) @jakarta.annotation.Nullable OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) @jakarta.annotation.Nullable StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) @jakarta.annotation.Nullable Boolean complete) {
     this.id = id;
     this.petId = petId;
     this.quantity = quantity;
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java
index 06f35de4ab7c..0ce7012df112 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,7 +109,7 @@ public Pet() {
   /**
    * Constructor with all args parameters
    */
-  public Pet(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_CATEGORY) Category category, @JsonProperty(JSON_PROPERTY_NAME) String name, @JsonProperty(JSON_PROPERTY_PHOTO_URLS) List<String> photoUrls, @JsonProperty(JSON_PROPERTY_TAGS) List<Tag> tags, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status) {
+  public Pet(@JsonProperty(JSON_PROPERTY_ID) @jakarta.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_CATEGORY) @jakarta.annotation.Nullable Category category, @JsonProperty(JSON_PROPERTY_NAME) @jakarta.annotation.Nonnull String name, @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @jakarta.annotation.Nonnull List<String> photoUrls, @JsonProperty(JSON_PROPERTY_TAGS) @jakarta.annotation.Nullable List<Tag> tags, @JsonProperty(JSON_PROPERTY_STATUS) @jakarta.annotation.Nullable StatusEnum status) {
     this.id = id;
     this.category = category;
     this.name = name;
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java
index e7f48cb3171a..30e1959238f4 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,7 +47,7 @@ public Tag() {
   /**
    * Constructor with all args parameters
    */
-  public Tag(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
+  public Tag(@JsonProperty(JSON_PROPERTY_ID) @jakarta.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_NAME) @jakarta.annotation.Nullable String name) {
     this.id = id;
     this.name = name;
   }
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java
index 20bd6574ca29..dc24020bd27c 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java
@@ -77,7 +77,7 @@ public User() {
   /**
    * Constructor with all args parameters
    */
-  public User(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_USERNAME) String username, @JsonProperty(JSON_PROPERTY_FIRST_NAME) String firstName, @JsonProperty(JSON_PROPERTY_LAST_NAME) String lastName, @JsonProperty(JSON_PROPERTY_EMAIL) String email, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PHONE) String phone, @JsonProperty(JSON_PROPERTY_USER_STATUS) Integer userStatus) {
+  public User(@JsonProperty(JSON_PROPERTY_ID) @jakarta.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_USERNAME) @jakarta.annotation.Nullable String username, @JsonProperty(JSON_PROPERTY_FIRST_NAME) @jakarta.annotation.Nullable String firstName, @JsonProperty(JSON_PROPERTY_LAST_NAME) @jakarta.annotation.Nullable String lastName, @JsonProperty(JSON_PROPERTY_EMAIL) @jakarta.annotation.Nullable String email, @JsonProperty(JSON_PROPERTY_PASSWORD) @jakarta.annotation.Nullable String password, @JsonProperty(JSON_PROPERTY_PHONE) @jakarta.annotation.Nullable String phone, @JsonProperty(JSON_PROPERTY_USER_STATUS) @jakarta.annotation.Nullable Integer userStatus) {
     this.id = id;
     this.username = username;
     this.firstName = firstName;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index e854943cbe10..58757e765533 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -49,7 +49,7 @@ public AdditionalPropertiesClass() {
   /**
    * Constructor with all args parameters
    */
-  public AdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_MAP_PROPERTY) Map<String, String> mapProperty, @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY) Map<String, Map<String, String>> mapOfMapProperty) {
+  public AdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_MAP_PROPERTY) @javax.annotation.Nullable Map<String, String> mapProperty, @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY) @javax.annotation.Nullable Map<String, Map<String, String>> mapOfMapProperty) {
     this.mapProperty = mapProperty;
     this.mapOfMapProperty = mapOfMapProperty;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index c7cf73569f28..0cac942148d6 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,7 +48,7 @@ public AllOfWithSingleRef() {
   /**
    * Constructor with all args parameters
    */
-  public AllOfWithSingleRef(@JsonProperty(JSON_PROPERTY_USERNAME) String username, @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE) SingleRefType singleRefType) {
+  public AllOfWithSingleRef(@JsonProperty(JSON_PROPERTY_USERNAME) @javax.annotation.Nullable String username, @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE) @javax.annotation.Nullable SingleRefType singleRefType) {
     this.username = username;
     this.singleRefType = singleRefType;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
index 34d10aa37861..10bff8250581 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,7 +60,7 @@ public Animal() {
   /**
    * Constructor with all args parameters
    */
-  public Animal(@JsonProperty(JSON_PROPERTY_CLASS_NAME) String className, @JsonProperty(JSON_PROPERTY_COLOR) String color) {
+  public Animal(@JsonProperty(JSON_PROPERTY_CLASS_NAME) @javax.annotation.Nonnull String className, @JsonProperty(JSON_PROPERTY_COLOR) @javax.annotation.Nullable String color) {
     this.className = className;
     this.color = color;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 63526589422b..4881d1bd5357 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -46,7 +46,7 @@ public ArrayOfArrayOfNumberOnly() {
   /**
    * Constructor with all args parameters
    */
-  public ArrayOfArrayOfNumberOnly(@JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) List<List<BigDecimal>> arrayArrayNumber) {
+  public ArrayOfArrayOfNumberOnly(@JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) @javax.annotation.Nullable List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = arrayArrayNumber;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index b0b6d7d71aec..71b59763b425 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -46,7 +46,7 @@ public ArrayOfNumberOnly() {
   /**
    * Constructor with all args parameters
    */
-  public ArrayOfNumberOnly(@JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) List<BigDecimal> arrayNumber) {
+  public ArrayOfNumberOnly(@JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) @javax.annotation.Nullable List<BigDecimal> arrayNumber) {
     this.arrayNumber = arrayNumber;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
index 168ad1fa7f66..af326756965e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -56,7 +56,7 @@ public ArrayTest() {
   /**
    * Constructor with all args parameters
    */
-  public ArrayTest(@JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) List<String> arrayOfString, @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) List<List<Long>> arrayArrayOfInteger, @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+  public ArrayTest(@JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @javax.annotation.Nullable List<String> arrayOfString, @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @javax.annotation.Nullable List<List<Long>> arrayArrayOfInteger, @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @javax.annotation.Nullable List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayOfString = arrayOfString;
     this.arrayArrayOfInteger = arrayArrayOfInteger;
     this.arrayArrayOfModel = arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
index 820598e37b80..761d4955dada 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -67,7 +67,7 @@ public Capitalization() {
   /**
    * Constructor with all args parameters
    */
-  public Capitalization(@JsonProperty(JSON_PROPERTY_SMALL_CAMEL) String smallCamel, @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) String capitalCamel, @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) String smallSnake, @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) String capitalSnake, @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) String scAETHFlowPoints, @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) String ATT_NAME) {
+  public Capitalization(@JsonProperty(JSON_PROPERTY_SMALL_CAMEL) @javax.annotation.Nullable String smallCamel, @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) @javax.annotation.Nullable String capitalCamel, @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) @javax.annotation.Nullable String smallSnake, @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) @javax.annotation.Nullable String capitalSnake, @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) @javax.annotation.Nullable String scAETHFlowPoints, @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) @javax.annotation.Nullable String ATT_NAME) {
     this.smallCamel = smallCamel;
     this.capitalCamel = capitalCamel;
     this.smallSnake = smallSnake;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
index 5328b63494ef..c15135fd6741 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
@@ -53,7 +53,7 @@ public Cat() {
   /**
    * Constructor with all args parameters
    */
-  public Cat(@JsonProperty(JSON_PROPERTY_DECLAWED) Boolean declawed, @JsonProperty(JSON_PROPERTY_CLASS_NAME) String className, @JsonProperty(JSON_PROPERTY_COLOR) String color) {
+  public Cat(@JsonProperty(JSON_PROPERTY_DECLAWED) @javax.annotation.Nullable Boolean declawed, @JsonProperty(JSON_PROPERTY_CLASS_NAME) @javax.annotation.Nonnull String className, @JsonProperty(JSON_PROPERTY_COLOR) @javax.annotation.Nullable String color) {
     super(className, color);
     this.declawed = declawed;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
index f6025976a814..9acc939988b0 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
@@ -47,7 +47,7 @@ public Category() {
   /**
    * Constructor with all args parameters
    */
-  public Category(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
+  public Category(@JsonProperty(JSON_PROPERTY_ID) @javax.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_NAME) @javax.annotation.Nonnull String name) {
     this.id = id;
     this.name = name;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index ffb285736c75..848911f5ee10 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -54,7 +54,7 @@ public ChildWithNullable() {
   /**
    * Constructor with all args parameters
    */
-  public ChildWithNullable(@JsonProperty(JSON_PROPERTY_OTHER_PROPERTY) String otherProperty, @JsonProperty(JSON_PROPERTY_TYPE) TypeEnum type, @JsonProperty(JSON_PROPERTY_NULLABLE_PROPERTY) String nullableProperty) {
+  public ChildWithNullable(@JsonProperty(JSON_PROPERTY_OTHER_PROPERTY) @javax.annotation.Nullable String otherProperty, @JsonProperty(JSON_PROPERTY_TYPE) @javax.annotation.Nullable TypeEnum type, @JsonProperty(JSON_PROPERTY_NULLABLE_PROPERTY) @javax.annotation.Nullable String nullableProperty) {
     super(type, nullableProperty);
     this.otherProperty = otherProperty;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
index 8962a5cb4c7e..3a138c4e41f7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -42,7 +42,7 @@ public ClassModel() {
   /**
    * Constructor with all args parameters
    */
-  public ClassModel(@JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) String propertyClass) {
+  public ClassModel(@JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) @javax.annotation.Nullable String propertyClass) {
     this.propertyClass = propertyClass;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
index d61ce381e715..2581bd8e7e0e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public Client() {
   /**
    * Constructor with all args parameters
    */
-  public Client(@JsonProperty(JSON_PROPERTY_CLIENT) String client) {
+  public Client(@JsonProperty(JSON_PROPERTY_CLIENT) @javax.annotation.Nullable String client) {
     this.client = client;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 4631919e6139..45f17f319365 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -44,7 +44,7 @@ public DeprecatedObject() {
   /**
    * Constructor with all args parameters
    */
-  public DeprecatedObject(@JsonProperty(JSON_PROPERTY_NAME) String name) {
+  public DeprecatedObject(@JsonProperty(JSON_PROPERTY_NAME) @javax.annotation.Nullable String name) {
     this.name = name;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
index 6f82b0df9ebe..ac4e276d45c1 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
@@ -53,7 +53,7 @@ public Dog() {
   /**
    * Constructor with all args parameters
    */
-  public Dog(@JsonProperty(JSON_PROPERTY_BREED) String breed, @JsonProperty(JSON_PROPERTY_CLASS_NAME) String className, @JsonProperty(JSON_PROPERTY_COLOR) String color) {
+  public Dog(@JsonProperty(JSON_PROPERTY_BREED) @javax.annotation.Nullable String breed, @JsonProperty(JSON_PROPERTY_CLASS_NAME) @javax.annotation.Nonnull String className, @JsonProperty(JSON_PROPERTY_COLOR) @javax.annotation.Nullable String color) {
     super(className, color);
     this.breed = breed;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8836e036f184..272c2ffd72fc 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,7 +120,7 @@ public EnumArrays() {
   /**
    * Constructor with all args parameters
    */
-  public EnumArrays(@JsonProperty(JSON_PROPERTY_JUST_SYMBOL) JustSymbolEnum justSymbol, @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) List<ArrayEnumEnum> arrayEnum) {
+  public EnumArrays(@JsonProperty(JSON_PROPERTY_JUST_SYMBOL) @javax.annotation.Nullable JustSymbolEnum justSymbol, @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @javax.annotation.Nullable List<ArrayEnumEnum> arrayEnum) {
     this.justSymbol = justSymbol;
     this.arrayEnum = arrayEnum;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
index ae1557349f84..a34ae489684e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -230,7 +230,7 @@ public EnumTest() {
   /**
    * Constructor with all args parameters
    */
-  public EnumTest(@JsonProperty(JSON_PROPERTY_ENUM_STRING) EnumStringEnum enumString, @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) EnumStringRequiredEnum enumStringRequired, @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) EnumIntegerEnum enumInteger, @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) EnumNumberEnum enumNumber, @JsonProperty(JSON_PROPERTY_OUTER_ENUM) OuterEnum outerEnum, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER) OuterEnumInteger outerEnumInteger, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE) OuterEnumDefaultValue outerEnumDefaultValue, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE) OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
+  public EnumTest(@JsonProperty(JSON_PROPERTY_ENUM_STRING) @javax.annotation.Nullable EnumStringEnum enumString, @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) @javax.annotation.Nonnull EnumStringRequiredEnum enumStringRequired, @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) @javax.annotation.Nullable EnumIntegerEnum enumInteger, @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) @javax.annotation.Nullable EnumNumberEnum enumNumber, @JsonProperty(JSON_PROPERTY_OUTER_ENUM) @javax.annotation.Nullable OuterEnum outerEnum, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER) @javax.annotation.Nullable OuterEnumInteger outerEnumInteger, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE) @javax.annotation.Nullable OuterEnumDefaultValue outerEnumDefaultValue, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE) @javax.annotation.Nullable OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
     this.enumString = enumString;
     this.enumStringRequired = enumStringRequired;
     this.enumInteger = enumInteger;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 5da5f55e39b6..64e9f2651bbb 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,7 +51,7 @@ public FakeBigDecimalMap200Response() {
   /**
    * Constructor with all args parameters
    */
-  public FakeBigDecimalMap200Response(@JsonProperty(JSON_PROPERTY_SOME_ID) BigDecimal someId, @JsonProperty(JSON_PROPERTY_SOME_MAP) Map<String, BigDecimal> someMap) {
+  public FakeBigDecimalMap200Response(@JsonProperty(JSON_PROPERTY_SOME_ID) @javax.annotation.Nullable BigDecimal someId, @JsonProperty(JSON_PROPERTY_SOME_MAP) @javax.annotation.Nullable Map<String, BigDecimal> someMap) {
     this.someId = someId;
     this.someMap = someMap;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8265459c1218..7a0e8c42aa95 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,7 +51,7 @@ public FileSchemaTestClass() {
   /**
    * Constructor with all args parameters
    */
-  public FileSchemaTestClass(@JsonProperty(JSON_PROPERTY_FILE) ModelFile _file, @JsonProperty(JSON_PROPERTY_FILES) List<ModelFile> files) {
+  public FileSchemaTestClass(@JsonProperty(JSON_PROPERTY_FILE) @javax.annotation.Nullable ModelFile _file, @JsonProperty(JSON_PROPERTY_FILES) @javax.annotation.Nullable List<ModelFile> files) {
     this._file = _file;
     this.files = files;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java
index 7a51e31e6590..285991a3c09a 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java
@@ -42,7 +42,7 @@ public Foo() {
   /**
    * Constructor with all args parameters
    */
-  public Foo(@JsonProperty(JSON_PROPERTY_BAR) String bar) {
+  public Foo(@JsonProperty(JSON_PROPERTY_BAR) @javax.annotation.Nullable String bar) {
     this.bar = bar;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index d09ed8baed5b..46f194b94396 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -44,7 +44,7 @@ public FooGetDefaultResponse() {
   /**
    * Constructor with all args parameters
    */
-  public FooGetDefaultResponse(@JsonProperty(JSON_PROPERTY_STRING) Foo string) {
+  public FooGetDefaultResponse(@JsonProperty(JSON_PROPERTY_STRING) @javax.annotation.Nullable Foo string) {
     this.string = string;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
index c0a568340044..1cc448a17a77 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -123,7 +123,7 @@ public FormatTest() {
   /**
    * Constructor with all args parameters
    */
-  public FormatTest(@JsonProperty(JSON_PROPERTY_INTEGER) Integer integer, @JsonProperty(JSON_PROPERTY_INT32) Integer int32, @JsonProperty(JSON_PROPERTY_INT64) Long int64, @JsonProperty(JSON_PROPERTY_NUMBER) BigDecimal number, @JsonProperty(JSON_PROPERTY_FLOAT) Float _float, @JsonProperty(JSON_PROPERTY_DOUBLE) Double _double, @JsonProperty(JSON_PROPERTY_DECIMAL) BigDecimal decimal, @JsonProperty(JSON_PROPERTY_STRING) String string, @JsonProperty(JSON_PROPERTY_BYTE) byte[] _byte, @JsonProperty(JSON_PROPERTY_BINARY) File binary, @JsonProperty(JSON_PROPERTY_DATE) LocalDate date, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS) String patternWithDigits, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) String patternWithDigitsAndDelimiter) {
+  public FormatTest(@JsonProperty(JSON_PROPERTY_INTEGER) @javax.annotation.Nullable Integer integer, @JsonProperty(JSON_PROPERTY_INT32) @javax.annotation.Nullable Integer int32, @JsonProperty(JSON_PROPERTY_INT64) @javax.annotation.Nullable Long int64, @JsonProperty(JSON_PROPERTY_NUMBER) @javax.annotation.Nonnull BigDecimal number, @JsonProperty(JSON_PROPERTY_FLOAT) @javax.annotation.Nullable Float _float, @JsonProperty(JSON_PROPERTY_DOUBLE) @javax.annotation.Nullable Double _double, @JsonProperty(JSON_PROPERTY_DECIMAL) @javax.annotation.Nullable BigDecimal decimal, @JsonProperty(JSON_PROPERTY_STRING) @javax.annotation.Nullable String string, @JsonProperty(JSON_PROPERTY_BYTE) @javax.annotation.Nonnull byte[] _byte, @JsonProperty(JSON_PROPERTY_BINARY) @javax.annotation.Nullable File binary, @JsonProperty(JSON_PROPERTY_DATE) @javax.annotation.Nonnull LocalDate date, @JsonProperty(JSON_PROPERTY_DATE_TIME) @javax.annotation.Nullable OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_UUID) @javax.annotation.Nullable UUID uuid, @JsonProperty(JSON_PROPERTY_PASSWORD) @javax.annotation.Nonnull String password, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS) @javax.annotation.Nullable String patternWithDigits, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) @javax.annotation.Nullable String patternWithDigitsAndDelimiter) {
     this.integer = integer;
     this.int32 = int32;
     this.int64 = int64;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 1c6dcfe7011b..b2e299752a80 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -46,7 +46,7 @@ public HealthCheckResult() {
   /**
    * Constructor with all args parameters
    */
-  public HealthCheckResult(@JsonProperty(JSON_PROPERTY_NULLABLE_MESSAGE) String nullableMessage) {
+  public HealthCheckResult(@JsonProperty(JSON_PROPERTY_NULLABLE_MESSAGE) @javax.annotation.Nullable String nullableMessage) {
     this.nullableMessage = nullableMessage == null ? JsonNullable.<String>undefined() : JsonNullable.of(nullableMessage);
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
index e1ff1fbace21..a7b0a6f2fde5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
@@ -94,7 +94,7 @@ public MapTest() {
   /**
    * Constructor with all args parameters
    */
-  public MapTest(@JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) Map<String, Map<String, String>> mapMapOfString, @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) Map<String, InnerEnum> mapOfEnumString, @JsonProperty(JSON_PROPERTY_DIRECT_MAP) Map<String, Boolean> directMap, @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) Map<String, Boolean> indirectMap) {
+  public MapTest(@JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @javax.annotation.Nullable Map<String, Map<String, String>> mapMapOfString, @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @javax.annotation.Nullable Map<String, InnerEnum> mapOfEnumString, @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @javax.annotation.Nullable Map<String, Boolean> directMap, @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @javax.annotation.Nullable Map<String, Boolean> indirectMap) {
     this.mapMapOfString = mapMapOfString;
     this.mapOfEnumString = mapOfEnumString;
     this.directMap = directMap;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c9fb756f2f6..8889b209b288 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -57,7 +57,7 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
   /**
    * Constructor with all args parameters
    */
-  public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_MAP) Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) @javax.annotation.Nullable UUID uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) @javax.annotation.Nullable OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_MAP) @javax.annotation.Nullable Map<String, Animal> map) {
     this.uuid = uuid;
     this.dateTime = dateTime;
     this.map = map;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
index b7f647a448c5..686e46252c9d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,7 +48,7 @@ public Model200Response() {
   /**
    * Constructor with all args parameters
    */
-  public Model200Response(@JsonProperty(JSON_PROPERTY_NAME) Integer name, @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) String propertyClass) {
+  public Model200Response(@JsonProperty(JSON_PROPERTY_NAME) @javax.annotation.Nullable Integer name, @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) @javax.annotation.Nullable String propertyClass) {
     this.name = name;
     this.propertyClass = propertyClass;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 53b9ed2ccb20..eb02c05db392 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -53,7 +53,7 @@ public ModelApiResponse() {
   /**
    * Constructor with all args parameters
    */
-  public ModelApiResponse(@JsonProperty(JSON_PROPERTY_CODE) Integer code, @JsonProperty(JSON_PROPERTY_TYPE) String type, @JsonProperty(JSON_PROPERTY_MESSAGE) String message) {
+  public ModelApiResponse(@JsonProperty(JSON_PROPERTY_CODE) @javax.annotation.Nullable Integer code, @JsonProperty(JSON_PROPERTY_TYPE) @javax.annotation.Nullable String type, @JsonProperty(JSON_PROPERTY_MESSAGE) @javax.annotation.Nullable String message) {
     this.code = code;
     this.type = type;
     this.message = message;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java
index b213945a2e3e..09d63ed5fc03 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -43,7 +43,7 @@ public ModelFile() {
   /**
    * Constructor with all args parameters
    */
-  public ModelFile(@JsonProperty(JSON_PROPERTY_SOURCE_U_R_I) String sourceURI) {
+  public ModelFile(@JsonProperty(JSON_PROPERTY_SOURCE_U_R_I) @javax.annotation.Nullable String sourceURI) {
     this.sourceURI = sourceURI;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java
index dd31ebaa9348..21955d7f2857 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java
@@ -43,7 +43,7 @@ public ModelList() {
   /**
    * Constructor with all args parameters
    */
-  public ModelList(@JsonProperty(JSON_PROPERTY_123LIST) String _123list) {
+  public ModelList(@JsonProperty(JSON_PROPERTY_123LIST) @javax.annotation.Nullable String _123list) {
     this._123list = _123list;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
index f668545e19a3..b82acf57662f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public ModelReturn() {
   /**
    * Constructor with all args parameters
    */
-  public ModelReturn(@JsonProperty(JSON_PROPERTY_RETURN) Integer _return) {
+  public ModelReturn(@JsonProperty(JSON_PROPERTY_RETURN) @javax.annotation.Nullable Integer _return) {
     this._return = _return;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
index 31ce8c3c9f49..94666f55955d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
@@ -69,7 +69,7 @@ public Name(
   /**
    * Constructor with all args parameters
    */
-  public Name(@JsonProperty(JSON_PROPERTY_NAME) Integer name, @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, @JsonProperty(JSON_PROPERTY_PROPERTY) String property, @JsonProperty(JSON_PROPERTY_123NUMBER) Integer _123number) {
+  public Name(@JsonProperty(JSON_PROPERTY_NAME) @javax.annotation.Nonnull Integer name, @JsonProperty(JSON_PROPERTY_SNAKE_CASE) @javax.annotation.Nullable Integer snakeCase, @JsonProperty(JSON_PROPERTY_PROPERTY) @javax.annotation.Nullable String property, @JsonProperty(JSON_PROPERTY_123NUMBER) @javax.annotation.Nullable Integer _123number) {
     this.name = name;
     this.snakeCase = snakeCase;
     this.property = property;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java
index 959d31dde6ca..186f457b8432 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -113,7 +113,7 @@ public NullableClass() {
   /**
    * Constructor with all args parameters
    */
-  public NullableClass(@JsonProperty(JSON_PROPERTY_INTEGER_PROP) Integer integerProp, @JsonProperty(JSON_PROPERTY_NUMBER_PROP) BigDecimal numberProp, @JsonProperty(JSON_PROPERTY_BOOLEAN_PROP) Boolean booleanProp, @JsonProperty(JSON_PROPERTY_STRING_PROP) String stringProp, @JsonProperty(JSON_PROPERTY_DATE_PROP) LocalDate dateProp, @JsonProperty(JSON_PROPERTY_DATETIME_PROP) OffsetDateTime datetimeProp, @JsonProperty(JSON_PROPERTY_ARRAY_NULLABLE_PROP) List<Object> arrayNullableProp, @JsonProperty(JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP) List<Object> arrayAndItemsNullableProp, @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE) List<Object> arrayItemsNullable, @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP) Map<String, Object> objectNullableProp, @JsonProperty(JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP) Map<String, Object> objectAndItemsNullableProp, @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE) Map<String, Object> objectItemsNullable) {
+  public NullableClass(@JsonProperty(JSON_PROPERTY_INTEGER_PROP) @javax.annotation.Nullable Integer integerProp, @JsonProperty(JSON_PROPERTY_NUMBER_PROP) @javax.annotation.Nullable BigDecimal numberProp, @JsonProperty(JSON_PROPERTY_BOOLEAN_PROP) @javax.annotation.Nullable Boolean booleanProp, @JsonProperty(JSON_PROPERTY_STRING_PROP) @javax.annotation.Nullable String stringProp, @JsonProperty(JSON_PROPERTY_DATE_PROP) @javax.annotation.Nullable LocalDate dateProp, @JsonProperty(JSON_PROPERTY_DATETIME_PROP) @javax.annotation.Nullable OffsetDateTime datetimeProp, @JsonProperty(JSON_PROPERTY_ARRAY_NULLABLE_PROP) @javax.annotation.Nullable List<Object> arrayNullableProp, @JsonProperty(JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP) @javax.annotation.Nullable List<Object> arrayAndItemsNullableProp, @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE) @javax.annotation.Nullable List<Object> arrayItemsNullable, @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP) @javax.annotation.Nullable Map<String, Object> objectNullableProp, @JsonProperty(JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP) @javax.annotation.Nullable Map<String, Object> objectAndItemsNullableProp, @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE) @javax.annotation.Nullable Map<String, Object> objectItemsNullable) {
     this.integerProp = integerProp == null ? JsonNullable.<Integer>undefined() : JsonNullable.of(integerProp);
     this.numberProp = numberProp == null ? JsonNullable.<BigDecimal>undefined() : JsonNullable.of(numberProp);
     this.booleanProp = booleanProp == null ? JsonNullable.<Boolean>undefined() : JsonNullable.of(booleanProp);
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
index 8d6c2ec3db97..c583c634603c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public NumberOnly() {
   /**
    * Constructor with all args parameters
    */
-  public NumberOnly(@JsonProperty(JSON_PROPERTY_JUST_NUMBER) BigDecimal justNumber) {
+  public NumberOnly(@JsonProperty(JSON_PROPERTY_JUST_NUMBER) @javax.annotation.Nullable BigDecimal justNumber) {
     this.justNumber = justNumber;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 9db81270819c..fc9347448dcc 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -62,7 +62,7 @@ public ObjectWithDeprecatedFields() {
   /**
    * Constructor with all args parameters
    */
-  public ObjectWithDeprecatedFields(@JsonProperty(JSON_PROPERTY_UUID) String uuid, @JsonProperty(JSON_PROPERTY_ID) BigDecimal id, @JsonProperty(JSON_PROPERTY_DEPRECATED_REF) DeprecatedObject deprecatedRef, @JsonProperty(JSON_PROPERTY_BARS) List<String> bars) {
+  public ObjectWithDeprecatedFields(@JsonProperty(JSON_PROPERTY_UUID) @javax.annotation.Nullable String uuid, @JsonProperty(JSON_PROPERTY_ID) @javax.annotation.Nullable BigDecimal id, @JsonProperty(JSON_PROPERTY_DEPRECATED_REF) @javax.annotation.Nullable DeprecatedObject deprecatedRef, @JsonProperty(JSON_PROPERTY_BARS) @javax.annotation.Nullable List<String> bars) {
     this.uuid = uuid;
     this.id = id;
     this.deprecatedRef = deprecatedRef;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index 27bc2ecb7578..737aba6a0851 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -105,7 +105,7 @@ public Order() {
   /**
    * Constructor with all args parameters
    */
-  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
+  public Order(@JsonProperty(JSON_PROPERTY_ID) @javax.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_PET_ID) @javax.annotation.Nullable Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) @javax.annotation.Nullable Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) @javax.annotation.Nullable OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) @javax.annotation.Nullable StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) @javax.annotation.Nullable Boolean complete) {
     this.id = id;
     this.petId = petId;
     this.quantity = quantity;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
index d9aeeda15de5..f270d746ee25 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -53,7 +53,7 @@ public OuterComposite() {
   /**
    * Constructor with all args parameters
    */
-  public OuterComposite(@JsonProperty(JSON_PROPERTY_MY_NUMBER) BigDecimal myNumber, @JsonProperty(JSON_PROPERTY_MY_STRING) String myString, @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) Boolean myBoolean) {
+  public OuterComposite(@JsonProperty(JSON_PROPERTY_MY_NUMBER) @javax.annotation.Nullable BigDecimal myNumber, @JsonProperty(JSON_PROPERTY_MY_STRING) @javax.annotation.Nullable String myString, @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) @javax.annotation.Nullable Boolean myBoolean) {
     this.myNumber = myNumber;
     this.myString = myString;
     this.myBoolean = myBoolean;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index da53193adf43..8ac89e5dd31e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -43,7 +43,7 @@ public OuterObjectWithEnumProperty() {
   /**
    * Constructor with all args parameters
    */
-  public OuterObjectWithEnumProperty(@JsonProperty(JSON_PROPERTY_VALUE) OuterEnumInteger value) {
+  public OuterObjectWithEnumProperty(@JsonProperty(JSON_PROPERTY_VALUE) @javax.annotation.Nonnull OuterEnumInteger value) {
     this.value = value;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 9249f975731b..5e1f4e862163 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,7 +96,7 @@ public ParentWithNullable() {
   /**
    * Constructor with all args parameters
    */
-  public ParentWithNullable(@JsonProperty(JSON_PROPERTY_TYPE) TypeEnum type, @JsonProperty(JSON_PROPERTY_NULLABLE_PROPERTY) String nullableProperty) {
+  public ParentWithNullable(@JsonProperty(JSON_PROPERTY_TYPE) @javax.annotation.Nullable TypeEnum type, @JsonProperty(JSON_PROPERTY_NULLABLE_PROPERTY) @javax.annotation.Nullable String nullableProperty) {
     this.type = type;
     this.nullableProperty = nullableProperty == null ? JsonNullable.<String>undefined() : JsonNullable.of(nullableProperty);
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
index 30c009b0fe41..200dc69b2417 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
@@ -112,7 +112,7 @@ public Pet() {
   /**
    * Constructor with all args parameters
    */
-  public Pet(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_CATEGORY) Category category, @JsonProperty(JSON_PROPERTY_NAME) String name, @JsonProperty(JSON_PROPERTY_PHOTO_URLS) Set<String> photoUrls, @JsonProperty(JSON_PROPERTY_TAGS) List<Tag> tags, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status) {
+  public Pet(@JsonProperty(JSON_PROPERTY_ID) @javax.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_CATEGORY) @javax.annotation.Nullable Category category, @JsonProperty(JSON_PROPERTY_NAME) @javax.annotation.Nonnull String name, @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @javax.annotation.Nonnull Set<String> photoUrls, @JsonProperty(JSON_PROPERTY_TAGS) @javax.annotation.Nullable List<Tag> tags, @JsonProperty(JSON_PROPERTY_STATUS) @javax.annotation.Nullable StatusEnum status) {
     this.id = id;
     this.category = category;
     this.name = name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4df5a6ab54d2..3ad0ee4b3a38 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -57,7 +57,7 @@ public ReadOnlyFirst(
   /**
    * Constructor with all args parameters
    */
-  public ReadOnlyFirst(@JsonProperty(JSON_PROPERTY_BAR) String bar, @JsonProperty(JSON_PROPERTY_BAZ) String baz) {
+  public ReadOnlyFirst(@JsonProperty(JSON_PROPERTY_BAR) @javax.annotation.Nullable String bar, @JsonProperty(JSON_PROPERTY_BAZ) @javax.annotation.Nullable String baz) {
     this.bar = bar;
     this.baz = baz;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 31078f9a7b19..a907ba9bd89f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -43,7 +43,7 @@ public SpecialModelName() {
   /**
    * Constructor with all args parameters
    */
-  public SpecialModelName(@JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) Long $specialPropertyName) {
+  public SpecialModelName(@JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) @javax.annotation.Nullable Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
index e503c5eac591..7d6b60c0ec7b 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,7 +47,7 @@ public Tag() {
   /**
    * Constructor with all args parameters
    */
-  public Tag(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
+  public Tag(@JsonProperty(JSON_PROPERTY_ID) @javax.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_NAME) @javax.annotation.Nullable String name) {
     this.id = id;
     this.name = name;
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index bb5ab82a01ad..8d1fdf36b075 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -47,7 +47,7 @@ public TestInlineFreeformAdditionalPropertiesRequest() {
   /**
    * Constructor with all args parameters
    */
-  public TestInlineFreeformAdditionalPropertiesRequest(@JsonProperty(JSON_PROPERTY_SOME_PROPERTY) String someProperty) {
+  public TestInlineFreeformAdditionalPropertiesRequest(@JsonProperty(JSON_PROPERTY_SOME_PROPERTY) @javax.annotation.Nullable String someProperty) {
     this.someProperty = someProperty;
   }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
index 72c134c592e7..7b5d9ddfa0ff 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
@@ -77,7 +77,7 @@ public User() {
   /**
    * Constructor with all args parameters
    */
-  public User(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_USERNAME) String username, @JsonProperty(JSON_PROPERTY_FIRST_NAME) String firstName, @JsonProperty(JSON_PROPERTY_LAST_NAME) String lastName, @JsonProperty(JSON_PROPERTY_EMAIL) String email, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PHONE) String phone, @JsonProperty(JSON_PROPERTY_USER_STATUS) Integer userStatus) {
+  public User(@JsonProperty(JSON_PROPERTY_ID) @javax.annotation.Nullable Long id, @JsonProperty(JSON_PROPERTY_USERNAME) @javax.annotation.Nullable String username, @JsonProperty(JSON_PROPERTY_FIRST_NAME) @javax.annotation.Nullable String firstName, @JsonProperty(JSON_PROPERTY_LAST_NAME) @javax.annotation.Nullable String lastName, @JsonProperty(JSON_PROPERTY_EMAIL) @javax.annotation.Nullable String email, @JsonProperty(JSON_PROPERTY_PASSWORD) @javax.annotation.Nullable String password, @JsonProperty(JSON_PROPERTY_PHONE) @javax.annotation.Nullable String phone, @JsonProperty(JSON_PROPERTY_USER_STATUS) @javax.annotation.Nullable Integer userStatus) {
     this.id = id;
     this.username = username;
     this.firstName = firstName;