diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 4b96206939b..5ef59bbd1de 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -261,6 +261,6 @@ 2.7.0 2.11.4 2.6.4 - 4.3.9.RELEASE + 5.3.27 diff --git a/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION b/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION index 3db08f94c8c..9d1e9bc227b 100644 --- a/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION +++ b/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION @@ -1 +1 @@ -2.4.22-SNAPSHOT \ No newline at end of file +2.4.32-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index c964f3c165f..3cb0097f64e 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -169,6 +169,6 @@ 2.7.0 2.11.4 2.6.4 - 4.3.9.RELEASE + 5.3.27 diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java index 3687adf2190..0b2c876eeee 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java index d2dc6ee8d24..683eee39db6 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java index 1319ddae091..02b6825ef16 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java index 1fd64ee407e..4a111267cdf 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java index ae07592d98c..da32400cb27 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java index 7800ff19399..1830ae29f94 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ @@ -163,7 +163,7 @@ default CompletableFuture> loginUser(@NotNull @ApiParam(v } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"blank\": true, \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED)); } catch (IOException e) { log.error("Couldn't serialize response for content type application/json", e); return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java index adf707bfa8f..d744bc157ee 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java @@ -24,7 +24,7 @@ public boolean equals(java.lang.Object o) { if (o == null || getClass() != o.getClass()) { return false; } - return true; + return super.equals(o); } @Override diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.swagger-codegen/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.swagger-codegen/VERSION index 3db08f94c8c..9d1e9bc227b 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/.swagger-codegen/VERSION +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.swagger-codegen/VERSION @@ -1 +1 @@ -2.4.22-SNAPSHOT \ No newline at end of file +2.4.32-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml index a607f891c81..fcdad3097de 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml @@ -174,6 +174,6 @@ 2.7.0 2.11.4 2.6.4 - 4.3.9.RELEASE + 5.3.27 diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApi.java index dbf8c3cf9f9..d1a34ee139f 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApiController.java index 72e4e7d343e..1750d06e99b 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApiController.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApiController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApi.java index a06f42308a9..12997e5a6f1 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApiController.java index 70dd0b14b55..cd49a52090a 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApiController.java @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApi.java index 3cc603478f1..17a51b5c0d0 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApiController.java index 6c1496fa206..904006f1720 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApiController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApi.java index cc3b1f5ea93..31749cd6e41 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApiController.java index a72089072fc..ee596d0d7e8 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApiController.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApiController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApi.java index fb855484020..17734b21cd7 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApiController.java index 1306a76e8c5..9ff13af3344 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApiController.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApiController.java @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApi.java index 2d8faa7c429..c6810983ff7 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApiController.java index a31026afe9a..d05e8a57ed2 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApiController.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApiController.java @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; @@ -93,7 +93,7 @@ public ResponseEntity loginUser(@NotNull @ApiParam(value = "The user nam if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"blank\": true, \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED); } catch (IOException e) { log.error("Couldn't serialize response for content type application/json", e); return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR); diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/model/AnimalFarm.java index adf707bfa8f..d744bc157ee 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/model/AnimalFarm.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/model/AnimalFarm.java @@ -24,7 +24,7 @@ public boolean equals(java.lang.Object o) { if (o == null || getClass() != o.getClass()) { return false; } - return true; + return super.equals(o); } @Override diff --git a/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION b/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION index 3db08f94c8c..9d1e9bc227b 100644 --- a/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION +++ b/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION @@ -1 +1 @@ -2.4.22-SNAPSHOT \ No newline at end of file +2.4.32-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index 86d5b18318d..0f0a187bb4e 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -169,6 +169,6 @@ 2.7.0 2.11.4 2.6.4 - 4.3.9.RELEASE + 5.3.27 diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java index dbf8c3cf9f9..d1a34ee139f 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApiController.java index 72e4e7d343e..1750d06e99b 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApiController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java index a54be40809d..5ec5a0537ca 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java index 9f075616ce8..1a438360c28 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java index 3cc603478f1..17a51b5c0d0 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApiController.java index 6c1496fa206..904006f1720 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApiController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java index cc3b1f5ea93..31749cd6e41 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java index a72089072fc..ee596d0d7e8 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java index fb855484020..17734b21cd7 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApiController.java index 1306a76e8c5..9ff13af3344 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApiController.java @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java index 2d8faa7c429..c6810983ff7 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT). + * NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT). * https://github.com/swagger-api/swagger-codegen * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApiController.java index a31026afe9a..d05e8a57ed2 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApiController.java @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.*; import javax.validation.Valid; +import javax.validation.constraints.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; @@ -93,7 +93,7 @@ public ResponseEntity loginUser(@NotNull @ApiParam(value = "The user nam if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"blank\": true, \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED); } catch (IOException e) { log.error("Couldn't serialize response for content type application/json", e); return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR); diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java index adf707bfa8f..d744bc157ee 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java @@ -24,7 +24,7 @@ public boolean equals(java.lang.Object o) { if (o == null || getClass() != o.getClass()) { return false; } - return true; + return super.equals(o); } @Override