From 63fce5893166f4f26ca712e43649ab5b853113a1 Mon Sep 17 00:00:00 2001 From: Kenny Jones Date: Mon, 20 Nov 2017 23:14:02 -0500 Subject: [PATCH] [Java][Spring] Resolve serialization warning from RFC3339DateFormat (#6960) Adds `serialVersionUID` to RFC3339DateFormat.java to avoid Java warning. --- .../libraries/spring-boot/RFC3339DateFormat.mustache | 2 ++ .../libraries/spring-mvc/RFC3339DateFormat.mustache | 2 ++ .../src/main/java/io/swagger/api/FakeApi.java | 2 +- .../src/main/java/io/swagger/api/PetApi.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApi.java | 4 ++-- .../src/main/java/io/swagger/api/UserApi.java | 2 +- .../java/io/swagger/configuration/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/api/FakeApiController.java | 2 +- .../src/main/java/io/swagger/api/PetApiController.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApiController.java | 4 ++-- .../src/main/java/io/swagger/api/UserApiController.java | 2 +- .../java/io/swagger/configuration/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/api/FakeApiController.java | 2 +- .../src/main/java/io/swagger/api/PetApiController.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApiController.java | 4 ++-- .../src/main/java/io/swagger/api/UserApiController.java | 2 +- .../src/main/java/io/swagger/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/api/FakeApiDelegate.java | 2 +- .../src/main/java/io/swagger/api/PetApiDelegate.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApiDelegate.java | 4 ++-- .../src/main/java/io/swagger/api/UserApiDelegate.java | 2 +- .../src/main/java/io/swagger/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/api/FakeApiController.java | 2 +- .../src/main/java/io/swagger/api/PetApiController.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApiController.java | 4 ++-- .../src/main/java/io/swagger/api/UserApiController.java | 2 +- .../src/main/java/io/swagger/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/api/FakeApiController.java | 2 +- .../src/main/java/io/swagger/api/PetApiController.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApiController.java | 4 ++-- .../src/main/java/io/swagger/api/UserApiController.java | 2 +- .../src/main/java/io/swagger/RFC3339DateFormat.java | 2 ++ .../src/main/java/io/swagger/api/FakeApiController.java | 2 +- .../src/main/java/io/swagger/api/PetApiController.java | 8 ++++---- .../src/main/java/io/swagger/api/StoreApiController.java | 4 ++-- .../src/main/java/io/swagger/api/UserApiController.java | 2 +- 38 files changed, 76 insertions(+), 56 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/RFC3339DateFormat.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/RFC3339DateFormat.mustache index afe24ed9aba..d5dff8ac631 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/RFC3339DateFormat.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/RFC3339DateFormat.mustache @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/RFC3339DateFormat.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/RFC3339DateFormat.mustache index 2e60a5c4b97..597120b5b23 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/RFC3339DateFormat.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/RFC3339DateFormat.mustache @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { 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 5c946bfb707..36f1c891f51 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 @@ -82,7 +82,7 @@ public interface FakeApi { if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) { if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java index 4681a226115..d3348468c56 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 @@ -114,7 +114,7 @@ public interface PetApi { } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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)); @@ -151,7 +151,7 @@ public interface PetApi { } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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)); @@ -186,7 +186,7 @@ public interface PetApi { } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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)); @@ -259,7 +259,7 @@ public interface PetApi { if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) { if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java index e77f2de7f70..83503ea6f68 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 @@ -109,7 +109,7 @@ public interface StoreApi { } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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)); @@ -141,7 +141,7 @@ public interface StoreApi { } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java index 4e755a2a73d..5815d33cdd7 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 @@ -129,7 +129,7 @@ public interface UserApi { } if (getAcceptHeader().get().contains("application/json")) { try { - return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED)); + return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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/configuration/RFC3339DateFormat.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/RFC3339DateFormat.java index 4aaf6cd1c0c..410a5d09b27 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/RFC3339DateFormat.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { 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 360e1d910d7..3cce1cd1fe5 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 @@ -58,7 +58,7 @@ public class FakeApiController implements FakeApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/api/PetApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java index a3890cf787d..03df73c9c5d 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 @@ -61,7 +61,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -84,7 +84,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -107,7 +107,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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); @@ -131,7 +131,7 @@ public class PetApiController implements PetApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApiController.java index 6e463e1307f..4b36df0317a 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 @@ -69,7 +69,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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); @@ -92,7 +92,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/api/UserApiController.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApiController.java index e96dfe648b4..1d90292bafb 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 @@ -70,7 +70,7 @@ public class UserApiController implements UserApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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/configuration/RFC3339DateFormat.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/RFC3339DateFormat.java index 4aaf6cd1c0c..410a5d09b27 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/RFC3339DateFormat.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/RFC3339DateFormat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/RFC3339DateFormat.java index 0c3d276d2d4..538b6f2437b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/RFC3339DateFormat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApiController.java index 360e1d910d7..3cce1cd1fe5 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApiController.java @@ -58,7 +58,7 @@ public class FakeApiController implements FakeApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/springboot-beanvalidation/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApiController.java index a3890cf787d..03df73c9c5d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApiController.java @@ -61,7 +61,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -84,7 +84,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -107,7 +107,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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); @@ -131,7 +131,7 @@ public class PetApiController implements PetApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApiController.java index 6e463e1307f..4b36df0317a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApiController.java @@ -69,7 +69,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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); @@ -92,7 +92,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/springboot-beanvalidation/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApiController.java index e96dfe648b4..1d90292bafb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApiController.java @@ -70,7 +70,7 @@ public class UserApiController implements UserApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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/springboot-delegate-j8/src/main/java/io/swagger/RFC3339DateFormat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/RFC3339DateFormat.java index 0c3d276d2d4..538b6f2437b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/RFC3339DateFormat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApiDelegate.java index c58dc82e5b9..5a3be5df488 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApiDelegate.java @@ -65,7 +65,7 @@ public interface FakeApiDelegate { if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) { if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/springboot-delegate-j8/src/main/java/io/swagger/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApiDelegate.java index 065e3d60441..a49ebd046df 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApiDelegate.java @@ -75,7 +75,7 @@ public interface PetApiDelegate { } if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -102,7 +102,7 @@ public interface PetApiDelegate { } if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -129,7 +129,7 @@ public interface PetApiDelegate { } if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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); @@ -174,7 +174,7 @@ public interface PetApiDelegate { if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) { if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApiDelegate.java index 17583c39939..dcb798e15cc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApiDelegate.java @@ -81,7 +81,7 @@ public interface StoreApiDelegate { } if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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); @@ -108,7 +108,7 @@ public interface StoreApiDelegate { } if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/springboot-delegate-j8/src/main/java/io/swagger/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApiDelegate.java index 4e56d2e9252..7b1977315c1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApiDelegate.java @@ -95,7 +95,7 @@ public interface UserApiDelegate { } if (getAcceptHeader().get().contains("application/json")) { try { - return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity<>(getObjectMapper().get().readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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/springboot-delegate/src/main/java/io/swagger/RFC3339DateFormat.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/RFC3339DateFormat.java index 0c3d276d2d4..538b6f2437b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/RFC3339DateFormat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/RFC3339DateFormat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/RFC3339DateFormat.java index 0c3d276d2d4..538b6f2437b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/RFC3339DateFormat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApiController.java index 9d135bee8d7..8b2b94be1cc 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApiController.java @@ -58,7 +58,7 @@ public class FakeApiController implements FakeApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApiController.java index 9bf771741b8..2cf86b14a68 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApiController.java @@ -61,7 +61,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -84,7 +84,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -107,7 +107,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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); @@ -131,7 +131,7 @@ public class PetApiController implements PetApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApiController.java index 6e463e1307f..4b36df0317a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApiController.java @@ -69,7 +69,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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); @@ -92,7 +92,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApiController.java index e96dfe648b4..1d90292bafb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApiController.java @@ -70,7 +70,7 @@ public class UserApiController implements UserApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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/springboot-useoptional/src/main/java/io/swagger/RFC3339DateFormat.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/RFC3339DateFormat.java index 0c3d276d2d4..538b6f2437b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/RFC3339DateFormat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApiController.java index 55c9b827cc7..887c19039c5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApiController.java @@ -59,7 +59,7 @@ public class FakeApiController implements FakeApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/springboot-useoptional/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApiController.java index 9e97a9347ff..f7b3c1519a0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApiController.java @@ -62,7 +62,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -85,7 +85,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -108,7 +108,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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); @@ -132,7 +132,7 @@ public class PetApiController implements PetApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/springboot-useoptional/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApiController.java index 1ee1125dc1b..182278e6aa8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApiController.java @@ -70,7 +70,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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); @@ -93,7 +93,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/springboot-useoptional/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApiController.java index cf47c9ce282..c2640db8ecf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApiController.java @@ -71,7 +71,7 @@ public class UserApiController implements UserApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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/springboot/src/main/java/io/swagger/RFC3339DateFormat.java b/samples/server/petstore/springboot/src/main/java/io/swagger/RFC3339DateFormat.java index 0c3d276d2d4..538b6f2437b 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/RFC3339DateFormat.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/RFC3339DateFormat.java @@ -9,6 +9,8 @@ import java.util.Date; public class RFC3339DateFormat extends ISO8601DateFormat { + private static final long serialVersionUID = 1L; + // Same as ISO8601DateFormat but serializing milliseconds. @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java index 360e1d910d7..3cce1cd1fe5 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java @@ -58,7 +58,7 @@ public class FakeApiController implements FakeApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"my_string\" : { }, \"my_number\" : { }, \"my_boolean\" : { }}", OuterComposite.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"my_number\" : { }, \"my_string\" : { }, \"my_boolean\" : { }}", OuterComposite.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/springboot/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java index a3890cf787d..03df73c9c5d 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java @@ -61,7 +61,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -84,7 +84,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity>(objectMapper.readValue("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]", List.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity>(objectMapper.readValue("[ { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}, { \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]} ]", List.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); @@ -107,7 +107,7 @@ public class PetApiController implements PetApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}", Pet.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"status\" : \"available\", \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ]}", Pet.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); @@ -131,7 +131,7 @@ public class PetApiController implements PetApi { String accept = request.getHeader("Accept"); if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"message\" : \"message\", \"code\" : 0, \"type\" : \"type\"}", ModelApiResponse.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/springboot/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java index 6e463e1307f..4b36df0317a 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java @@ -69,7 +69,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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); @@ -92,7 +92,7 @@ public class StoreApiController implements StoreApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}", Order.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"petId\" : 6, \"complete\" : false, \"status\" : \"placed\", \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\"}", Order.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/springboot/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java index e96dfe648b4..1d90292bafb 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java @@ -70,7 +70,7 @@ public class UserApiController implements UserApi { if (accept != null && accept.contains("application/json")) { try { - return new ResponseEntity(objectMapper.readValue("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}", User.class), HttpStatus.NOT_IMPLEMENTED); + return new ResponseEntity(objectMapper.readValue("{ \"id\" : 0, \"lastName\" : \"lastName\", \"phone\" : \"phone\", \"username\" : \"username\", \"email\" : \"email\", \"userStatus\" : 6, \"firstName\" : \"firstName\", \"password\" : \"password\"}", User.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);