Merge remote-tracking branch 'origin/master' into 6.0.x

samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES

@@ -43,6 +43,7 @@ src/main/java/org/openapitools/model/DogAllOf.java
 src/main/java/org/openapitools/model/EnumArrays.java
 src/main/java/org/openapitools/model/EnumClass.java
 src/main/java/org/openapitools/model/EnumTest.java
+src/main/java/org/openapitools/model/File.java
 src/main/java/org/openapitools/model/FileSchemaTestClass.java
 src/main/java/org/openapitools/model/FormatTest.java
 src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -50,6 +51,7 @@ src/main/java/org/openapitools/model/MapTest.java
 src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
 src/main/java/org/openapitools/model/Model200Response.java
 src/main/java/org/openapitools/model/ModelApiResponse.java
+src/main/java/org/openapitools/model/ModelList.java
 src/main/java/org/openapitools/model/ModelReturn.java
 src/main/java/org/openapitools/model/Name.java
 src/main/java/org/openapitools/model/NumberOnly.java

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -16,7 +16,9 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java

@@ -1,7 +1,6 @@
 package org.openapitools.api;
 
 import org.openapitools.model.Client;
-import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -13,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -20,14 +20,16 @@ import javax.validation.constraints.*;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
 
     private final NativeWebRequest request;
 
-    @org.springframework.beans.factory.annotation.Autowired
+    @Autowired
     public AnotherFakeApiController(NativeWebRequest request) {
         this.request = request;
     }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java

@@ -7,12 +7,14 @@ package org.openapitools.api;
 
 import java.math.BigDecimal;
 import org.openapitools.model.Client;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.openapitools.model.FileSchemaTestClass;
 import org.threeten.bp.LocalDate;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.threeten.bp.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.springframework.core.io.Resource;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -25,7 +27,9 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
@@ -295,8 +299,8 @@ public interface FakeApi {
         @ApiParam(value = "None") @Valid @RequestPart(value = "float", required = false) Float _float,
         @ApiParam(value = "None") @Valid @RequestPart(value = "string", required = false) String string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
         @ApiParam(value = "None") @Valid @RequestPart(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback
     );

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java

@@ -2,15 +2,16 @@ package org.openapitools.api;
 
 import java.math.BigDecimal;
 import org.openapitools.model.Client;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.openapitools.model.FileSchemaTestClass;
 import org.threeten.bp.LocalDate;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.threeten.bp.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.springframework.core.io.Resource;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
-import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -29,14 +31,16 @@ import javax.validation.constraints.*;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
 
     private final NativeWebRequest request;
 
-    @org.springframework.beans.factory.annotation.Autowired
+    @Autowired
     public FakeApiController(NativeWebRequest request) {
         this.request = request;
     }
@@ -209,8 +213,8 @@ public class FakeApiController implements FakeApi {
         @ApiParam(value = "None") @Valid @RequestPart(value = "float", required = false) Float _float,
         @ApiParam(value = "None") @Valid @RequestPart(value = "string", required = false) String string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
         @ApiParam(value = "None") @Valid @RequestPart(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback
     ) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -16,7 +16,9 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java

@@ -1,7 +1,6 @@
 package org.openapitools.api;
 
 import org.openapitools.model.Client;
-import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -13,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -20,14 +20,16 @@ import javax.validation.constraints.*;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
 
     private final NativeWebRequest request;
 
-    @org.springframework.beans.factory.annotation.Autowired
+    @Autowired
     public FakeClassnameTestApiController(NativeWebRequest request) {
         this.request = request;
     }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.springframework.core.io.Resource;
 import java.util.Set;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +19,9 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java

@@ -2,8 +2,8 @@ package org.openapitools.api;
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.springframework.core.io.Resource;
 import java.util.Set;
-import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,14 +23,16 @@ import javax.validation.constraints.*;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
 
     private final NativeWebRequest request;
 
-    @org.springframework.beans.factory.annotation.Autowired
+    @Autowired
     public PetApiController(NativeWebRequest request) {
         this.request = request;
     }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java

@@ -17,7 +17,9 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java

@@ -2,7 +2,6 @@ package org.openapitools.api;
 
 import java.util.Map;
 import org.openapitools.model.Order;
-import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -14,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -21,14 +21,16 @@ import javax.validation.constraints.*;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
 
     private final NativeWebRequest request;
 
-    @org.springframework.beans.factory.annotation.Autowired
+    @Autowired
     public StoreApiController(NativeWebRequest request) {
         this.request = request;
     }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java

@@ -18,7 +18,9 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java

@@ -3,7 +3,6 @@ package org.openapitools.api;
 import java.util.List;
 import org.threeten.bp.OffsetDateTime;
 import org.openapitools.model.User;
-import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -15,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,14 +22,16 @@ import javax.validation.constraints.*;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
 
     private final NativeWebRequest request;
 
-    @org.springframework.beans.factory.annotation.Autowired
+    @Autowired
     public UserApiController(NativeWebRequest request) {
         this.request = request;
     }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesAnyType
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -31,9 +34,8 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -42,7 +44,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesArray
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -32,9 +35,8 @@ public class AdditionalPropertiesArray extends HashMap<String, List>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -43,7 +45,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesBoolean
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -31,9 +34,8 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -42,7 +44,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -15,12 +15,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
+
   @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = null;
@@ -79,9 +82,8 @@ public class AdditionalPropertiesClass   {
    * Get mapString
    * @return mapString
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -107,10 +109,8 @@ public class AdditionalPropertiesClass   {
    * Get mapNumber
    * @return mapNumber
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -136,9 +136,8 @@ public class AdditionalPropertiesClass   {
    * Get mapInteger
    * @return mapInteger
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -164,9 +163,8 @@ public class AdditionalPropertiesClass   {
    * Get mapBoolean
    * @return mapBoolean
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -192,10 +190,8 @@ public class AdditionalPropertiesClass   {
    * Get mapArrayInteger
    * @return mapArrayInteger
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -221,10 +217,8 @@ public class AdditionalPropertiesClass   {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -250,10 +244,8 @@ public class AdditionalPropertiesClass   {
    * Get mapMapString
    * @return mapMapString
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -279,10 +271,8 @@ public class AdditionalPropertiesClass   {
    * Get mapMapAnytype
    * @return mapMapAnytype
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -300,9 +290,8 @@ public class AdditionalPropertiesClass   {
    * Get anytype1
    * @return anytype1
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Object getAnytype1() {
     return anytype1;
   }
@@ -320,9 +309,8 @@ public class AdditionalPropertiesClass   {
    * Get anytype2
    * @return anytype2
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Object getAnytype2() {
     return anytype2;
   }
@@ -340,9 +328,8 @@ public class AdditionalPropertiesClass   {
    * Get anytype3
    * @return anytype3
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Object getAnytype3() {
     return anytype3;
   }
@@ -351,7 +338,6 @@ public class AdditionalPropertiesClass   {
     this.anytype3 = anytype3;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -383,7 +369,6 @@ public class AdditionalPropertiesClass   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesClass {\n");
-    
     sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
     sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
     sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesInteger
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -31,9 +34,8 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -42,7 +44,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesNumber
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -32,9 +35,8 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -43,7 +45,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesObject
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -31,9 +34,8 @@ public class AdditionalPropertiesObject extends HashMap<String, Map>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -42,7 +44,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * AdditionalPropertiesString
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
+
   @JsonProperty("name")
   private String name;
 
@@ -31,9 +34,8 @@ public class AdditionalPropertiesString extends HashMap<String, String>  {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -42,7 +44,6 @@ public class AdditionalPropertiesString extends HashMap<String, String>  {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java

@@ -13,19 +13,21 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
 })
-
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal   {
+
   @JsonProperty("className")
   private String className;
 
@@ -41,10 +43,8 @@ public class Animal   {
    * Get className
    * @return className
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public String getClassName() {
     return className;
   }
@@ -62,9 +62,8 @@ public class Animal   {
    * Get color
    * @return color
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getColor() {
     return color;
   }
@@ -73,7 +72,6 @@ public class Animal   {
     this.color = color;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -96,7 +94,6 @@ public class Animal   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Animal {\n");
-    
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
     sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * ArrayOfArrayOfNumberOnly
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
+
   @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber = null;
@@ -41,10 +44,8 @@ public class ArrayOfArrayOfNumberOnly   {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
@@ -53,7 +54,6 @@ public class ArrayOfArrayOfNumberOnly   {
     this.arrayArrayNumber = arrayArrayNumber;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -75,7 +75,6 @@ public class ArrayOfArrayOfNumberOnly   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ArrayOfArrayOfNumberOnly {\n");
-    
     sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * ArrayOfNumberOnly
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
+
   @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber = null;
@@ -41,10 +44,8 @@ public class ArrayOfNumberOnly   {
    * Get arrayNumber
    * @return arrayNumber
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
@@ -53,7 +54,6 @@ public class ArrayOfNumberOnly   {
     this.arrayNumber = arrayNumber;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -75,7 +75,6 @@ public class ArrayOfNumberOnly   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ArrayOfNumberOnly {\n");
-    
     sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
+
   @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString = null;
@@ -49,9 +52,8 @@ public class ArrayTest   {
    * Get arrayOfString
    * @return arrayOfString
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -77,10 +79,8 @@ public class ArrayTest   {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -106,10 +106,8 @@ public class ArrayTest   {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
@@ -118,7 +116,6 @@ public class ArrayTest   {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -142,7 +139,6 @@ public class ArrayTest   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ArrayTest {\n");
-    
     sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
     sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
     sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * BigCat
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
+
   /**
    * Gets or Sets kind
    */
@@ -71,9 +74,8 @@ public class BigCat extends Cat  {
    * Get kind
    * @return kind
   */
+  
   @ApiModelProperty(value = "")
-
-
   public KindEnum getKind() {
     return kind;
   }
@@ -82,7 +84,6 @@ public class BigCat extends Cat  {
     this.kind = kind;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java

@@ -12,12 +12,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * BigCatAllOf
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
+
   /**
    * Gets or Sets kind
    */
@@ -69,9 +72,8 @@ public class BigCatAllOf   {
    * Get kind
    * @return kind
   */
+  
   @ApiModelProperty(value = "")
-
-
   public KindEnum getKind() {
     return kind;
   }
@@ -80,7 +82,6 @@ public class BigCatAllOf   {
     this.kind = kind;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -102,7 +103,6 @@ public class BigCatAllOf   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class BigCatAllOf {\n");
-    
     sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Capitalization
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
+
   @JsonProperty("smallCamel")
   private String smallCamel;
 
@@ -44,9 +47,8 @@ public class Capitalization   {
    * Get smallCamel
    * @return smallCamel
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -64,9 +66,8 @@ public class Capitalization   {
    * Get capitalCamel
    * @return capitalCamel
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -84,9 +85,8 @@ public class Capitalization   {
    * Get smallSnake
    * @return smallSnake
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -104,9 +104,8 @@ public class Capitalization   {
    * Get capitalSnake
    * @return capitalSnake
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -124,9 +123,8 @@ public class Capitalization   {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -144,9 +142,8 @@ public class Capitalization   {
    * Name of the pet 
    * @return ATT_NAME
   */
+  
   @ApiModelProperty(value = "Name of the pet ")
-
-
   public String getATTNAME() {
     return ATT_NAME;
   }
@@ -155,7 +152,6 @@ public class Capitalization   {
     this.ATT_NAME = ATT_NAME;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -182,7 +178,6 @@ public class Capitalization   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Capitalization {\n");
-    
     sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
     sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
     sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
+
   @JsonProperty("declawed")
   private Boolean declawed;
 
@@ -31,9 +34,8 @@ public class Cat extends Animal  {
    * Get declawed
    * @return declawed
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Boolean getDeclawed() {
     return declawed;
   }
@@ -42,7 +44,6 @@ public class Cat extends Animal  {
     this.declawed = declawed;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * CatAllOf
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
+
   @JsonProperty("declawed")
   private Boolean declawed;
 
@@ -29,9 +32,8 @@ public class CatAllOf   {
    * Get declawed
    * @return declawed
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Boolean getDeclawed() {
     return declawed;
   }
@@ -40,7 +42,6 @@ public class CatAllOf   {
     this.declawed = declawed;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62,7 +63,6 @@ public class CatAllOf   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class CatAllOf {\n");
-    
     sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Category
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
+
   @JsonProperty("id")
   private Long id;
 
@@ -32,9 +35,8 @@ public class Category   {
    * Get id
    * @return id
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getId() {
     return id;
   }
@@ -52,10 +54,8 @@ public class Category   {
    * Get name
    * @return name
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public String getName() {
     return name;
   }
@@ -64,7 +64,6 @@ public class Category   {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -87,7 +86,6 @@ public class Category   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Category {\n");
-    
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java

@@ -11,13 +11,16 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Model for testing model with \"_class\" property
  */
+
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
+
   @JsonProperty("_class")
   private String propertyClass;
 
@@ -30,9 +33,8 @@ public class ClassModel   {
    * Get propertyClass
    * @return propertyClass
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getPropertyClass() {
     return propertyClass;
   }
@@ -41,7 +43,6 @@ public class ClassModel   {
     this.propertyClass = propertyClass;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -63,7 +64,6 @@ public class ClassModel   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ClassModel {\n");
-    
     sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Client
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
+
   @JsonProperty("client")
   private String client;
 
@@ -29,9 +32,8 @@ public class Client   {
    * Get client
    * @return client
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getClient() {
     return client;
   }
@@ -40,7 +42,6 @@ public class Client   {
     this.client = client;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62,7 +63,6 @@ public class Client   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Client {\n");
-    
     sb.append("    client: ").append(toIndentedString(client)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
+
   @JsonProperty("breed")
   private String breed;
 
@@ -31,9 +34,8 @@ public class Dog extends Animal  {
    * Get breed
    * @return breed
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getBreed() {
     return breed;
   }
@@ -42,7 +44,6 @@ public class Dog extends Animal  {
     this.breed = breed;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * DogAllOf
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
+
   @JsonProperty("breed")
   private String breed;
 
@@ -29,9 +32,8 @@ public class DogAllOf   {
    * Get breed
    * @return breed
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getBreed() {
     return breed;
   }
@@ -40,7 +42,6 @@ public class DogAllOf   {
     this.breed = breed;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62,7 +63,6 @@ public class DogAllOf   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class DogAllOf {\n");
-    
     sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * EnumArrays
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
+
   /**
    * Gets or Sets justSymbol
    */
@@ -106,9 +109,8 @@ public class EnumArrays   {
    * Get justSymbol
    * @return justSymbol
   */
+  
   @ApiModelProperty(value = "")
-
-
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -134,9 +136,8 @@ public class EnumArrays   {
    * Get arrayEnum
    * @return arrayEnum
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
@@ -145,7 +146,6 @@ public class EnumArrays   {
     this.arrayEnum = arrayEnum;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -168,7 +168,6 @@ public class EnumArrays   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class EnumArrays {\n");
-    
     sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
     sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumClass.java

@@ -8,6 +8,7 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -15,6 +16,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 /**
  * Gets or Sets EnumClass
  */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public enum EnumClass {
   
   _ABC("_abc"),

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java

@@ -13,12 +13,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
+
   /**
    * Gets or Sets enumString
    */
@@ -187,9 +190,8 @@ public class EnumTest   {
    * Get enumString
    * @return enumString
   */
+  
   @ApiModelProperty(value = "")
-
-
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -207,10 +209,8 @@ public class EnumTest   {
    * Get enumStringRequired
    * @return enumStringRequired
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -228,9 +228,8 @@ public class EnumTest   {
    * Get enumInteger
    * @return enumInteger
   */
+  
   @ApiModelProperty(value = "")
-
-
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -248,9 +247,8 @@ public class EnumTest   {
    * Get enumNumber
    * @return enumNumber
   */
+  
   @ApiModelProperty(value = "")
-
-
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -268,10 +266,8 @@ public class EnumTest   {
    * Get outerEnum
    * @return outerEnum
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
@@ -280,7 +276,6 @@ public class EnumTest   {
     this.outerEnum = outerEnum;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -306,7 +301,6 @@ public class EnumTest   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class EnumTest {\n");
-    
     sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
     sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
     sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java

@@ -0,0 +1,83 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Must be named `File` for test.
+ */
+
+@ApiModel(description = "Must be named `File` for test.")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class File   {
+
+  @JsonProperty("sourceURI")
+  private String sourceURI;
+
+  public File sourceURI(String sourceURI) {
+    this.sourceURI = sourceURI;
+    return this;
+  }
+
+  /**
+   * Test capitalization
+   * @return sourceURI
+  */
+  
+  @ApiModelProperty(value = "Test capitalization")
+  public String getSourceURI() {
+    return sourceURI;
+  }
+
+  public void setSourceURI(String sourceURI) {
+    this.sourceURI = sourceURI;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    File file = (File) o;
+    return Objects.equals(this.sourceURI, file.sourceURI);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(sourceURI);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class File {\n");
+    sb.append("    sourceURI: ").append(toIndentedString(sourceURI)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.Valid;
@@ -13,20 +14,23 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * FileSchemaTestClass
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
+
   @JsonProperty("file")
-  private java.io.File file;
+  private File file;
 
   @JsonProperty("files")
   @Valid
-  private List<java.io.File> files = null;
+  private List<File> files = null;
 
-  public FileSchemaTestClass file(java.io.File file) {
+  public FileSchemaTestClass file(File file) {
     this.file = file;
     return this;
   }
@@ -35,26 +39,24 @@ public class FileSchemaTestClass   {
    * Get file
    * @return file
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
-  public java.io.File getFile() {
+  public File getFile() {
     return file;
   }
 
-  public void setFile(java.io.File file) {
+  public void setFile(File file) {
     this.file = file;
   }
 
-  public FileSchemaTestClass files(List<java.io.File> files) {
+  public FileSchemaTestClass files(List<File> files) {
     this.files = files;
     return this;
   }
 
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+  public FileSchemaTestClass addFilesItem(File filesItem) {
     if (this.files == null) {
-      this.files = new ArrayList<java.io.File>();
+      this.files = new ArrayList<File>();
     }
     this.files.add(filesItem);
     return this;
@@ -64,19 +66,16 @@ public class FileSchemaTestClass   {
    * Get files
    * @return files
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
-  public List<java.io.File> getFiles() {
+  public List<File> getFiles() {
     return files;
   }
 
-  public void setFiles(List<java.io.File> files) {
+  public void setFiles(List<File> files) {
     this.files = files;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -99,7 +98,6 @@ public class FileSchemaTestClass   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FileSchemaTestClass {\n");
-    
     sb.append("    file: ").append(toIndentedString(file)).append("\n");
     sb.append("    files: ").append(toIndentedString(files)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.UUID;
+import org.springframework.core.io.Resource;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import javax.validation.Valid;
@@ -16,12 +18,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
+
   @JsonProperty("integer")
   private Integer integer;
 
@@ -47,14 +52,14 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private Resource binary;
 
   @JsonProperty("date")
-  @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
   @JsonProperty("dateTime")
-  @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME)
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
   @JsonProperty("uuid")
@@ -77,9 +82,8 @@ public class FormatTest   {
    * maximum: 100
    * @return integer
   */
+  @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
-
-@Min(10) @Max(100) 
   public Integer getInteger() {
     return integer;
   }
@@ -99,9 +103,8 @@ public class FormatTest   {
    * maximum: 200
    * @return int32
   */
+  @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
-
-@Min(20) @Max(200) 
   public Integer getInt32() {
     return int32;
   }
@@ -119,9 +122,8 @@ public class FormatTest   {
    * Get int64
    * @return int64
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getInt64() {
     return int64;
   }
@@ -141,11 +143,8 @@ public class FormatTest   {
    * maximum: 543.2
    * @return number
   */
+  @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-  @Valid
-@DecimalMin("32.1") @DecimalMax("543.2") 
   public BigDecimal getNumber() {
     return number;
   }
@@ -165,9 +164,8 @@ public class FormatTest   {
    * maximum: 987.6
    * @return _float
   */
+  @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
-
-@DecimalMin("54.3") @DecimalMax("987.6") 
   public Float getFloat() {
     return _float;
   }
@@ -187,9 +185,8 @@ public class FormatTest   {
    * maximum: 123.4
    * @return _double
   */
+  @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
-
-@DecimalMin("67.8") @DecimalMax("123.4") 
   public Double getDouble() {
     return _double;
   }
@@ -207,9 +204,8 @@ public class FormatTest   {
    * Get string
    * @return string
   */
+  @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
-
-@Pattern(regexp = "/[a-z]/i") 
   public String getString() {
     return string;
   }
@@ -227,10 +223,8 @@ public class FormatTest   {
    * Get _byte
    * @return _byte
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public byte[] getByte() {
     return _byte;
   }
@@ -239,7 +233,7 @@ public class FormatTest   {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(Resource binary) {
     this.binary = binary;
     return this;
   }
@@ -248,15 +242,13 @@ public class FormatTest   {
    * Get binary
    * @return binary
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
-  public org.springframework.core.io.Resource getBinary() {
+  public Resource getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(Resource binary) {
     this.binary = binary;
   }
 
@@ -269,11 +261,8 @@ public class FormatTest   {
    * Get date
    * @return date
   */
+  @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-  @Valid
-
   public LocalDate getDate() {
     return date;
   }
@@ -291,10 +280,8 @@ public class FormatTest   {
    * Get dateTime
    * @return dateTime
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -312,10 +299,8 @@ public class FormatTest   {
    * Get uuid
    * @return uuid
   */
+  @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-
-  @Valid
-
   public UUID getUuid() {
     return uuid;
   }
@@ -333,10 +318,8 @@ public class FormatTest   {
    * Get password
    * @return password
   */
+  @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-@Size(min = 10, max = 64) 
   public String getPassword() {
     return password;
   }
@@ -354,10 +337,8 @@ public class FormatTest   {
    * Get bigDecimal
    * @return bigDecimal
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
@@ -366,7 +347,6 @@ public class FormatTest   {
     this.bigDecimal = bigDecimal;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -401,7 +381,6 @@ public class FormatTest   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    
     sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * HasOnlyReadOnly
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
+
   @JsonProperty("bar")
   private String bar;
 
@@ -32,9 +35,8 @@ public class HasOnlyReadOnly   {
    * Get bar
    * @return bar
   */
+  
   @ApiModelProperty(readOnly = true, value = "")
-
-
   public String getBar() {
     return bar;
   }
@@ -52,9 +54,8 @@ public class HasOnlyReadOnly   {
    * Get foo
    * @return foo
   */
+  
   @ApiModelProperty(readOnly = true, value = "")
-
-
   public String getFoo() {
     return foo;
   }
@@ -63,7 +64,6 @@ public class HasOnlyReadOnly   {
     this.foo = foo;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -86,7 +86,6 @@ public class HasOnlyReadOnly   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class HasOnlyReadOnly {\n");
-    
     sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
     sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java

@@ -15,12 +15,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * MapTest
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
+
   @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = null;
@@ -89,10 +92,8 @@ public class MapTest   {
    * Get mapMapOfString
    * @return mapMapOfString
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -118,9 +119,8 @@ public class MapTest   {
    * Get mapOfEnumString
    * @return mapOfEnumString
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -146,9 +146,8 @@ public class MapTest   {
    * Get directMap
    * @return directMap
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -174,9 +173,8 @@ public class MapTest   {
    * Get indirectMap
    * @return indirectMap
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
@@ -185,7 +183,6 @@ public class MapTest   {
     this.indirectMap = indirectMap;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -210,7 +207,6 @@ public class MapTest   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MapTest {\n");
-    
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
     sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -11,23 +11,27 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.openapitools.model.Animal;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.threeten.bp.OffsetDateTime;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
+
   @JsonProperty("uuid")
   private UUID uuid;
 
   @JsonProperty("dateTime")
-  @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME)
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
   @JsonProperty("map")
@@ -43,10 +47,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * Get uuid
    * @return uuid
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public UUID getUuid() {
     return uuid;
   }
@@ -64,10 +66,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * Get dateTime
    * @return dateTime
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -93,10 +93,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * Get map
    * @return map
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Map<String, Animal> getMap() {
     return map;
   }
@@ -105,7 +103,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     this.map = map;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -129,7 +126,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    
     sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
     sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
     sb.append("    map: ").append(toIndentedString(map)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java

@@ -11,13 +11,16 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Model for testing model name starting with number
  */
+
 @ApiModel(description = "Model for testing model name starting with number")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
+
   @JsonProperty("name")
   private Integer name;
 
@@ -33,9 +36,8 @@ public class Model200Response   {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Integer getName() {
     return name;
   }
@@ -53,9 +55,8 @@ public class Model200Response   {
    * Get propertyClass
    * @return propertyClass
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getPropertyClass() {
     return propertyClass;
   }
@@ -64,7 +65,6 @@ public class Model200Response   {
     this.propertyClass = propertyClass;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -87,7 +87,6 @@ public class Model200Response   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Model200Response {\n");
-    
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
+
   @JsonProperty("code")
   private Integer code;
 
@@ -35,9 +38,8 @@ public class ModelApiResponse   {
    * Get code
    * @return code
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Integer getCode() {
     return code;
   }
@@ -55,9 +57,8 @@ public class ModelApiResponse   {
    * Get type
    * @return type
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getType() {
     return type;
   }
@@ -75,9 +76,8 @@ public class ModelApiResponse   {
    * Get message
    * @return message
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getMessage() {
     return message;
   }
@@ -86,7 +86,6 @@ public class ModelApiResponse   {
     this.message = message;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -110,7 +109,6 @@ public class ModelApiResponse   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ModelApiResponse {\n");
-    
     sb.append("    code: ").append(toIndentedString(code)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    message: ").append(toIndentedString(message)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelFile.java

@@ -0,0 +1,83 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+
+/**
+ * Must be named `File` for test.
+ */
+@ApiModel(description = "Must be named `File` for test.")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ModelFile   {
+  @JsonProperty("sourceURI")
+  private String sourceURI;
+
+  public ModelFile sourceURI(String sourceURI) {
+    this.sourceURI = sourceURI;
+    return this;
+  }
+
+  /**
+   * Test capitalization
+   * @return sourceURI
+  */
+  @ApiModelProperty(value = "Test capitalization")
+
+
+  public String getSourceURI() {
+    return sourceURI;
+  }
+
+  public void setSourceURI(String sourceURI) {
+    this.sourceURI = sourceURI;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelFile _file = (ModelFile) o;
+    return Objects.equals(this.sourceURI, _file.sourceURI);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(sourceURI);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelFile {\n");
+    
+    sb.append("    sourceURI: ").append(toIndentedString(sourceURI)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java

@@ -0,0 +1,82 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ModelList
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ModelList   {
+
+  @JsonProperty("123-list")
+  private String _123list;
+
+  public ModelList _123list(String _123list) {
+    this._123list = _123list;
+    return this;
+  }
+
+  /**
+   * Get _123list
+   * @return _123list
+  */
+  
+  @ApiModelProperty(value = "")
+  public String get123list() {
+    return _123list;
+  }
+
+  public void set123list(String _123list) {
+    this._123list = _123list;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelList _list = (ModelList) o;
+    return Objects.equals(this._123list, _list._123list);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_123list);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelList {\n");
+    sb.append("    _123list: ").append(toIndentedString(_123list)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java

@@ -11,13 +11,16 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Model for testing reserved words
  */
+
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
+
   @JsonProperty("return")
   private Integer _return;
 
@@ -30,9 +33,8 @@ public class ModelReturn   {
    * Get _return
    * @return _return
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Integer getReturn() {
     return _return;
   }
@@ -41,7 +43,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -63,7 +64,6 @@ public class ModelReturn   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ModelReturn {\n");
-    
     sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java

@@ -11,13 +11,16 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Model for testing model name same as property name
  */
+
 @ApiModel(description = "Model for testing model name same as property name")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
+
   @JsonProperty("name")
   private Integer name;
 
@@ -39,10 +42,8 @@ public class Name   {
    * Get name
    * @return name
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public Integer getName() {
     return name;
   }
@@ -60,9 +61,8 @@ public class Name   {
    * Get snakeCase
    * @return snakeCase
   */
+  
   @ApiModelProperty(readOnly = true, value = "")
-
-
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -80,9 +80,8 @@ public class Name   {
    * Get property
    * @return property
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getProperty() {
     return property;
   }
@@ -100,9 +99,8 @@ public class Name   {
    * Get _123number
    * @return _123number
   */
+  
   @ApiModelProperty(readOnly = true, value = "")
-
-
   public Integer get123number() {
     return _123number;
   }
@@ -111,7 +109,6 @@ public class Name   {
     this._123number = _123number;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -136,7 +133,6 @@ public class Name   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Name {\n");
-    
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("    property: ").append(toIndentedString(property)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java

@@ -12,12 +12,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * NumberOnly
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
+
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
@@ -30,10 +33,8 @@ public class NumberOnly   {
    * Get justNumber
    * @return justNumber
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public BigDecimal getJustNumber() {
     return justNumber;
   }
@@ -42,7 +43,6 @@ public class NumberOnly   {
     this.justNumber = justNumber;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -64,7 +64,6 @@ public class NumberOnly   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class NumberOnly {\n");
-    
     sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java

@@ -7,18 +7,22 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.threeten.bp.OffsetDateTime;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Order
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
+
   @JsonProperty("id")
   private Long id;
 
@@ -29,7 +33,7 @@ public class Order   {
   private Integer quantity;
 
   @JsonProperty("shipDate")
-  @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME)
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
   /**
@@ -84,9 +88,8 @@ public class Order   {
    * Get id
    * @return id
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getId() {
     return id;
   }
@@ -104,9 +107,8 @@ public class Order   {
    * Get petId
    * @return petId
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getPetId() {
     return petId;
   }
@@ -124,9 +126,8 @@ public class Order   {
    * Get quantity
    * @return quantity
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Integer getQuantity() {
     return quantity;
   }
@@ -144,10 +145,8 @@ public class Order   {
    * Get shipDate
    * @return shipDate
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -165,9 +164,8 @@ public class Order   {
    * Order Status
    * @return status
   */
+  
   @ApiModelProperty(value = "Order Status")
-
-
   public StatusEnum getStatus() {
     return status;
   }
@@ -185,9 +183,8 @@ public class Order   {
    * Get complete
    * @return complete
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Boolean getComplete() {
     return complete;
   }
@@ -196,7 +193,6 @@ public class Order   {
     this.complete = complete;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -223,7 +219,6 @@ public class Order   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Order {\n");
-    
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
     sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java

@@ -12,12 +12,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * OuterComposite
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
+
   @JsonProperty("my_number")
   private BigDecimal myNumber;
 
@@ -36,10 +39,8 @@ public class OuterComposite   {
    * Get myNumber
    * @return myNumber
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -57,9 +58,8 @@ public class OuterComposite   {
    * Get myString
    * @return myString
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getMyString() {
     return myString;
   }
@@ -77,9 +77,8 @@ public class OuterComposite   {
    * Get myBoolean
    * @return myBoolean
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Boolean getMyBoolean() {
     return myBoolean;
   }
@@ -88,7 +87,6 @@ public class OuterComposite   {
     this.myBoolean = myBoolean;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -112,7 +110,6 @@ public class OuterComposite   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class OuterComposite {\n");
-    
     sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
     sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
     sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterEnum.java

@@ -8,6 +8,7 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -15,6 +16,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 /**
  * Gets or Sets OuterEnum
  */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public enum OuterEnum {
   
   PLACED("placed"),

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java

@@ -19,12 +19,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
+
   @JsonProperty("id")
   private Long id;
 
@@ -91,9 +94,8 @@ public class Pet   {
    * Get id
    * @return id
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getId() {
     return id;
   }
@@ -111,10 +113,8 @@ public class Pet   {
    * Get category
    * @return category
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public Category getCategory() {
     return category;
   }
@@ -132,10 +132,8 @@ public class Pet   {
    * Get name
    * @return name
   */
+  @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
-  @NotNull
-
-
   public String getName() {
     return name;
   }
@@ -161,10 +159,8 @@ public class Pet   {
    * Get photoUrls
    * @return photoUrls
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -191,10 +187,8 @@ public class Pet   {
    * Get tags
    * @return tags
   */
+  @Valid 
   @ApiModelProperty(value = "")
-
-  @Valid
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -212,9 +206,8 @@ public class Pet   {
    * pet status in the store
    * @return status
   */
+  
   @ApiModelProperty(value = "pet status in the store")
-
-
   public StatusEnum getStatus() {
     return status;
   }
@@ -223,7 +216,6 @@ public class Pet   {
     this.status = status;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -250,7 +242,6 @@ public class Pet   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Pet {\n");
-    
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
+
   @JsonProperty("bar")
   private String bar;
 
@@ -32,9 +35,8 @@ public class ReadOnlyFirst   {
    * Get bar
    * @return bar
   */
+  
   @ApiModelProperty(readOnly = true, value = "")
-
-
   public String getBar() {
     return bar;
   }
@@ -52,9 +54,8 @@ public class ReadOnlyFirst   {
    * Get baz
    * @return baz
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getBaz() {
     return baz;
   }
@@ -63,7 +64,6 @@ public class ReadOnlyFirst   {
     this.baz = baz;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -86,7 +86,6 @@ public class ReadOnlyFirst   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ReadOnlyFirst {\n");
-    
     sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
     sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
+
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
@@ -29,9 +32,8 @@ public class SpecialModelName   {
    * Get $specialPropertyName
    * @return $specialPropertyName
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
@@ -40,7 +42,6 @@ public class SpecialModelName   {
     this.$specialPropertyName = $specialPropertyName;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62,7 +63,6 @@ public class SpecialModelName   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class SpecialModelName {\n");
-    
     sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
+
   @JsonProperty("id")
   private Long id;
 
@@ -32,9 +35,8 @@ public class Tag   {
    * Get id
    * @return id
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getId() {
     return id;
   }
@@ -52,9 +54,8 @@ public class Tag   {
    * Get name
    * @return name
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getName() {
     return name;
   }
@@ -63,7 +64,6 @@ public class Tag   {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -86,7 +86,6 @@ public class Tag   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Tag {\n");
-    
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("}");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * TypeHolderDefault
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
+
   @JsonProperty("string_item")
   private String stringItem = "what";
 
@@ -45,10 +48,8 @@ public class TypeHolderDefault   {
    * Get stringItem
    * @return stringItem
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public String getStringItem() {
     return stringItem;
   }
@@ -66,11 +67,8 @@ public class TypeHolderDefault   {
    * Get numberItem
    * @return numberItem
   */
+  @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-  @Valid
-
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -88,10 +86,8 @@ public class TypeHolderDefault   {
    * Get integerItem
    * @return integerItem
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -109,10 +105,8 @@ public class TypeHolderDefault   {
    * Get boolItem
    * @return boolItem
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -138,10 +132,8 @@ public class TypeHolderDefault   {
    * Get arrayItem
    * @return arrayItem
   */
+  @NotNull 
   @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
@@ -150,7 +142,6 @@ public class TypeHolderDefault   {
     this.arrayItem = arrayItem;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -176,7 +167,6 @@ public class TypeHolderDefault   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class TypeHolderDefault {\n");
-    
     sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
     sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
     sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * TypeHolderExample
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
+
   @JsonProperty("string_item")
   private String stringItem;
 
@@ -48,10 +51,8 @@ public class TypeHolderExample   {
    * Get stringItem
    * @return stringItem
   */
+  @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
-  @NotNull
-
-
   public String getStringItem() {
     return stringItem;
   }
@@ -69,11 +70,8 @@ public class TypeHolderExample   {
    * Get numberItem
    * @return numberItem
   */
+  @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
-  @NotNull
-
-  @Valid
-
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -91,10 +89,8 @@ public class TypeHolderExample   {
    * Get floatItem
    * @return floatItem
   */
+  @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
-  @NotNull
-
-
   public Float getFloatItem() {
     return floatItem;
   }
@@ -112,10 +108,8 @@ public class TypeHolderExample   {
    * Get integerItem
    * @return integerItem
   */
+  @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
-  @NotNull
-
-
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -133,10 +127,8 @@ public class TypeHolderExample   {
    * Get boolItem
    * @return boolItem
   */
+  @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
-  @NotNull
-
-
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -162,10 +154,8 @@ public class TypeHolderExample   {
    * Get arrayItem
    * @return arrayItem
   */
+  @NotNull 
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
-  @NotNull
-
-
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
@@ -174,7 +164,6 @@ public class TypeHolderExample   {
     this.arrayItem = arrayItem;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -201,7 +190,6 @@ public class TypeHolderExample   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class TypeHolderExample {\n");
-    
     sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
     sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
     sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java

@@ -11,12 +11,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * User
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
+
   @JsonProperty("id")
   private Long id;
 
@@ -50,9 +53,8 @@ public class User   {
    * Get id
    * @return id
   */
+  
   @ApiModelProperty(value = "")
-
-
   public Long getId() {
     return id;
   }
@@ -70,9 +72,8 @@ public class User   {
    * Get username
    * @return username
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getUsername() {
     return username;
   }
@@ -90,9 +91,8 @@ public class User   {
    * Get firstName
    * @return firstName
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getFirstName() {
     return firstName;
   }
@@ -110,9 +110,8 @@ public class User   {
    * Get lastName
    * @return lastName
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getLastName() {
     return lastName;
   }
@@ -130,9 +129,8 @@ public class User   {
    * Get email
    * @return email
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getEmail() {
     return email;
   }
@@ -150,9 +148,8 @@ public class User   {
    * Get password
    * @return password
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getPassword() {
     return password;
   }
@@ -170,9 +167,8 @@ public class User   {
    * Get phone
    * @return phone
   */
+  
   @ApiModelProperty(value = "")
-
-
   public String getPhone() {
     return phone;
   }
@@ -190,9 +186,8 @@ public class User   {
    * User Status
    * @return userStatus
   */
+  
   @ApiModelProperty(value = "User Status")
-
-
   public Integer getUserStatus() {
     return userStatus;
   }
@@ -201,7 +196,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -230,7 +224,6 @@ public class User   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class User {\n");
-    
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    username: ").append(toIndentedString(username)).append("\n");
     sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java

@@ -14,12 +14,15 @@ import javax.validation.constraints.*;
 
 
 import java.util.*;
+import javax.annotation.Generated;
 
 /**
  * XmlItem
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
+
   @JsonProperty("attribute_string")
   private String attributeString;
 
@@ -125,9 +128,8 @@ public class XmlItem   {
    * Get attributeString
    * @return attributeString
   */
+  
   @ApiModelProperty(example = "string", value = "")
-
-
   public String getAttributeString() {
     return attributeString;
   }
@@ -145,10 +147,8 @@ public class XmlItem   {
    * Get attributeNumber
    * @return attributeNumber
   */
+  @Valid 
   @ApiModelProperty(example = "1.234", value = "")
-
-  @Valid
-
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -166,9 +166,8 @@ public class XmlItem   {
    * Get attributeInteger
    * @return attributeInteger
   */
+  
   @ApiModelProperty(example = "-2", value = "")
-
-
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -186,9 +185,8 @@ public class XmlItem   {
    * Get attributeBoolean
    * @return attributeBoolean
   */
+  
   @ApiModelProperty(example = "true", value = "")
-
-
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -214,9 +212,8 @@ public class XmlItem   {
    * Get wrappedArray
    * @return wrappedArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,9 +231,8 @@ public class XmlItem   {
    * Get nameString
    * @return nameString
   */
+  
   @ApiModelProperty(example = "string", value = "")
-
-
   public String getNameString() {
     return nameString;
   }
@@ -254,10 +250,8 @@ public class XmlItem   {
    * Get nameNumber
    * @return nameNumber
   */
+  @Valid 
   @ApiModelProperty(example = "1.234", value = "")
-
-  @Valid
-
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -275,9 +269,8 @@ public class XmlItem   {
    * Get nameInteger
    * @return nameInteger
   */
+  
   @ApiModelProperty(example = "-2", value = "")
-
-
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -295,9 +288,8 @@ public class XmlItem   {
    * Get nameBoolean
    * @return nameBoolean
   */
+  
   @ApiModelProperty(example = "true", value = "")
-
-
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -323,9 +315,8 @@ public class XmlItem   {
    * Get nameArray
    * @return nameArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -351,9 +342,8 @@ public class XmlItem   {
    * Get nameWrappedArray
    * @return nameWrappedArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -371,9 +361,8 @@ public class XmlItem   {
    * Get prefixString
    * @return prefixString
   */
+  
   @ApiModelProperty(example = "string", value = "")
-
-
   public String getPrefixString() {
     return prefixString;
   }
@@ -391,10 +380,8 @@ public class XmlItem   {
    * Get prefixNumber
    * @return prefixNumber
   */
+  @Valid 
   @ApiModelProperty(example = "1.234", value = "")
-
-  @Valid
-
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -412,9 +399,8 @@ public class XmlItem   {
    * Get prefixInteger
    * @return prefixInteger
   */
+  
   @ApiModelProperty(example = "-2", value = "")
-
-
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -432,9 +418,8 @@ public class XmlItem   {
    * Get prefixBoolean
    * @return prefixBoolean
   */
+  
   @ApiModelProperty(example = "true", value = "")
-
-
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -460,9 +445,8 @@ public class XmlItem   {
    * Get prefixArray
    * @return prefixArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -488,9 +472,8 @@ public class XmlItem   {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -508,9 +491,8 @@ public class XmlItem   {
    * Get namespaceString
    * @return namespaceString
   */
+  
   @ApiModelProperty(example = "string", value = "")
-
-
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -528,10 +510,8 @@ public class XmlItem   {
    * Get namespaceNumber
    * @return namespaceNumber
   */
+  @Valid 
   @ApiModelProperty(example = "1.234", value = "")
-
-  @Valid
-
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -549,9 +529,8 @@ public class XmlItem   {
    * Get namespaceInteger
    * @return namespaceInteger
   */
+  
   @ApiModelProperty(example = "-2", value = "")
-
-
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -569,9 +548,8 @@ public class XmlItem   {
    * Get namespaceBoolean
    * @return namespaceBoolean
   */
+  
   @ApiModelProperty(example = "true", value = "")
-
-
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -597,9 +575,8 @@ public class XmlItem   {
    * Get namespaceArray
    * @return namespaceArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -625,9 +602,8 @@ public class XmlItem   {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -645,9 +621,8 @@ public class XmlItem   {
    * Get prefixNsString
    * @return prefixNsString
   */
+  
   @ApiModelProperty(example = "string", value = "")
-
-
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -665,10 +640,8 @@ public class XmlItem   {
    * Get prefixNsNumber
    * @return prefixNsNumber
   */
+  @Valid 
   @ApiModelProperty(example = "1.234", value = "")
-
-  @Valid
-
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -686,9 +659,8 @@ public class XmlItem   {
    * Get prefixNsInteger
    * @return prefixNsInteger
   */
+  
   @ApiModelProperty(example = "-2", value = "")
-
-
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -706,9 +678,8 @@ public class XmlItem   {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   */
+  
   @ApiModelProperty(example = "true", value = "")
-
-
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -734,9 +705,8 @@ public class XmlItem   {
    * Get prefixNsArray
    * @return prefixNsArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -762,9 +732,8 @@ public class XmlItem   {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   */
+  
   @ApiModelProperty(value = "")
-
-
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
@@ -773,7 +742,6 @@ public class XmlItem   {
     this.prefixNsWrappedArray = prefixNsWrappedArray;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -823,7 +791,6 @@ public class XmlItem   {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class XmlItem {\n");
-    
     sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
     sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
     sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");