[JavaSpring][21200] improve Kotlin interopability with optional values (#21202)

nullable annotations are now added to getters, setters, parameters, for optional attributes without default value

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

@@ -32,6 +32,7 @@ import io.virtualan.annotation.VirtualService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 {{/jdk8-no-delegate}}
+import org.springframework.lang.Nullable;
 {{^useResponseEntity}}
 import org.springframework.http.HttpStatus;
 {{/useResponseEntity}}

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

@@ -21,6 +21,7 @@ import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 {{#useResponseEntity}}
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;

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

@@ -7,6 +7,7 @@ import org.springframework.http.MediaType;
 {{#useResponseEntity}}
 import org.springframework.http.ResponseEntity;
 {{/useResponseEntity}}
+import org.springframework.lang.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 {{#reactive}}

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

@@ -1 +1 @@
-{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}
+{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}

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

@@ -1 +1 @@
-{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>optionalDataType}} {{paramName}}{{/isCookieParam}}
+{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isCookieParam}}

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

@@ -1 +1 @@
-{{#isHeaderParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}
+{{#isHeaderParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isHeaderParam}}

modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/api.mustache

@@ -13,6 +13,7 @@ import org.springframework.http.HttpStatus;
 {{#useResponseEntity}}
 import org.springframework.http.ResponseEntity;
 {{/useResponseEntity}}
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -154,7 +154,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{^lombok.Data}}
 
   {{! begin feature: fluent setter methods }}
-  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+  public {{classname}} {{name}}({{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}) {
     {{#openApiNullable}}
     this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of{{#optionalAcceptNullable}}Nullable{{/optionalAcceptNullable}}({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}};
     {{/openApiNullable}}
@@ -254,7 +254,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
-  public {{>nullableDataTypeBeanValidation}} {{getter}}() {
+  public {{>nullableAnnotation}}{{>nullableDataTypeBeanValidation}} {{getter}}() {
     return {{name}};
   }
   {{/lombok.Getter}}
@@ -271,7 +271,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
-  public void {{setter}}({{>nullableDataType}} {{name}}) {
+  public void {{setter}}({{>nullableAnnotation}}{{>nullableDataType}} {{name}}) {
     this.{{name}} = {{name}};
   }
   {{/lombok.Setter}}

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

@@ -1 +1 @@
-{{#isQueryParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/isModel}}{{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
+{{#isQueryParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/isModel}}{{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isQueryParam}}

samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java

@@ -11,6 +11,7 @@ import java.time.OffsetDateTime;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java

@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -96,7 +97,7 @@ public interface PetApi {
     
     ResponseEntity<Void> deletePet(
         @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-        @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) String apiKey
+        @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java

@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java

@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java

@@ -27,7 +27,7 @@ public class Category {
 
   private @Nullable String name;
 
-  public Category id(Long id) {
+  public Category id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -39,15 +39,15 @@ public class Category {
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Category name(String name) {
+  public Category name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -59,11 +59,11 @@ public class Category {
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -31,7 +31,7 @@ public class ModelApiResponse {
 
   private @Nullable String message;
 
-  public ModelApiResponse code(Integer code) {
+  public ModelApiResponse code(@Nullable Integer code) {
     this.code = code;
     return this;
   }
@@ -43,15 +43,15 @@ public class ModelApiResponse {
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
-  public Integer getCode() {
+  public @Nullable Integer getCode() {
     return code;
   }
 
-  public void setCode(Integer code) {
+  public void setCode(@Nullable Integer code) {
     this.code = code;
   }
 
-  public ModelApiResponse type(String type) {
+  public ModelApiResponse type(@Nullable String type) {
     this.type = type;
     return this;
   }
@@ -63,15 +63,15 @@ public class ModelApiResponse {
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
-  public String getType() {
+  public @Nullable String getType() {
     return type;
   }
 
-  public void setType(String type) {
+  public void setType(@Nullable String type) {
     this.type = type;
   }
 
-  public ModelApiResponse message(String message) {
+  public ModelApiResponse message(@Nullable String message) {
     this.message = message;
     return this;
   }
@@ -83,11 +83,11 @@ public class ModelApiResponse {
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
-  public String getMessage() {
+  public @Nullable String getMessage() {
     return message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(@Nullable String message) {
     this.message = message;
   }
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java

@@ -78,7 +78,7 @@ public class Order {
 
   private Boolean complete = false;
 
-  public Order id(Long id) {
+  public Order id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -90,15 +90,15 @@ public class Order {
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Order petId(Long petId) {
+  public Order petId(@Nullable Long petId) {
     this.petId = petId;
     return this;
   }
@@ -110,15 +110,15 @@ public class Order {
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
-  public Long getPetId() {
+  public @Nullable Long getPetId() {
     return petId;
   }
 
-  public void setPetId(Long petId) {
+  public void setPetId(@Nullable Long petId) {
     this.petId = petId;
   }
 
-  public Order quantity(Integer quantity) {
+  public Order quantity(@Nullable Integer quantity) {
     this.quantity = quantity;
     return this;
   }
@@ -130,15 +130,15 @@ public class Order {
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
-  public Integer getQuantity() {
+  public @Nullable Integer getQuantity() {
     return quantity;
   }
 
-  public void setQuantity(Integer quantity) {
+  public void setQuantity(@Nullable Integer quantity) {
     this.quantity = quantity;
   }
 
-  public Order shipDate(OffsetDateTime shipDate) {
+  public Order shipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
@@ -150,15 +150,15 @@ public class Order {
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
-  public OffsetDateTime getShipDate() {
+  public @Nullable OffsetDateTime getShipDate() {
     return shipDate;
   }
 
-  public void setShipDate(OffsetDateTime shipDate) {
+  public void setShipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
   }
 
-  public Order status(StatusEnum status) {
+  public Order status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -170,11 +170,11 @@ public class Order {
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java

@@ -93,7 +93,7 @@ public class Pet {
     this.photoUrls = photoUrls;
   }
 
-  public Pet id(Long id) {
+  public Pet id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -105,15 +105,15 @@ public class Pet {
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Pet category(Category category) {
+  public Pet category(@Nullable Category category) {
     this.category = category;
     return this;
   }
@@ -125,11 +125,11 @@ public class Pet {
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
-  public Category getCategory() {
+  public @Nullable Category getCategory() {
     return category;
   }
 
-  public void setCategory(Category category) {
+  public void setCategory(@Nullable Category category) {
     this.category = category;
   }
 
@@ -215,7 +215,7 @@ public class Pet {
     this.tags = tags;
   }
 
-  public Pet status(StatusEnum status) {
+  public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -227,11 +227,11 @@ public class Pet {
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java

@@ -27,7 +27,7 @@ public class Tag {
 
   private @Nullable String name;
 
-  public Tag id(Long id) {
+  public Tag id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -39,15 +39,15 @@ public class Tag {
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Tag name(String name) {
+  public Tag name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -59,11 +59,11 @@ public class Tag {
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java

@@ -39,7 +39,7 @@ public class User {
 
   private @Nullable Integer userStatus;
 
-  public User id(Long id) {
+  public User id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -51,15 +51,15 @@ public class User {
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public User username(String username) {
+  public User username(@Nullable String username) {
     this.username = username;
     return this;
   }
@@ -71,15 +71,15 @@ public class User {
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
-  public String getUsername() {
+  public @Nullable String getUsername() {
     return username;
   }
 
-  public void setUsername(String username) {
+  public void setUsername(@Nullable String username) {
     this.username = username;
   }
 
-  public User firstName(String firstName) {
+  public User firstName(@Nullable String firstName) {
     this.firstName = firstName;
     return this;
   }
@@ -91,15 +91,15 @@ public class User {
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
-  public String getFirstName() {
+  public @Nullable String getFirstName() {
     return firstName;
   }
 
-  public void setFirstName(String firstName) {
+  public void setFirstName(@Nullable String firstName) {
     this.firstName = firstName;
   }
 
-  public User lastName(String lastName) {
+  public User lastName(@Nullable String lastName) {
     this.lastName = lastName;
     return this;
   }
@@ -111,15 +111,15 @@ public class User {
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
-  public String getLastName() {
+  public @Nullable String getLastName() {
     return lastName;
   }
 
-  public void setLastName(String lastName) {
+  public void setLastName(@Nullable String lastName) {
     this.lastName = lastName;
   }
 
-  public User email(String email) {
+  public User email(@Nullable String email) {
     this.email = email;
     return this;
   }
@@ -131,15 +131,15 @@ public class User {
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
-  public String getEmail() {
+  public @Nullable String getEmail() {
     return email;
   }
 
-  public void setEmail(String email) {
+  public void setEmail(@Nullable String email) {
     this.email = email;
   }
 
-  public User password(String password) {
+  public User password(@Nullable String password) {
     this.password = password;
     return this;
   }
@@ -151,15 +151,15 @@ public class User {
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
-  public String getPassword() {
+  public @Nullable String getPassword() {
     return password;
   }
 
-  public void setPassword(String password) {
+  public void setPassword(@Nullable String password) {
     this.password = password;
   }
 
-  public User phone(String phone) {
+  public User phone(@Nullable String phone) {
     this.phone = phone;
     return this;
   }
@@ -171,15 +171,15 @@ public class User {
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
-  public String getPhone() {
+  public @Nullable String getPhone() {
     return phone;
   }
 
-  public void setPhone(String phone) {
+  public void setPhone(@Nullable String phone) {
     this.phone = phone;
   }
 
-  public User userStatus(Integer userStatus) {
+  public User userStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
     return this;
   }
@@ -191,11 +191,11 @@ public class User {
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
-  public Integer getUserStatus() {
+  public @Nullable Integer getUserStatus() {
     return userStatus;
   }
 
-  public void setUserStatus(Integer userStatus) {
+  public void setUserStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
   }
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.Pet;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -95,7 +96,7 @@ public interface PetApi {
     
     ResponseEntity<Void> deletePet(
         @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
-        @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey
+        @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.Order;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.User;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java

@@ -28,7 +28,7 @@ public class Category {
 
   private @Nullable String name;
 
-  public Category id(Long id) {
+  public Category id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -40,15 +40,15 @@ public class Category {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Category name(String name) {
+  public Category name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -60,11 +60,11 @@ public class Category {
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -32,7 +32,7 @@ public class ModelApiResponse {
 
   private @Nullable String message;
 
-  public ModelApiResponse code(Integer code) {
+  public ModelApiResponse code(@Nullable Integer code) {
     this.code = code;
     return this;
   }
@@ -44,15 +44,15 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
-  public Integer getCode() {
+  public @Nullable Integer getCode() {
     return code;
   }
 
-  public void setCode(Integer code) {
+  public void setCode(@Nullable Integer code) {
     this.code = code;
   }
 
-  public ModelApiResponse type(String type) {
+  public ModelApiResponse type(@Nullable String type) {
     this.type = type;
     return this;
   }
@@ -64,15 +64,15 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
-  public String getType() {
+  public @Nullable String getType() {
     return type;
   }
 
-  public void setType(String type) {
+  public void setType(@Nullable String type) {
     this.type = type;
   }
 
-  public ModelApiResponse message(String message) {
+  public ModelApiResponse message(@Nullable String message) {
     this.message = message;
     return this;
   }
@@ -84,11 +84,11 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
-  public String getMessage() {
+  public @Nullable String getMessage() {
     return message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(@Nullable String message) {
     this.message = message;
   }
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java

@@ -77,7 +77,7 @@ public class Order {
 
   private Boolean complete = false;
 
-  public Order id(Long id) {
+  public Order id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -89,15 +89,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Order petId(Long petId) {
+  public Order petId(@Nullable Long petId) {
     this.petId = petId;
     return this;
   }
@@ -109,15 +109,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
-  public Long getPetId() {
+  public @Nullable Long getPetId() {
     return petId;
   }
 
-  public void setPetId(Long petId) {
+  public void setPetId(@Nullable Long petId) {
     this.petId = petId;
   }
 
-  public Order quantity(Integer quantity) {
+  public Order quantity(@Nullable Integer quantity) {
     this.quantity = quantity;
     return this;
   }
@@ -129,15 +129,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
-  public Integer getQuantity() {
+  public @Nullable Integer getQuantity() {
     return quantity;
   }
 
-  public void setQuantity(Integer quantity) {
+  public void setQuantity(@Nullable Integer quantity) {
     this.quantity = quantity;
   }
 
-  public Order shipDate(OffsetDateTime shipDate) {
+  public Order shipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
@@ -149,15 +149,15 @@ public class Order {
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
-  public OffsetDateTime getShipDate() {
+  public @Nullable OffsetDateTime getShipDate() {
     return shipDate;
   }
 
-  public void setShipDate(OffsetDateTime shipDate) {
+  public void setShipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
   }
 
-  public Order status(StatusEnum status) {
+  public Order status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -169,11 +169,11 @@ public class Order {
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java

@@ -94,7 +94,7 @@ public class Pet {
     this.photoUrls = photoUrls;
   }
 
-  public Pet id(Long id) {
+  public Pet id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -106,15 +106,15 @@ public class Pet {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Pet category(Category category) {
+  public Pet category(@Nullable Category category) {
     this.category = category;
     return this;
   }
@@ -126,11 +126,11 @@ public class Pet {
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
-  public Category getCategory() {
+  public @Nullable Category getCategory() {
     return category;
   }
 
-  public void setCategory(Category category) {
+  public void setCategory(@Nullable Category category) {
     this.category = category;
   }
 
@@ -210,7 +210,7 @@ public class Pet {
     this.tags = tags;
   }
 
-  public Pet status(StatusEnum status) {
+  public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -224,7 +224,7 @@ public class Pet {
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   @Deprecated
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
@@ -232,7 +232,7 @@ public class Pet {
    * @deprecated
    */
   @Deprecated
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java

@@ -28,7 +28,7 @@ public class Tag {
 
   private @Nullable String name;
 
-  public Tag id(Long id) {
+  public Tag id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -40,15 +40,15 @@ public class Tag {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Tag name(String name) {
+  public Tag name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -60,11 +60,11 @@ public class Tag {
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java

@@ -40,7 +40,7 @@ public class User {
 
   private @Nullable Integer userStatus;
 
-  public User id(Long id) {
+  public User id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -52,15 +52,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public User username(String username) {
+  public User username(@Nullable String username) {
     this.username = username;
     return this;
   }
@@ -72,15 +72,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
-  public String getUsername() {
+  public @Nullable String getUsername() {
     return username;
   }
 
-  public void setUsername(String username) {
+  public void setUsername(@Nullable String username) {
     this.username = username;
   }
 
-  public User firstName(String firstName) {
+  public User firstName(@Nullable String firstName) {
     this.firstName = firstName;
     return this;
   }
@@ -92,15 +92,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
-  public String getFirstName() {
+  public @Nullable String getFirstName() {
     return firstName;
   }
 
-  public void setFirstName(String firstName) {
+  public void setFirstName(@Nullable String firstName) {
     this.firstName = firstName;
   }
 
-  public User lastName(String lastName) {
+  public User lastName(@Nullable String lastName) {
     this.lastName = lastName;
     return this;
   }
@@ -112,15 +112,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
-  public String getLastName() {
+  public @Nullable String getLastName() {
     return lastName;
   }
 
-  public void setLastName(String lastName) {
+  public void setLastName(@Nullable String lastName) {
     this.lastName = lastName;
   }
 
-  public User email(String email) {
+  public User email(@Nullable String email) {
     this.email = email;
     return this;
   }
@@ -132,15 +132,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
-  public String getEmail() {
+  public @Nullable String getEmail() {
     return email;
   }
 
-  public void setEmail(String email) {
+  public void setEmail(@Nullable String email) {
     this.email = email;
   }
 
-  public User password(String password) {
+  public User password(@Nullable String password) {
     this.password = password;
     return this;
   }
@@ -152,15 +152,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
-  public String getPassword() {
+  public @Nullable String getPassword() {
     return password;
   }
 
-  public void setPassword(String password) {
+  public void setPassword(@Nullable String password) {
     this.password = password;
   }
 
-  public User phone(String phone) {
+  public User phone(@Nullable String phone) {
     this.phone = phone;
     return this;
   }
@@ -172,15 +172,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
-  public String getPhone() {
+  public @Nullable String getPhone() {
     return phone;
   }
 
-  public void setPhone(String phone) {
+  public void setPhone(@Nullable String phone) {
     this.phone = phone;
   }
 
-  public User userStatus(Integer userStatus) {
+  public User userStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
     return this;
   }
@@ -192,11 +192,11 @@ public class User {
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
-  public Integer getUserStatus() {
+  public @Nullable Integer getUserStatus() {
     return userStatus;
   }
 
-  public void setUserStatus(Integer userStatus) {
+  public void setUserStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
   }
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java

@@ -12,6 +12,7 @@ import org.openapitools.model.Pet;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -91,7 +92,7 @@ public interface PetController {
     
     ResponseEntity<Void> deletePet(
         @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
-        @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey
+        @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java

@@ -10,6 +10,7 @@ import org.openapitools.model.Order;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java

@@ -10,6 +10,7 @@ import org.openapitools.model.User;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java

@@ -28,7 +28,7 @@ public class Category {
 
   private @Nullable String name;
 
-  public Category id(Long id) {
+  public Category id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -40,15 +40,15 @@ public class Category {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Category name(String name) {
+  public Category name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -60,11 +60,11 @@ public class Category {
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -32,7 +32,7 @@ public class ModelApiResponse {
 
   private @Nullable String message;
 
-  public ModelApiResponse code(Integer code) {
+  public ModelApiResponse code(@Nullable Integer code) {
     this.code = code;
     return this;
   }
@@ -44,15 +44,15 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
-  public Integer getCode() {
+  public @Nullable Integer getCode() {
     return code;
   }
 
-  public void setCode(Integer code) {
+  public void setCode(@Nullable Integer code) {
     this.code = code;
   }
 
-  public ModelApiResponse type(String type) {
+  public ModelApiResponse type(@Nullable String type) {
     this.type = type;
     return this;
   }
@@ -64,15 +64,15 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
-  public String getType() {
+  public @Nullable String getType() {
     return type;
   }
 
-  public void setType(String type) {
+  public void setType(@Nullable String type) {
     this.type = type;
   }
 
-  public ModelApiResponse message(String message) {
+  public ModelApiResponse message(@Nullable String message) {
     this.message = message;
     return this;
   }
@@ -84,11 +84,11 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
-  public String getMessage() {
+  public @Nullable String getMessage() {
     return message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(@Nullable String message) {
     this.message = message;
   }
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java

@@ -77,7 +77,7 @@ public class Order {
 
   private Boolean complete = false;
 
-  public Order id(Long id) {
+  public Order id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -89,15 +89,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Order petId(Long petId) {
+  public Order petId(@Nullable Long petId) {
     this.petId = petId;
     return this;
   }
@@ -109,15 +109,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
-  public Long getPetId() {
+  public @Nullable Long getPetId() {
     return petId;
   }
 
-  public void setPetId(Long petId) {
+  public void setPetId(@Nullable Long petId) {
     this.petId = petId;
   }
 
-  public Order quantity(Integer quantity) {
+  public Order quantity(@Nullable Integer quantity) {
     this.quantity = quantity;
     return this;
   }
@@ -129,15 +129,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
-  public Integer getQuantity() {
+  public @Nullable Integer getQuantity() {
     return quantity;
   }
 
-  public void setQuantity(Integer quantity) {
+  public void setQuantity(@Nullable Integer quantity) {
     this.quantity = quantity;
   }
 
-  public Order shipDate(OffsetDateTime shipDate) {
+  public Order shipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
@@ -149,15 +149,15 @@ public class Order {
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
-  public OffsetDateTime getShipDate() {
+  public @Nullable OffsetDateTime getShipDate() {
     return shipDate;
   }
 
-  public void setShipDate(OffsetDateTime shipDate) {
+  public void setShipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
   }
 
-  public Order status(StatusEnum status) {
+  public Order status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -169,11 +169,11 @@ public class Order {
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java

@@ -93,7 +93,7 @@ public class Pet {
     this.photoUrls = photoUrls;
   }
 
-  public Pet id(Long id) {
+  public Pet id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -105,15 +105,15 @@ public class Pet {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Pet category(Category category) {
+  public Pet category(@Nullable Category category) {
     this.category = category;
     return this;
   }
@@ -125,11 +125,11 @@ public class Pet {
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
-  public Category getCategory() {
+  public @Nullable Category getCategory() {
     return category;
   }
 
-  public void setCategory(Category category) {
+  public void setCategory(@Nullable Category category) {
     this.category = category;
   }
 
@@ -209,7 +209,7 @@ public class Pet {
     this.tags = tags;
   }
 
-  public Pet status(StatusEnum status) {
+  public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -221,11 +221,11 @@ public class Pet {
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java

@@ -28,7 +28,7 @@ public class Tag {
 
   private @Nullable String name;
 
-  public Tag id(Long id) {
+  public Tag id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -40,15 +40,15 @@ public class Tag {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Tag name(String name) {
+  public Tag name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -60,11 +60,11 @@ public class Tag {
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java

@@ -40,7 +40,7 @@ public class User {
 
   private @Nullable Integer userStatus;
 
-  public User id(Long id) {
+  public User id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -52,15 +52,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public User username(String username) {
+  public User username(@Nullable String username) {
     this.username = username;
     return this;
   }
@@ -72,15 +72,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
-  public String getUsername() {
+  public @Nullable String getUsername() {
     return username;
   }
 
-  public void setUsername(String username) {
+  public void setUsername(@Nullable String username) {
     this.username = username;
   }
 
-  public User firstName(String firstName) {
+  public User firstName(@Nullable String firstName) {
     this.firstName = firstName;
     return this;
   }
@@ -92,15 +92,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
-  public String getFirstName() {
+  public @Nullable String getFirstName() {
     return firstName;
   }
 
-  public void setFirstName(String firstName) {
+  public void setFirstName(@Nullable String firstName) {
     this.firstName = firstName;
   }
 
-  public User lastName(String lastName) {
+  public User lastName(@Nullable String lastName) {
     this.lastName = lastName;
     return this;
   }
@@ -112,15 +112,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
-  public String getLastName() {
+  public @Nullable String getLastName() {
     return lastName;
   }
 
-  public void setLastName(String lastName) {
+  public void setLastName(@Nullable String lastName) {
     this.lastName = lastName;
   }
 
-  public User email(String email) {
+  public User email(@Nullable String email) {
     this.email = email;
     return this;
   }
@@ -132,15 +132,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
-  public String getEmail() {
+  public @Nullable String getEmail() {
     return email;
   }
 
-  public void setEmail(String email) {
+  public void setEmail(@Nullable String email) {
     this.email = email;
   }
 
-  public User password(String password) {
+  public User password(@Nullable String password) {
     this.password = password;
     return this;
   }
@@ -152,15 +152,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
-  public String getPassword() {
+  public @Nullable String getPassword() {
     return password;
   }
 
-  public void setPassword(String password) {
+  public void setPassword(@Nullable String password) {
     this.password = password;
   }
 
-  public User phone(String phone) {
+  public User phone(@Nullable String phone) {
     this.phone = phone;
     return this;
   }
@@ -172,15 +172,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
-  public String getPhone() {
+  public @Nullable String getPhone() {
     return phone;
   }
 
-  public void setPhone(String phone) {
+  public void setPhone(@Nullable String phone) {
     this.phone = phone;
   }
 
-  public User userStatus(Integer userStatus) {
+  public User userStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
     return this;
   }
@@ -192,11 +192,11 @@ public class User {
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
-  public Integer getUserStatus() {
+  public @Nullable Integer getUserStatus() {
     return userStatus;
   }
 
-  public void setUserStatus(Integer userStatus) {
+  public void setUserStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
   }
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.Pet;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -95,7 +96,7 @@ public interface PetApi {
     
     ResponseEntity<Void> deletePet(
         @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
-        @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey
+        @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.Order;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.User;
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java

@@ -28,7 +28,7 @@ public class Category {
 
   private @Nullable String name;
 
-  public Category id(Long id) {
+  public Category id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -40,15 +40,15 @@ public class Category {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Category name(String name) {
+  public Category name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -60,11 +60,11 @@ public class Category {
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -32,7 +32,7 @@ public class ModelApiResponse {
 
   private @Nullable String message;
 
-  public ModelApiResponse code(Integer code) {
+  public ModelApiResponse code(@Nullable Integer code) {
     this.code = code;
     return this;
   }
@@ -44,15 +44,15 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
-  public Integer getCode() {
+  public @Nullable Integer getCode() {
     return code;
   }
 
-  public void setCode(Integer code) {
+  public void setCode(@Nullable Integer code) {
     this.code = code;
   }
 
-  public ModelApiResponse type(String type) {
+  public ModelApiResponse type(@Nullable String type) {
     this.type = type;
     return this;
   }
@@ -64,15 +64,15 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
-  public String getType() {
+  public @Nullable String getType() {
     return type;
   }
 
-  public void setType(String type) {
+  public void setType(@Nullable String type) {
     this.type = type;
   }
 
-  public ModelApiResponse message(String message) {
+  public ModelApiResponse message(@Nullable String message) {
     this.message = message;
     return this;
   }
@@ -84,11 +84,11 @@ public class ModelApiResponse {
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
-  public String getMessage() {
+  public @Nullable String getMessage() {
     return message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(@Nullable String message) {
     this.message = message;
   }
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java

@@ -77,7 +77,7 @@ public class Order {
 
   private Boolean complete = false;
 
-  public Order id(Long id) {
+  public Order id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -89,15 +89,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Order petId(Long petId) {
+  public Order petId(@Nullable Long petId) {
     this.petId = petId;
     return this;
   }
@@ -109,15 +109,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
-  public Long getPetId() {
+  public @Nullable Long getPetId() {
     return petId;
   }
 
-  public void setPetId(Long petId) {
+  public void setPetId(@Nullable Long petId) {
     this.petId = petId;
   }
 
-  public Order quantity(Integer quantity) {
+  public Order quantity(@Nullable Integer quantity) {
     this.quantity = quantity;
     return this;
   }
@@ -129,15 +129,15 @@ public class Order {
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
-  public Integer getQuantity() {
+  public @Nullable Integer getQuantity() {
     return quantity;
   }
 
-  public void setQuantity(Integer quantity) {
+  public void setQuantity(@Nullable Integer quantity) {
     this.quantity = quantity;
   }
 
-  public Order shipDate(OffsetDateTime shipDate) {
+  public Order shipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
@@ -149,15 +149,15 @@ public class Order {
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
-  public OffsetDateTime getShipDate() {
+  public @Nullable OffsetDateTime getShipDate() {
     return shipDate;
   }
 
-  public void setShipDate(OffsetDateTime shipDate) {
+  public void setShipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
   }
 
-  public Order status(StatusEnum status) {
+  public Order status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -169,11 +169,11 @@ public class Order {
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java

@@ -94,7 +94,7 @@ public class Pet {
     this.photoUrls = photoUrls;
   }
 
-  public Pet id(Long id) {
+  public Pet id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -106,15 +106,15 @@ public class Pet {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Pet category(Category category) {
+  public Pet category(@Nullable Category category) {
     this.category = category;
     return this;
   }
@@ -126,11 +126,11 @@ public class Pet {
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
-  public Category getCategory() {
+  public @Nullable Category getCategory() {
     return category;
   }
 
-  public void setCategory(Category category) {
+  public void setCategory(@Nullable Category category) {
     this.category = category;
   }
 
@@ -210,7 +210,7 @@ public class Pet {
     this.tags = tags;
   }
 
-  public Pet status(StatusEnum status) {
+  public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -224,7 +224,7 @@ public class Pet {
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   @Deprecated
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
@@ -232,7 +232,7 @@ public class Pet {
    * @deprecated
    */
   @Deprecated
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java

@@ -28,7 +28,7 @@ public class Tag {
 
   private @Nullable String name;
 
-  public Tag id(Long id) {
+  public Tag id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -40,15 +40,15 @@ public class Tag {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public Tag name(String name) {
+  public Tag name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -60,11 +60,11 @@ public class Tag {
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java

@@ -40,7 +40,7 @@ public class User {
 
   private @Nullable Integer userStatus;
 
-  public User id(Long id) {
+  public User id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -52,15 +52,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public User username(String username) {
+  public User username(@Nullable String username) {
     this.username = username;
     return this;
   }
@@ -72,15 +72,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
-  public String getUsername() {
+  public @Nullable String getUsername() {
     return username;
   }
 
-  public void setUsername(String username) {
+  public void setUsername(@Nullable String username) {
     this.username = username;
   }
 
-  public User firstName(String firstName) {
+  public User firstName(@Nullable String firstName) {
     this.firstName = firstName;
     return this;
   }
@@ -92,15 +92,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
-  public String getFirstName() {
+  public @Nullable String getFirstName() {
     return firstName;
   }
 
-  public void setFirstName(String firstName) {
+  public void setFirstName(@Nullable String firstName) {
     this.firstName = firstName;
   }
 
-  public User lastName(String lastName) {
+  public User lastName(@Nullable String lastName) {
     this.lastName = lastName;
     return this;
   }
@@ -112,15 +112,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
-  public String getLastName() {
+  public @Nullable String getLastName() {
     return lastName;
   }
 
-  public void setLastName(String lastName) {
+  public void setLastName(@Nullable String lastName) {
     this.lastName = lastName;
   }
 
-  public User email(String email) {
+  public User email(@Nullable String email) {
     this.email = email;
     return this;
   }
@@ -132,15 +132,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
-  public String getEmail() {
+  public @Nullable String getEmail() {
     return email;
   }
 
-  public void setEmail(String email) {
+  public void setEmail(@Nullable String email) {
     this.email = email;
   }
 
-  public User password(String password) {
+  public User password(@Nullable String password) {
     this.password = password;
     return this;
   }
@@ -152,15 +152,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
-  public String getPassword() {
+  public @Nullable String getPassword() {
     return password;
   }
 
-  public void setPassword(String password) {
+  public void setPassword(@Nullable String password) {
     this.password = password;
   }
 
-  public User phone(String phone) {
+  public User phone(@Nullable String phone) {
     this.phone = phone;
     return this;
   }
@@ -172,15 +172,15 @@ public class User {
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
-  public String getPhone() {
+  public @Nullable String getPhone() {
     return phone;
   }
 
-  public void setPhone(String phone) {
+  public void setPhone(@Nullable String phone) {
     this.phone = phone;
   }
 
-  public User userStatus(Integer userStatus) {
+  public User userStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
     return this;
   }
@@ -192,11 +192,11 @@ public class User {
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
-  public Integer getUserStatus() {
+  public @Nullable Integer getUserStatus() {
     return userStatus;
   }
 
-  public void setUserStatus(Integer userStatus) {
+  public void setUserStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
   }
 

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.ClientDto;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java

@@ -17,6 +17,7 @@ import org.openapitools.model.OuterCompositeDto;
 import org.openapitools.model.UserDto;
 import org.openapitools.model.XmlItemDto;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -64,7 +65,7 @@ public interface FakeApi {
         contentType = "application/json"
     )
     Boolean fakeOuterBooleanSerialize(
-         @RequestBody(required = false) Boolean body
+         @RequestBody(required = false) @Nullable Boolean body
     );
 
 
@@ -83,7 +84,7 @@ public interface FakeApi {
         contentType = "application/json"
     )
     OuterCompositeDto fakeOuterCompositeSerialize(
-         @RequestBody(required = false) OuterCompositeDto outerCompositeDto
+         @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto
     );
 
 
@@ -102,7 +103,7 @@ public interface FakeApi {
         contentType = "application/json"
     )
     BigDecimal fakeOuterNumberSerialize(
-         @RequestBody(required = false) BigDecimal body
+         @RequestBody(required = false) @Nullable BigDecimal body
     );
 
 
@@ -121,7 +122,7 @@ public interface FakeApi {
         contentType = "application/json"
     )
     String fakeOuterStringSerialize(
-         @RequestBody(required = false) String body
+         @RequestBody(required = false) @Nullable String body
     );
 
 
@@ -252,12 +253,12 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     void testEnumParameters(
-         @RequestHeader(value = "enum_header_string_array", required = false) List<String> enumHeaderStringArray,
+         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
          @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-         @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,
+         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
          @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-         @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,
+         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-         @RequestParam(value = "enum_query_double", required = false) Double enumQueryDouble,
+         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
          @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
          @RequestParam(value = "enum_form_string", required = false) String enumFormString
     );
@@ -285,9 +286,9 @@ public interface FakeApi {
          @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
          @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
          @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-         @RequestParam(value = "string_group", required = false) Integer stringGroup,
+         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-         @RequestHeader(value = "boolean_group", required = false) Boolean booleanGroup,
+         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-         @RequestParam(value = "int64_group", required = false) Long int64Group
+         @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
     );
 
 

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.ClientDto;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java

@@ -10,6 +10,7 @@ import org.openapitools.model.PetDto;
 import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto;
 import java.util.Set;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -60,7 +61,7 @@ public interface PetApi {
     )
     void deletePet(
          @PathVariable("petId") Long petId,
-         @RequestHeader(value = "api_key", required = false) String apiKey
+         @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
 

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java

@@ -8,6 +8,7 @@ package org.openapitools.api;
 import java.util.Map;
 import org.openapitools.model.OrderDto;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java

@@ -8,6 +8,7 @@ package org.openapitools.api;
 import java.time.OffsetDateTime;
 import org.openapitools.model.UserDto;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -28,7 +28,7 @@ public class AdditionalPropertiesAnyTypeDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesAnyTypeDto name(String name) {
+  public AdditionalPropertiesAnyTypeDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -39,11 +39,11 @@ public class AdditionalPropertiesAnyTypeDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -29,7 +29,7 @@ public class AdditionalPropertiesArrayDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesArrayDto name(String name) {
+  public AdditionalPropertiesArrayDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -40,11 +40,11 @@ public class AdditionalPropertiesArrayDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -28,7 +28,7 @@ public class AdditionalPropertiesBooleanDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesBooleanDto name(String name) {
+  public AdditionalPropertiesBooleanDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -39,11 +39,11 @@ public class AdditionalPropertiesBooleanDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -275,7 +275,7 @@ public class AdditionalPropertiesClassDto {
     this.mapMapAnytype = mapMapAnytype;
   }
 
-  public AdditionalPropertiesClassDto anytype1(Object anytype1) {
+  public AdditionalPropertiesClassDto anytype1(@Nullable Object anytype1) {
     this.anytype1 = anytype1;
     return this;
   }
@@ -286,11 +286,11 @@ public class AdditionalPropertiesClassDto {
    */
   
   @JsonProperty("anytype_1")
-  public Object getAnytype1() {
+  public @Nullable Object getAnytype1() {
     return anytype1;
   }
 
-  public void setAnytype1(Object anytype1) {
+  public void setAnytype1(@Nullable Object anytype1) {
     this.anytype1 = anytype1;
   }
 
@@ -313,7 +313,7 @@ public class AdditionalPropertiesClassDto {
     this.anytype2 = anytype2;
   }
 
-  public AdditionalPropertiesClassDto anytype3(Object anytype3) {
+  public AdditionalPropertiesClassDto anytype3(@Nullable Object anytype3) {
     this.anytype3 = anytype3;
     return this;
   }
@@ -324,11 +324,11 @@ public class AdditionalPropertiesClassDto {
    */
   
   @JsonProperty("anytype_3")
-  public Object getAnytype3() {
+  public @Nullable Object getAnytype3() {
     return anytype3;
   }
 
-  public void setAnytype3(Object anytype3) {
+  public void setAnytype3(@Nullable Object anytype3) {
     this.anytype3 = anytype3;
   }
 

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

@@ -28,7 +28,7 @@ public class AdditionalPropertiesIntegerDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesIntegerDto name(String name) {
+  public AdditionalPropertiesIntegerDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -39,11 +39,11 @@ public class AdditionalPropertiesIntegerDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -29,7 +29,7 @@ public class AdditionalPropertiesNumberDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesNumberDto name(String name) {
+  public AdditionalPropertiesNumberDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -40,11 +40,11 @@ public class AdditionalPropertiesNumberDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -29,7 +29,7 @@ public class AdditionalPropertiesObjectDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesObjectDto name(String name) {
+  public AdditionalPropertiesObjectDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -40,11 +40,11 @@ public class AdditionalPropertiesObjectDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -28,7 +28,7 @@ public class AdditionalPropertiesStringDto {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesStringDto name(String name) {
+  public AdditionalPropertiesStringDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -39,11 +39,11 @@ public class AdditionalPropertiesStringDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -28,7 +28,7 @@ public class ApiResponseDto {
 
   private @Nullable String message;
 
-  public ApiResponseDto code(Integer code) {
+  public ApiResponseDto code(@Nullable Integer code) {
     this.code = code;
     return this;
   }
@@ -39,15 +39,15 @@ public class ApiResponseDto {
    */
   
   @JsonProperty("code")
-  public Integer getCode() {
+  public @Nullable Integer getCode() {
     return code;
   }
 
-  public void setCode(Integer code) {
+  public void setCode(@Nullable Integer code) {
     this.code = code;
   }
 
-  public ApiResponseDto type(String type) {
+  public ApiResponseDto type(@Nullable String type) {
     this.type = type;
     return this;
   }
@@ -58,15 +58,15 @@ public class ApiResponseDto {
    */
   
   @JsonProperty("type")
-  public String getType() {
+  public @Nullable String getType() {
     return type;
   }
 
-  public void setType(String type) {
+  public void setType(@Nullable String type) {
     this.type = type;
   }
 
-  public ApiResponseDto message(String message) {
+  public ApiResponseDto message(@Nullable String message) {
     this.message = message;
     return this;
   }
@@ -77,11 +77,11 @@ public class ApiResponseDto {
    */
   
   @JsonProperty("message")
-  public String getMessage() {
+  public @Nullable String getMessage() {
     return message;
   }
 
-  public void setMessage(String message) {
+  public void setMessage(@Nullable String message) {
     this.message = message;
   }
 

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

@@ -73,7 +73,7 @@ public class BigCatDto extends CatDto {
     super();
   }
 
-  public BigCatDto kind(KindEnum kind) {
+  public BigCatDto kind(@Nullable KindEnum kind) {
     this.kind = kind;
     return this;
   }
@@ -84,11 +84,11 @@ public class BigCatDto extends CatDto {
    */
   
   @JsonProperty("kind")
-  public KindEnum getKind() {
+  public @Nullable KindEnum getKind() {
     return kind;
   }
 
-  public void setKind(KindEnum kind) {
+  public void setKind(@Nullable KindEnum kind) {
     this.kind = kind;
   }
 

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

@@ -34,7 +34,7 @@ public class CapitalizationDto {
 
   private @Nullable String ATT_NAME;
 
-  public CapitalizationDto smallCamel(String smallCamel) {
+  public CapitalizationDto smallCamel(@Nullable String smallCamel) {
     this.smallCamel = smallCamel;
     return this;
   }
@@ -45,15 +45,15 @@ public class CapitalizationDto {
    */
   
   @JsonProperty("smallCamel")
-  public String getSmallCamel() {
+  public @Nullable String getSmallCamel() {
     return smallCamel;
   }
 
-  public void setSmallCamel(String smallCamel) {
+  public void setSmallCamel(@Nullable String smallCamel) {
     this.smallCamel = smallCamel;
   }
 
-  public CapitalizationDto capitalCamel(String capitalCamel) {
+  public CapitalizationDto capitalCamel(@Nullable String capitalCamel) {
     this.capitalCamel = capitalCamel;
     return this;
   }
@@ -64,15 +64,15 @@ public class CapitalizationDto {
    */
   
   @JsonProperty("CapitalCamel")
-  public String getCapitalCamel() {
+  public @Nullable String getCapitalCamel() {
     return capitalCamel;
   }
 
-  public void setCapitalCamel(String capitalCamel) {
+  public void setCapitalCamel(@Nullable String capitalCamel) {
     this.capitalCamel = capitalCamel;
   }
 
-  public CapitalizationDto smallSnake(String smallSnake) {
+  public CapitalizationDto smallSnake(@Nullable String smallSnake) {
     this.smallSnake = smallSnake;
     return this;
   }
@@ -83,15 +83,15 @@ public class CapitalizationDto {
    */
   
   @JsonProperty("small_Snake")
-  public String getSmallSnake() {
+  public @Nullable String getSmallSnake() {
     return smallSnake;
   }
 
-  public void setSmallSnake(String smallSnake) {
+  public void setSmallSnake(@Nullable String smallSnake) {
     this.smallSnake = smallSnake;
   }
 
-  public CapitalizationDto capitalSnake(String capitalSnake) {
+  public CapitalizationDto capitalSnake(@Nullable String capitalSnake) {
     this.capitalSnake = capitalSnake;
     return this;
   }
@@ -102,15 +102,15 @@ public class CapitalizationDto {
    */
   
   @JsonProperty("Capital_Snake")
-  public String getCapitalSnake() {
+  public @Nullable String getCapitalSnake() {
     return capitalSnake;
   }
 
-  public void setCapitalSnake(String capitalSnake) {
+  public void setCapitalSnake(@Nullable String capitalSnake) {
     this.capitalSnake = capitalSnake;
   }
 
-  public CapitalizationDto scAETHFlowPoints(String scAETHFlowPoints) {
+  public CapitalizationDto scAETHFlowPoints(@Nullable String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
     return this;
   }
@@ -121,15 +121,15 @@ public class CapitalizationDto {
    */
   
   @JsonProperty("SCA_ETH_Flow_Points")
-  public String getScAETHFlowPoints() {
+  public @Nullable String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
 
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+  public void setScAETHFlowPoints(@Nullable String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
   }
 
-  public CapitalizationDto ATT_NAME(String ATT_NAME) {
+  public CapitalizationDto ATT_NAME(@Nullable String ATT_NAME) {
     this.ATT_NAME = ATT_NAME;
     return this;
   }
@@ -140,11 +140,11 @@ public class CapitalizationDto {
    */
   
   @JsonProperty("ATT_NAME")
-  public String getATTNAME() {
+  public @Nullable String getATTNAME() {
     return ATT_NAME;
   }
 
-  public void setATTNAME(String ATT_NAME) {
+  public void setATTNAME(@Nullable String ATT_NAME) {
     this.ATT_NAME = ATT_NAME;
   }
 

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

@@ -40,7 +40,7 @@ public class CatDto extends AnimalDto {
     super();
   }
 
-  public CatDto declawed(Boolean declawed) {
+  public CatDto declawed(@Nullable Boolean declawed) {
     this.declawed = declawed;
     return this;
   }
@@ -51,11 +51,11 @@ public class CatDto extends AnimalDto {
    */
   
   @JsonProperty("declawed")
-  public Boolean getDeclawed() {
+  public @Nullable Boolean getDeclawed() {
     return declawed;
   }
 
-  public void setDeclawed(Boolean declawed) {
+  public void setDeclawed(@Nullable Boolean declawed) {
     this.declawed = declawed;
   }
 

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

@@ -30,7 +30,7 @@ public class CategoryDto {
     super();
   }
 
-  public CategoryDto id(Long id) {
+  public CategoryDto id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -41,11 +41,11 @@ public class CategoryDto {
    */
   
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 

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

@@ -32,7 +32,7 @@ public class ChildWithNullableDto extends ParentWithNullableDto {
 
   private @Nullable String otherProperty;
 
-  public ChildWithNullableDto otherProperty(String otherProperty) {
+  public ChildWithNullableDto otherProperty(@Nullable String otherProperty) {
     this.otherProperty = otherProperty;
     return this;
   }
@@ -43,11 +43,11 @@ public class ChildWithNullableDto extends ParentWithNullableDto {
    */
   
   @JsonProperty("otherProperty")
-  public String getOtherProperty() {
+  public @Nullable String getOtherProperty() {
     return otherProperty;
   }
 
-  public void setOtherProperty(String otherProperty) {
+  public void setOtherProperty(@Nullable String otherProperty) {
     this.otherProperty = otherProperty;
   }
 

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

@@ -24,7 +24,7 @@ public class ClassModelDto {
 
   private @Nullable String propertyClass;
 
-  public ClassModelDto propertyClass(String propertyClass) {
+  public ClassModelDto propertyClass(@Nullable String propertyClass) {
     this.propertyClass = propertyClass;
     return this;
   }
@@ -35,11 +35,11 @@ public class ClassModelDto {
    */
   
   @JsonProperty("_class")
-  public String getPropertyClass() {
+  public @Nullable String getPropertyClass() {
     return propertyClass;
   }
 
-  public void setPropertyClass(String propertyClass) {
+  public void setPropertyClass(@Nullable String propertyClass) {
     this.propertyClass = propertyClass;
   }
 

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

@@ -24,7 +24,7 @@ public class ClientDto {
 
   private @Nullable String client;
 
-  public ClientDto client(String client) {
+  public ClientDto client(@Nullable String client) {
     this.client = client;
     return this;
   }
@@ -35,11 +35,11 @@ public class ClientDto {
    */
   
   @JsonProperty("client")
-  public String getClient() {
+  public @Nullable String getClient() {
     return client;
   }
 
-  public void setClient(String client) {
+  public void setClient(@Nullable String client) {
     this.client = client;
   }
 

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

@@ -33,7 +33,7 @@ public class DogDto extends AnimalDto {
     super();
   }
 
-  public DogDto breed(String breed) {
+  public DogDto breed(@Nullable String breed) {
     this.breed = breed;
     return this;
   }
@@ -44,11 +44,11 @@ public class DogDto extends AnimalDto {
    */
   
   @JsonProperty("breed")
-  public String getBreed() {
+  public @Nullable String getBreed() {
     return breed;
   }
 
-  public void setBreed(String breed) {
+  public void setBreed(@Nullable String breed) {
     this.breed = breed;
   }
 

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

@@ -101,7 +101,7 @@ public class EnumArraysDto {
   
   private List<ArrayEnumEnum> arrayEnum = new ArrayList<>();
 
-  public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) {
+  public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
     return this;
   }
@@ -112,11 +112,11 @@ public class EnumArraysDto {
    */
   
   @JsonProperty("just_symbol")
-  public JustSymbolEnum getJustSymbol() {
+  public @Nullable JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
 
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
+  public void setJustSymbol(@Nullable JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
   }
 

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

@@ -182,7 +182,7 @@ public class EnumTestDto {
     super();
   }
 
-  public EnumTestDto enumString(EnumStringEnum enumString) {
+  public EnumTestDto enumString(@Nullable EnumStringEnum enumString) {
     this.enumString = enumString;
     return this;
   }
@@ -193,11 +193,11 @@ public class EnumTestDto {
    */
   
   @JsonProperty("enum_string")
-  public EnumStringEnum getEnumString() {
+  public @Nullable EnumStringEnum getEnumString() {
     return enumString;
   }
 
-  public void setEnumString(EnumStringEnum enumString) {
+  public void setEnumString(@Nullable EnumStringEnum enumString) {
     this.enumString = enumString;
   }
 
@@ -220,7 +220,7 @@ public class EnumTestDto {
     this.enumStringRequired = enumStringRequired;
   }
 
-  public EnumTestDto enumInteger(EnumIntegerEnum enumInteger) {
+  public EnumTestDto enumInteger(@Nullable EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
     return this;
   }
@@ -231,15 +231,15 @@ public class EnumTestDto {
    */
   
   @JsonProperty("enum_integer")
-  public EnumIntegerEnum getEnumInteger() {
+  public @Nullable EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
 
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
+  public void setEnumInteger(@Nullable EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
   }
 
-  public EnumTestDto enumNumber(EnumNumberEnum enumNumber) {
+  public EnumTestDto enumNumber(@Nullable EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
     return this;
   }
@@ -250,15 +250,15 @@ public class EnumTestDto {
    */
   
   @JsonProperty("enum_number")
-  public EnumNumberEnum getEnumNumber() {
+  public @Nullable EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
 
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
+  public void setEnumNumber(@Nullable EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
   }
 
-  public EnumTestDto outerEnum(OuterEnumDto outerEnum) {
+  public EnumTestDto outerEnum(@Nullable OuterEnumDto outerEnum) {
     this.outerEnum = outerEnum;
     return this;
   }
@@ -269,11 +269,11 @@ public class EnumTestDto {
    */
   
   @JsonProperty("outerEnum")
-  public OuterEnumDto getOuterEnum() {
+  public @Nullable OuterEnumDto getOuterEnum() {
     return outerEnum;
   }
 
-  public void setOuterEnum(OuterEnumDto outerEnum) {
+  public void setOuterEnum(@Nullable OuterEnumDto outerEnum) {
     this.outerEnum = outerEnum;
   }
 

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

@@ -24,7 +24,7 @@ public class FileDto {
 
   private @Nullable String sourceURI;
 
-  public FileDto sourceURI(String sourceURI) {
+  public FileDto sourceURI(@Nullable String sourceURI) {
     this.sourceURI = sourceURI;
     return this;
   }
@@ -35,11 +35,11 @@ public class FileDto {
    */
   
   @JsonProperty("sourceURI")
-  public String getSourceURI() {
+  public @Nullable String getSourceURI() {
     return sourceURI;
   }
 
-  public void setSourceURI(String sourceURI) {
+  public void setSourceURI(@Nullable String sourceURI) {
     this.sourceURI = sourceURI;
   }
 

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

@@ -31,7 +31,7 @@ public class FileSchemaTestClassDto {
   
   private List<FileDto> files = new ArrayList<>();
 
-  public FileSchemaTestClassDto file(FileDto file) {
+  public FileSchemaTestClassDto file(@Nullable FileDto file) {
     this.file = file;
     return this;
   }
@@ -42,11 +42,11 @@ public class FileSchemaTestClassDto {
    */
   
   @JsonProperty("file")
-  public FileDto getFile() {
+  public @Nullable FileDto getFile() {
     return file;
   }
 
-  public void setFile(FileDto file) {
+  public void setFile(@Nullable FileDto file) {
     this.file = file;
   }
 

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

@@ -62,7 +62,7 @@ public class FormatTestDto {
     super();
   }
 
-  public FormatTestDto integer(Integer integer) {
+  public FormatTestDto integer(@Nullable Integer integer) {
     this.integer = integer;
     return this;
   }
@@ -75,15 +75,15 @@ public class FormatTestDto {
    */
   
   @JsonProperty("integer")
-  public Integer getInteger() {
+  public @Nullable Integer getInteger() {
     return integer;
   }
 
-  public void setInteger(Integer integer) {
+  public void setInteger(@Nullable Integer integer) {
     this.integer = integer;
   }
 
-  public FormatTestDto int32(Integer int32) {
+  public FormatTestDto int32(@Nullable Integer int32) {
     this.int32 = int32;
     return this;
   }
@@ -96,15 +96,15 @@ public class FormatTestDto {
    */
   
   @JsonProperty("int32")
-  public Integer getInt32() {
+  public @Nullable Integer getInt32() {
     return int32;
   }
 
-  public void setInt32(Integer int32) {
+  public void setInt32(@Nullable Integer int32) {
     this.int32 = int32;
   }
 
-  public FormatTestDto int64(Long int64) {
+  public FormatTestDto int64(@Nullable Long int64) {
     this.int64 = int64;
     return this;
   }
@@ -115,11 +115,11 @@ public class FormatTestDto {
    */
   
   @JsonProperty("int64")
-  public Long getInt64() {
+  public @Nullable Long getInt64() {
     return int64;
   }
 
-  public void setInt64(Long int64) {
+  public void setInt64(@Nullable Long int64) {
     this.int64 = int64;
   }
 
@@ -144,7 +144,7 @@ public class FormatTestDto {
     this.number = number;
   }
 
-  public FormatTestDto _float(Float _float) {
+  public FormatTestDto _float(@Nullable Float _float) {
     this._float = _float;
     return this;
   }
@@ -157,15 +157,15 @@ public class FormatTestDto {
    */
   
   @JsonProperty("float")
-  public Float getFloat() {
+  public @Nullable Float getFloat() {
     return _float;
   }
 
-  public void setFloat(Float _float) {
+  public void setFloat(@Nullable Float _float) {
     this._float = _float;
   }
 
-  public FormatTestDto _double(Double _double) {
+  public FormatTestDto _double(@Nullable Double _double) {
     this._double = _double;
     return this;
   }
@@ -178,15 +178,15 @@ public class FormatTestDto {
    */
   
   @JsonProperty("double")
-  public Double getDouble() {
+  public @Nullable Double getDouble() {
     return _double;
   }
 
-  public void setDouble(Double _double) {
+  public void setDouble(@Nullable Double _double) {
     this._double = _double;
   }
 
-  public FormatTestDto string(String string) {
+  public FormatTestDto string(@Nullable String string) {
     this.string = string;
     return this;
   }
@@ -197,11 +197,11 @@ public class FormatTestDto {
    */
   
   @JsonProperty("string")
-  public String getString() {
+  public @Nullable String getString() {
     return string;
   }
 
-  public void setString(String string) {
+  public void setString(@Nullable String string) {
     this.string = string;
   }
 
@@ -224,7 +224,7 @@ public class FormatTestDto {
     this._byte = _byte;
   }
 
-  public FormatTestDto binary(org.springframework.core.io.Resource binary) {
+  public FormatTestDto binary(@Nullable org.springframework.core.io.Resource binary) {
     this.binary = binary;
     return this;
   }
@@ -235,11 +235,11 @@ public class FormatTestDto {
    */
   
   @JsonProperty("binary")
-  public org.springframework.core.io.Resource getBinary() {
+  public @Nullable org.springframework.core.io.Resource getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(@Nullable org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
@@ -262,7 +262,7 @@ public class FormatTestDto {
     this.date = date;
   }
 
-  public FormatTestDto dateTime(OffsetDateTime dateTime) {
+  public FormatTestDto dateTime(@Nullable OffsetDateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
@@ -273,15 +273,15 @@ public class FormatTestDto {
    */
   
   @JsonProperty("dateTime")
-  public OffsetDateTime getDateTime() {
+  public @Nullable OffsetDateTime getDateTime() {
     return dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
+  public void setDateTime(@Nullable OffsetDateTime dateTime) {
     this.dateTime = dateTime;
   }
 
-  public FormatTestDto uuid(UUID uuid) {
+  public FormatTestDto uuid(@Nullable UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -292,11 +292,11 @@ public class FormatTestDto {
    */
   
   @JsonProperty("uuid")
-  public UUID getUuid() {
+  public @Nullable UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(UUID uuid) {
+  public void setUuid(@Nullable UUID uuid) {
     this.uuid = uuid;
   }
 
@@ -319,7 +319,7 @@ public class FormatTestDto {
     this.password = password;
   }
 
-  public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
+  public FormatTestDto bigDecimal(@Nullable BigDecimal bigDecimal) {
     this.bigDecimal = bigDecimal;
     return this;
   }
@@ -330,11 +330,11 @@ public class FormatTestDto {
    */
   
   @JsonProperty("BigDecimal")
-  public BigDecimal getBigDecimal() {
+  public @Nullable BigDecimal getBigDecimal() {
     return bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
+  public void setBigDecimal(@Nullable BigDecimal bigDecimal) {
     this.bigDecimal = bigDecimal;
   }
 

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

@@ -26,7 +26,7 @@ public class HasOnlyReadOnlyDto {
 
   private @Nullable String foo;
 
-  public HasOnlyReadOnlyDto bar(String bar) {
+  public HasOnlyReadOnlyDto bar(@Nullable String bar) {
     this.bar = bar;
     return this;
   }
@@ -37,15 +37,15 @@ public class HasOnlyReadOnlyDto {
    */
   
   @JsonProperty("bar")
-  public String getBar() {
+  public @Nullable String getBar() {
     return bar;
   }
 
-  public void setBar(String bar) {
+  public void setBar(@Nullable String bar) {
     this.bar = bar;
   }
 
-  public HasOnlyReadOnlyDto foo(String foo) {
+  public HasOnlyReadOnlyDto foo(@Nullable String foo) {
     this.foo = foo;
     return this;
   }
@@ -56,11 +56,11 @@ public class HasOnlyReadOnlyDto {
    */
   
   @JsonProperty("foo")
-  public String getFoo() {
+  public @Nullable String getFoo() {
     return foo;
   }
 
-  public void setFoo(String foo) {
+  public void setFoo(@Nullable String foo) {
     this.foo = foo;
   }
 

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

@@ -24,7 +24,7 @@ public class ListDto {
 
   private @Nullable String _123list;
 
-  public ListDto _123list(String _123list) {
+  public ListDto _123list(@Nullable String _123list) {
     this._123list = _123list;
     return this;
   }
@@ -35,11 +35,11 @@ public class ListDto {
    */
   
   @JsonProperty("123-list")
-  public String get123list() {
+  public @Nullable String get123list() {
     return _123list;
   }
 
-  public void set123list(String _123list) {
+  public void set123list(@Nullable String _123list) {
     this._123list = _123list;
   }
 

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

@@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto {
   
   private Map<String, AnimalDto> map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -47,15 +47,15 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto {
    */
   
   @JsonProperty("uuid")
-  public UUID getUuid() {
+  public @Nullable UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(UUID uuid) {
+  public void setUuid(@Nullable UUID uuid) {
     this.uuid = uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(@Nullable OffsetDateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
@@ -66,11 +66,11 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto {
    */
   
   @JsonProperty("dateTime")
-  public OffsetDateTime getDateTime() {
+  public @Nullable OffsetDateTime getDateTime() {
     return dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
+  public void setDateTime(@Nullable OffsetDateTime dateTime) {
     this.dateTime = dateTime;
   }
 

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

@@ -26,7 +26,7 @@ public class Model200ResponseDto {
 
   private @Nullable String propertyClass;
 
-  public Model200ResponseDto name(Integer name) {
+  public Model200ResponseDto name(@Nullable Integer name) {
     this.name = name;
     return this;
   }
@@ -37,15 +37,15 @@ public class Model200ResponseDto {
    */
   
   @JsonProperty("name")
-  public Integer getName() {
+  public @Nullable Integer getName() {
     return name;
   }
 
-  public void setName(Integer name) {
+  public void setName(@Nullable Integer name) {
     this.name = name;
   }
 
-  public Model200ResponseDto propertyClass(String propertyClass) {
+  public Model200ResponseDto propertyClass(@Nullable String propertyClass) {
     this.propertyClass = propertyClass;
     return this;
   }
@@ -56,11 +56,11 @@ public class Model200ResponseDto {
    */
   
   @JsonProperty("class")
-  public String getPropertyClass() {
+  public @Nullable String getPropertyClass() {
     return propertyClass;
   }
 
-  public void setPropertyClass(String propertyClass) {
+  public void setPropertyClass(@Nullable String propertyClass) {
     this.propertyClass = propertyClass;
   }
 

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

@@ -53,7 +53,7 @@ public class NameDto {
     this.name = name;
   }
 
-  public NameDto snakeCase(Integer snakeCase) {
+  public NameDto snakeCase(@Nullable Integer snakeCase) {
     this.snakeCase = snakeCase;
     return this;
   }
@@ -64,15 +64,15 @@ public class NameDto {
    */
   
   @JsonProperty("snake_case")
-  public Integer getSnakeCase() {
+  public @Nullable Integer getSnakeCase() {
     return snakeCase;
   }
 
-  public void setSnakeCase(Integer snakeCase) {
+  public void setSnakeCase(@Nullable Integer snakeCase) {
     this.snakeCase = snakeCase;
   }
 
-  public NameDto property(String property) {
+  public NameDto property(@Nullable String property) {
     this.property = property;
     return this;
   }
@@ -83,15 +83,15 @@ public class NameDto {
    */
   
   @JsonProperty("property")
-  public String getProperty() {
+  public @Nullable String getProperty() {
     return property;
   }
 
-  public void setProperty(String property) {
+  public void setProperty(@Nullable String property) {
     this.property = property;
   }
 
-  public NameDto _123number(Integer _123number) {
+  public NameDto _123number(@Nullable Integer _123number) {
     this._123number = _123number;
     return this;
   }
@@ -102,11 +102,11 @@ public class NameDto {
    */
   
   @JsonProperty("123Number")
-  public Integer get123number() {
+  public @Nullable Integer get123number() {
     return _123number;
   }
 
-  public void set123number(Integer _123number) {
+  public void set123number(@Nullable Integer _123number) {
     this._123number = _123number;
   }
 

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

@@ -25,7 +25,7 @@ public class NumberOnlyDto {
 
   private @Nullable BigDecimal justNumber;
 
-  public NumberOnlyDto justNumber(BigDecimal justNumber) {
+  public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) {
     this.justNumber = justNumber;
     return this;
   }
@@ -36,11 +36,11 @@ public class NumberOnlyDto {
    */
   
   @JsonProperty("JustNumber")
-  public BigDecimal getJustNumber() {
+  public @Nullable BigDecimal getJustNumber() {
     return justNumber;
   }
 
-  public void setJustNumber(BigDecimal justNumber) {
+  public void setJustNumber(@Nullable BigDecimal justNumber) {
     this.justNumber = justNumber;
   }
 

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

@@ -75,7 +75,7 @@ public class OrderDto {
 
   private Boolean complete = false;
 
-  public OrderDto id(Long id) {
+  public OrderDto id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -86,15 +86,15 @@ public class OrderDto {
    */
   
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public OrderDto petId(Long petId) {
+  public OrderDto petId(@Nullable Long petId) {
     this.petId = petId;
     return this;
   }
@@ -105,15 +105,15 @@ public class OrderDto {
    */
   
   @JsonProperty("petId")
-  public Long getPetId() {
+  public @Nullable Long getPetId() {
     return petId;
   }
 
-  public void setPetId(Long petId) {
+  public void setPetId(@Nullable Long petId) {
     this.petId = petId;
   }
 
-  public OrderDto quantity(Integer quantity) {
+  public OrderDto quantity(@Nullable Integer quantity) {
     this.quantity = quantity;
     return this;
   }
@@ -124,15 +124,15 @@ public class OrderDto {
    */
   
   @JsonProperty("quantity")
-  public Integer getQuantity() {
+  public @Nullable Integer getQuantity() {
     return quantity;
   }
 
-  public void setQuantity(Integer quantity) {
+  public void setQuantity(@Nullable Integer quantity) {
     this.quantity = quantity;
   }
 
-  public OrderDto shipDate(OffsetDateTime shipDate) {
+  public OrderDto shipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
@@ -143,15 +143,15 @@ public class OrderDto {
    */
   
   @JsonProperty("shipDate")
-  public OffsetDateTime getShipDate() {
+  public @Nullable OffsetDateTime getShipDate() {
     return shipDate;
   }
 
-  public void setShipDate(OffsetDateTime shipDate) {
+  public void setShipDate(@Nullable OffsetDateTime shipDate) {
     this.shipDate = shipDate;
   }
 
-  public OrderDto status(StatusEnum status) {
+  public OrderDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -162,11 +162,11 @@ public class OrderDto {
    */
   
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

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

@@ -29,7 +29,7 @@ public class OuterCompositeDto {
 
   private @Nullable Boolean myBoolean;
 
-  public OuterCompositeDto myNumber(BigDecimal myNumber) {
+  public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) {
     this.myNumber = myNumber;
     return this;
   }
@@ -40,15 +40,15 @@ public class OuterCompositeDto {
    */
   
   @JsonProperty("my_number")
-  public BigDecimal getMyNumber() {
+  public @Nullable BigDecimal getMyNumber() {
     return myNumber;
   }
 
-  public void setMyNumber(BigDecimal myNumber) {
+  public void setMyNumber(@Nullable BigDecimal myNumber) {
     this.myNumber = myNumber;
   }
 
-  public OuterCompositeDto myString(String myString) {
+  public OuterCompositeDto myString(@Nullable String myString) {
     this.myString = myString;
     return this;
   }
@@ -59,15 +59,15 @@ public class OuterCompositeDto {
    */
   
   @JsonProperty("my_string")
-  public String getMyString() {
+  public @Nullable String getMyString() {
     return myString;
   }
 
-  public void setMyString(String myString) {
+  public void setMyString(@Nullable String myString) {
     this.myString = myString;
   }
 
-  public OuterCompositeDto myBoolean(Boolean myBoolean) {
+  public OuterCompositeDto myBoolean(@Nullable Boolean myBoolean) {
     this.myBoolean = myBoolean;
     return this;
   }
@@ -78,11 +78,11 @@ public class OuterCompositeDto {
    */
   
   @JsonProperty("my_boolean")
-  public Boolean getMyBoolean() {
+  public @Nullable Boolean getMyBoolean() {
     return myBoolean;
   }
 
-  public void setMyBoolean(Boolean myBoolean) {
+  public void setMyBoolean(@Nullable Boolean myBoolean) {
     this.myBoolean = myBoolean;
   }
 

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

@@ -74,7 +74,7 @@ public class ParentWithNullableDto {
 
   private JsonNullable<String> nullableProperty = JsonNullable.<String>undefined();
 
-  public ParentWithNullableDto type(TypeEnum type) {
+  public ParentWithNullableDto type(@Nullable TypeEnum type) {
     this.type = type;
     return this;
   }
@@ -85,11 +85,11 @@ public class ParentWithNullableDto {
    */
   
   @JsonProperty("type")
-  public TypeEnum getType() {
+  public @Nullable TypeEnum getType() {
     return type;
   }
 
-  public void setType(TypeEnum type) {
+  public void setType(@Nullable TypeEnum type) {
     this.type = type;
   }
 

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

@@ -87,7 +87,7 @@ public class PetDto {
     super();
   }
 
-  public PetDto id(Long id) {
+  public PetDto id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -98,15 +98,15 @@ public class PetDto {
    */
   
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public PetDto category(CategoryDto category) {
+  public PetDto category(@Nullable CategoryDto category) {
     this.category = category;
     return this;
   }
@@ -117,11 +117,11 @@ public class PetDto {
    */
   
   @JsonProperty("category")
-  public CategoryDto getCategory() {
+  public @Nullable CategoryDto getCategory() {
     return category;
   }
 
-  public void setCategory(CategoryDto category) {
+  public void setCategory(@Nullable CategoryDto category) {
     this.category = category;
   }
 
@@ -199,7 +199,7 @@ public class PetDto {
     this.tags = tags;
   }
 
-  public PetDto status(StatusEnum status) {
+  public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
   }
@@ -212,7 +212,7 @@ public class PetDto {
   
   @JsonProperty("status")
   @Deprecated
-  public StatusEnum getStatus() {
+  public @Nullable StatusEnum getStatus() {
     return status;
   }
 
@@ -220,7 +220,7 @@ public class PetDto {
    * @deprecated
    */
   @Deprecated
-  public void setStatus(StatusEnum status) {
+  public void setStatus(@Nullable StatusEnum status) {
     this.status = status;
   }
 

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

@@ -26,7 +26,7 @@ public class ReadOnlyFirstDto {
 
   private @Nullable String baz;
 
-  public ReadOnlyFirstDto bar(String bar) {
+  public ReadOnlyFirstDto bar(@Nullable String bar) {
     this.bar = bar;
     return this;
   }
@@ -37,15 +37,15 @@ public class ReadOnlyFirstDto {
    */
   
   @JsonProperty("bar")
-  public String getBar() {
+  public @Nullable String getBar() {
     return bar;
   }
 
-  public void setBar(String bar) {
+  public void setBar(@Nullable String bar) {
     this.bar = bar;
   }
 
-  public ReadOnlyFirstDto baz(String baz) {
+  public ReadOnlyFirstDto baz(@Nullable String baz) {
     this.baz = baz;
     return this;
   }
@@ -56,11 +56,11 @@ public class ReadOnlyFirstDto {
    */
   
   @JsonProperty("baz")
-  public String getBaz() {
+  public @Nullable String getBaz() {
     return baz;
   }
 
-  public void setBaz(String baz) {
+  public void setBaz(@Nullable String baz) {
     this.baz = baz;
   }
 

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

@@ -30,7 +30,7 @@ public class ResponseObjectWithDifferentFieldNamesDto {
 
   private @Nullable String propertyNameWithSpaces;
 
-  public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) {
+  public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) {
     this.normalPropertyName = normalPropertyName;
     return this;
   }
@@ -41,15 +41,15 @@ public class ResponseObjectWithDifferentFieldNamesDto {
    */
   
   @JsonProperty("normalPropertyName")
-  public String getNormalPropertyName() {
+  public @Nullable String getNormalPropertyName() {
     return normalPropertyName;
   }
 
-  public void setNormalPropertyName(String normalPropertyName) {
+  public void setNormalPropertyName(@Nullable String normalPropertyName) {
     this.normalPropertyName = normalPropertyName;
   }
 
-  public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+  public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(@Nullable String UPPER_CASE_PROPERTY_SNAKE) {
     this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
     return this;
   }
@@ -60,15 +60,15 @@ public class ResponseObjectWithDifferentFieldNamesDto {
    */
   
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
-  public String getUPPERCASEPROPERTYSNAKE() {
+  public @Nullable String getUPPERCASEPROPERTYSNAKE() {
     return UPPER_CASE_PROPERTY_SNAKE;
   }
 
-  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+  public void setUPPERCASEPROPERTYSNAKE(@Nullable String UPPER_CASE_PROPERTY_SNAKE) {
     this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
   }
 
-  public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+  public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(@Nullable String lowerCasePropertyDashes) {
     this.lowerCasePropertyDashes = lowerCasePropertyDashes;
     return this;
   }
@@ -79,15 +79,15 @@ public class ResponseObjectWithDifferentFieldNamesDto {
    */
   
   @JsonProperty("lower-case-property-dashes")
-  public String getLowerCasePropertyDashes() {
+  public @Nullable String getLowerCasePropertyDashes() {
     return lowerCasePropertyDashes;
   }
 
-  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+  public void setLowerCasePropertyDashes(@Nullable String lowerCasePropertyDashes) {
     this.lowerCasePropertyDashes = lowerCasePropertyDashes;
   }
 
-  public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) {
+  public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(@Nullable String propertyNameWithSpaces) {
     this.propertyNameWithSpaces = propertyNameWithSpaces;
     return this;
   }
@@ -98,11 +98,11 @@ public class ResponseObjectWithDifferentFieldNamesDto {
    */
   
   @JsonProperty("property name with spaces")
-  public String getPropertyNameWithSpaces() {
+  public @Nullable String getPropertyNameWithSpaces() {
     return propertyNameWithSpaces;
   }
 
-  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+  public void setPropertyNameWithSpaces(@Nullable String propertyNameWithSpaces) {
     this.propertyNameWithSpaces = propertyNameWithSpaces;
   }
 

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

@@ -24,7 +24,7 @@ public class ReturnDto {
 
   private @Nullable Integer _return;
 
-  public ReturnDto _return(Integer _return) {
+  public ReturnDto _return(@Nullable Integer _return) {
     this._return = _return;
     return this;
   }
@@ -35,11 +35,11 @@ public class ReturnDto {
    */
   
   @JsonProperty("return")
-  public Integer getReturn() {
+  public @Nullable Integer getReturn() {
     return _return;
   }
 
-  public void setReturn(Integer _return) {
+  public void setReturn(@Nullable Integer _return) {
     this._return = _return;
   }
 

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

@@ -24,7 +24,7 @@ public class SpecialModelNameDto {
 
   private @Nullable Long $specialPropertyName;
 
-  public SpecialModelNameDto $specialPropertyName(Long $specialPropertyName) {
+  public SpecialModelNameDto $specialPropertyName(@Nullable Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
     return this;
   }
@@ -35,11 +35,11 @@ public class SpecialModelNameDto {
    */
   
   @JsonProperty("$special[property.name]")
-  public Long get$SpecialPropertyName() {
+  public @Nullable Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
 
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
+  public void set$SpecialPropertyName(@Nullable Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
   }
 

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

@@ -26,7 +26,7 @@ public class TagDto {
 
   private @Nullable String name;
 
-  public TagDto id(Long id) {
+  public TagDto id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -37,15 +37,15 @@ public class TagDto {
    */
   
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public TagDto name(String name) {
+  public TagDto name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -56,11 +56,11 @@ public class TagDto {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
 

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

@@ -38,7 +38,7 @@ public class UserDto {
 
   private @Nullable Integer userStatus;
 
-  public UserDto id(Long id) {
+  public UserDto id(@Nullable Long id) {
     this.id = id;
     return this;
   }
@@ -49,15 +49,15 @@ public class UserDto {
    */
   
   @JsonProperty("id")
-  public Long getId() {
+  public @Nullable Long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(@Nullable Long id) {
     this.id = id;
   }
 
-  public UserDto username(String username) {
+  public UserDto username(@Nullable String username) {
     this.username = username;
     return this;
   }
@@ -68,15 +68,15 @@ public class UserDto {
    */
   
   @JsonProperty("username")
-  public String getUsername() {
+  public @Nullable String getUsername() {
     return username;
   }
 
-  public void setUsername(String username) {
+  public void setUsername(@Nullable String username) {
     this.username = username;
   }
 
-  public UserDto firstName(String firstName) {
+  public UserDto firstName(@Nullable String firstName) {
     this.firstName = firstName;
     return this;
   }
@@ -87,15 +87,15 @@ public class UserDto {
    */
   
   @JsonProperty("firstName")
-  public String getFirstName() {
+  public @Nullable String getFirstName() {
     return firstName;
   }
 
-  public void setFirstName(String firstName) {
+  public void setFirstName(@Nullable String firstName) {
     this.firstName = firstName;
   }
 
-  public UserDto lastName(String lastName) {
+  public UserDto lastName(@Nullable String lastName) {
     this.lastName = lastName;
     return this;
   }
@@ -106,15 +106,15 @@ public class UserDto {
    */
   
   @JsonProperty("lastName")
-  public String getLastName() {
+  public @Nullable String getLastName() {
     return lastName;
   }
 
-  public void setLastName(String lastName) {
+  public void setLastName(@Nullable String lastName) {
     this.lastName = lastName;
   }
 
-  public UserDto email(String email) {
+  public UserDto email(@Nullable String email) {
     this.email = email;
     return this;
   }
@@ -125,15 +125,15 @@ public class UserDto {
    */
   
   @JsonProperty("email")
-  public String getEmail() {
+  public @Nullable String getEmail() {
     return email;
   }
 
-  public void setEmail(String email) {
+  public void setEmail(@Nullable String email) {
     this.email = email;
   }
 
-  public UserDto password(String password) {
+  public UserDto password(@Nullable String password) {
     this.password = password;
     return this;
   }
@@ -144,15 +144,15 @@ public class UserDto {
    */
   
   @JsonProperty("password")
-  public String getPassword() {
+  public @Nullable String getPassword() {
     return password;
   }
 
-  public void setPassword(String password) {
+  public void setPassword(@Nullable String password) {
     this.password = password;
   }
 
-  public UserDto phone(String phone) {
+  public UserDto phone(@Nullable String phone) {
     this.phone = phone;
     return this;
   }
@@ -163,15 +163,15 @@ public class UserDto {
    */
   
   @JsonProperty("phone")
-  public String getPhone() {
+  public @Nullable String getPhone() {
     return phone;
   }
 
-  public void setPhone(String phone) {
+  public void setPhone(@Nullable String phone) {
     this.phone = phone;
   }
 
-  public UserDto userStatus(Integer userStatus) {
+  public UserDto userStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
     return this;
   }
@@ -182,11 +182,11 @@ public class UserDto {
    */
   
   @JsonProperty("userStatus")
-  public Integer getUserStatus() {
+  public @Nullable Integer getUserStatus() {
     return userStatus;
   }
 
-  public void setUserStatus(Integer userStatus) {
+  public void setUserStatus(@Nullable Integer userStatus) {
     this.userStatus = userStatus;
   }
 

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

@@ -93,7 +93,7 @@ public class XmlItemDto {
   
   private List<Integer> prefixNsWrappedArray = new ArrayList<>();
 
-  public XmlItemDto attributeString(String attributeString) {
+  public XmlItemDto attributeString(@Nullable String attributeString) {
     this.attributeString = attributeString;
     return this;
   }
@@ -104,15 +104,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("attribute_string")
-  public String getAttributeString() {
+  public @Nullable String getAttributeString() {
     return attributeString;
   }
 
-  public void setAttributeString(String attributeString) {
+  public void setAttributeString(@Nullable String attributeString) {
     this.attributeString = attributeString;
   }
 
-  public XmlItemDto attributeNumber(BigDecimal attributeNumber) {
+  public XmlItemDto attributeNumber(@Nullable BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
     return this;
   }
@@ -123,15 +123,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("attribute_number")
-  public BigDecimal getAttributeNumber() {
+  public @Nullable BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
 
-  public void setAttributeNumber(BigDecimal attributeNumber) {
+  public void setAttributeNumber(@Nullable BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
   }
 
-  public XmlItemDto attributeInteger(Integer attributeInteger) {
+  public XmlItemDto attributeInteger(@Nullable Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
     return this;
   }
@@ -142,15 +142,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("attribute_integer")
-  public Integer getAttributeInteger() {
+  public @Nullable Integer getAttributeInteger() {
     return attributeInteger;
   }
 
-  public void setAttributeInteger(Integer attributeInteger) {
+  public void setAttributeInteger(@Nullable Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
   }
 
-  public XmlItemDto attributeBoolean(Boolean attributeBoolean) {
+  public XmlItemDto attributeBoolean(@Nullable Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
     return this;
   }
@@ -161,11 +161,11 @@ public class XmlItemDto {
    */
   
   @JsonProperty("attribute_boolean")
-  public Boolean getAttributeBoolean() {
+  public @Nullable Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
 
-  public void setAttributeBoolean(Boolean attributeBoolean) {
+  public void setAttributeBoolean(@Nullable Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
   }
 
@@ -196,7 +196,7 @@ public class XmlItemDto {
     this.wrappedArray = wrappedArray;
   }
 
-  public XmlItemDto nameString(String nameString) {
+  public XmlItemDto nameString(@Nullable String nameString) {
     this.nameString = nameString;
     return this;
   }
@@ -207,15 +207,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("name_string")
-  public String getNameString() {
+  public @Nullable String getNameString() {
     return nameString;
   }
 
-  public void setNameString(String nameString) {
+  public void setNameString(@Nullable String nameString) {
     this.nameString = nameString;
   }
 
-  public XmlItemDto nameNumber(BigDecimal nameNumber) {
+  public XmlItemDto nameNumber(@Nullable BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
     return this;
   }
@@ -226,15 +226,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("name_number")
-  public BigDecimal getNameNumber() {
+  public @Nullable BigDecimal getNameNumber() {
     return nameNumber;
   }
 
-  public void setNameNumber(BigDecimal nameNumber) {
+  public void setNameNumber(@Nullable BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
   }
 
-  public XmlItemDto nameInteger(Integer nameInteger) {
+  public XmlItemDto nameInteger(@Nullable Integer nameInteger) {
     this.nameInteger = nameInteger;
     return this;
   }
@@ -245,15 +245,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("name_integer")
-  public Integer getNameInteger() {
+  public @Nullable Integer getNameInteger() {
     return nameInteger;
   }
 
-  public void setNameInteger(Integer nameInteger) {
+  public void setNameInteger(@Nullable Integer nameInteger) {
     this.nameInteger = nameInteger;
   }
 
-  public XmlItemDto nameBoolean(Boolean nameBoolean) {
+  public XmlItemDto nameBoolean(@Nullable Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
     return this;
   }
@@ -264,11 +264,11 @@ public class XmlItemDto {
    */
   
   @JsonProperty("name_boolean")
-  public Boolean getNameBoolean() {
+  public @Nullable Boolean getNameBoolean() {
     return nameBoolean;
   }
 
-  public void setNameBoolean(Boolean nameBoolean) {
+  public void setNameBoolean(@Nullable Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
   }
 
@@ -326,7 +326,7 @@ public class XmlItemDto {
     this.nameWrappedArray = nameWrappedArray;
   }
 
-  public XmlItemDto prefixString(String prefixString) {
+  public XmlItemDto prefixString(@Nullable String prefixString) {
     this.prefixString = prefixString;
     return this;
   }
@@ -337,15 +337,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_string")
-  public String getPrefixString() {
+  public @Nullable String getPrefixString() {
     return prefixString;
   }
 
-  public void setPrefixString(String prefixString) {
+  public void setPrefixString(@Nullable String prefixString) {
     this.prefixString = prefixString;
   }
 
-  public XmlItemDto prefixNumber(BigDecimal prefixNumber) {
+  public XmlItemDto prefixNumber(@Nullable BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
     return this;
   }
@@ -356,15 +356,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_number")
-  public BigDecimal getPrefixNumber() {
+  public @Nullable BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
 
-  public void setPrefixNumber(BigDecimal prefixNumber) {
+  public void setPrefixNumber(@Nullable BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
   }
 
-  public XmlItemDto prefixInteger(Integer prefixInteger) {
+  public XmlItemDto prefixInteger(@Nullable Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
     return this;
   }
@@ -375,15 +375,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_integer")
-  public Integer getPrefixInteger() {
+  public @Nullable Integer getPrefixInteger() {
     return prefixInteger;
   }
 
-  public void setPrefixInteger(Integer prefixInteger) {
+  public void setPrefixInteger(@Nullable Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
   }
 
-  public XmlItemDto prefixBoolean(Boolean prefixBoolean) {
+  public XmlItemDto prefixBoolean(@Nullable Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
     return this;
   }
@@ -394,11 +394,11 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_boolean")
-  public Boolean getPrefixBoolean() {
+  public @Nullable Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
 
-  public void setPrefixBoolean(Boolean prefixBoolean) {
+  public void setPrefixBoolean(@Nullable Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
   }
 
@@ -456,7 +456,7 @@ public class XmlItemDto {
     this.prefixWrappedArray = prefixWrappedArray;
   }
 
-  public XmlItemDto namespaceString(String namespaceString) {
+  public XmlItemDto namespaceString(@Nullable String namespaceString) {
     this.namespaceString = namespaceString;
     return this;
   }
@@ -467,15 +467,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("namespace_string")
-  public String getNamespaceString() {
+  public @Nullable String getNamespaceString() {
     return namespaceString;
   }
 
-  public void setNamespaceString(String namespaceString) {
+  public void setNamespaceString(@Nullable String namespaceString) {
     this.namespaceString = namespaceString;
   }
 
-  public XmlItemDto namespaceNumber(BigDecimal namespaceNumber) {
+  public XmlItemDto namespaceNumber(@Nullable BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
     return this;
   }
@@ -486,15 +486,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("namespace_number")
-  public BigDecimal getNamespaceNumber() {
+  public @Nullable BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
 
-  public void setNamespaceNumber(BigDecimal namespaceNumber) {
+  public void setNamespaceNumber(@Nullable BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
   }
 
-  public XmlItemDto namespaceInteger(Integer namespaceInteger) {
+  public XmlItemDto namespaceInteger(@Nullable Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
     return this;
   }
@@ -505,15 +505,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("namespace_integer")
-  public Integer getNamespaceInteger() {
+  public @Nullable Integer getNamespaceInteger() {
     return namespaceInteger;
   }
 
-  public void setNamespaceInteger(Integer namespaceInteger) {
+  public void setNamespaceInteger(@Nullable Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
   }
 
-  public XmlItemDto namespaceBoolean(Boolean namespaceBoolean) {
+  public XmlItemDto namespaceBoolean(@Nullable Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
     return this;
   }
@@ -524,11 +524,11 @@ public class XmlItemDto {
    */
   
   @JsonProperty("namespace_boolean")
-  public Boolean getNamespaceBoolean() {
+  public @Nullable Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
 
-  public void setNamespaceBoolean(Boolean namespaceBoolean) {
+  public void setNamespaceBoolean(@Nullable Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
   }
 
@@ -586,7 +586,7 @@ public class XmlItemDto {
     this.namespaceWrappedArray = namespaceWrappedArray;
   }
 
-  public XmlItemDto prefixNsString(String prefixNsString) {
+  public XmlItemDto prefixNsString(@Nullable String prefixNsString) {
     this.prefixNsString = prefixNsString;
     return this;
   }
@@ -597,15 +597,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_ns_string")
-  public String getPrefixNsString() {
+  public @Nullable String getPrefixNsString() {
     return prefixNsString;
   }
 
-  public void setPrefixNsString(String prefixNsString) {
+  public void setPrefixNsString(@Nullable String prefixNsString) {
     this.prefixNsString = prefixNsString;
   }
 
-  public XmlItemDto prefixNsNumber(BigDecimal prefixNsNumber) {
+  public XmlItemDto prefixNsNumber(@Nullable BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
     return this;
   }
@@ -616,15 +616,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_ns_number")
-  public BigDecimal getPrefixNsNumber() {
+  public @Nullable BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
 
-  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
+  public void setPrefixNsNumber(@Nullable BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
   }
 
-  public XmlItemDto prefixNsInteger(Integer prefixNsInteger) {
+  public XmlItemDto prefixNsInteger(@Nullable Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
     return this;
   }
@@ -635,15 +635,15 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_ns_integer")
-  public Integer getPrefixNsInteger() {
+  public @Nullable Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
 
-  public void setPrefixNsInteger(Integer prefixNsInteger) {
+  public void setPrefixNsInteger(@Nullable Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
   }
 
-  public XmlItemDto prefixNsBoolean(Boolean prefixNsBoolean) {
+  public XmlItemDto prefixNsBoolean(@Nullable Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
     return this;
   }
@@ -654,11 +654,11 @@ public class XmlItemDto {
    */
   
   @JsonProperty("prefix_ns_boolean")
-  public Boolean getPrefixNsBoolean() {
+  public @Nullable Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
 
-  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
+  public void setPrefixNsBoolean(@Nullable Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
   }
 

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

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.Client;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -17,6 +17,7 @@ import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -256,12 +257,12 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<Void> testEnumParameters(
-         @RequestHeader(value = "enum_header_string_array", required = false) List<String> enumHeaderStringArray,
+         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
          @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-         @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,
+         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
          @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-         @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,
+         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-         @RequestParam(value = "enum_query_double", required = false) Double enumQueryDouble,
+         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
          @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
          @RequestPart(value = "enum_form_string", required = false) String enumFormString
     );
@@ -289,9 +290,9 @@ public interface FakeApi {
          @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
          @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
          @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-         @RequestParam(value = "string_group", required = false) Integer stringGroup,
+         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-         @RequestHeader(value = "boolean_group", required = false) Boolean booleanGroup,
+         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-         @RequestParam(value = "int64_group", required = false) Long int64Group
+         @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
     );
 
 

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

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.Client;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -10,6 +10,7 @@ import org.openapitools.model.Pet;
 import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import java.util.Set;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -64,7 +65,7 @@ public interface PetApi {
     )
     Mono<Void> deletePet(
          @PathVariable("petId") Long petId,
-         @RequestHeader(value = "api_key", required = false) String apiKey
+         @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
 

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

@@ -8,6 +8,7 @@ package org.openapitools.api;
 import java.util.Map;
 import org.openapitools.model.Order;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -8,6 +8,7 @@ package org.openapitools.api;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -26,7 +26,7 @@ public class AdditionalPropertiesAnyType {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesAnyType name(String name) {
+  public AdditionalPropertiesAnyType name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -37,11 +37,11 @@ public class AdditionalPropertiesAnyType {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**

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

@@ -27,7 +27,7 @@ public class AdditionalPropertiesArray {
 
   private @Nullable String name;
 
-  public AdditionalPropertiesArray name(String name) {
+  public AdditionalPropertiesArray name(@Nullable String name) {
     this.name = name;
     return this;
   }
@@ -38,11 +38,11 @@ public class AdditionalPropertiesArray {
    */
   
   @JsonProperty("name")
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public void setName(@Nullable String name) {
     this.name = name;
   }
     /**