Skip to content

Commit 14bda77

Browse files
HugoMarioHugoMario
authored
Merge pull request #9607 from swagger-api/spring_samples_update
Spring samples update
2 parents 581c282 + 657ad92 commit 14bda77

File tree

47 files changed

+695
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+695
-218
lines changed

‎samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.5-SNAPSHOT
1+
3.0.11-SNAPSHOT

‎samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* NOTE: This class is auto generated by the swagger code generator program (3.0.5-SNAPSHOT).
2+
* NOTE: This class is auto generated by the swagger code generator program (3.0.11-SNAPSHOT).
33
* https://github.com/swagger-api/swagger-codegen
44
* Do not edit the class manually.
55
*/
@@ -51,7 +51,7 @@ default Optional<String> getAcceptHeader() {
5151

5252
@ApiOperation(value = "Add a new pet to the store", nickname = "addPet", notes = "", authorizations = {
5353
@Authorization(value = "petstore_auth", scopes = {
54-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
54+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
5555
@ApiResponses(value = {
5656
@ApiResponse(code = 405, message = "Invalid input") })
5757
@RequestMapping(value = "/pet",
@@ -68,12 +68,12 @@ default CompletableFuture<ResponseEntity<Void>> addPet(@ApiParam(value = "Pet ob
6868

6969
@ApiOperation(value = "Deletes a pet", nickname = "deletePet", notes = "", authorizations = {
7070
@Authorization(value = "petstore_auth", scopes = {
71-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
71+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
7272
@ApiResponses(value = {
7373
@ApiResponse(code = 400, message = "Invalid pet value") })
7474
@RequestMapping(value = "/pet/{petId}",
7575
method = RequestMethod.DELETE)
76-
default CompletableFuture<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Integer petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
76+
default CompletableFuture<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
7777
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
7878
} else {
7979
log.warn("ObjectMapper or HttpServletRequest not configured in default PetApi interface so no example is generated");
@@ -84,7 +84,7 @@ default CompletableFuture<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet
8484

8585
@ApiOperation(value = "Finds Pets by status", nickname = "findPetsByStatus", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
8686
@Authorization(value = "petstore_auth", scopes = {
87-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
87+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
8888
@ApiResponses(value = {
8989
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
9090
@ApiResponse(code = 400, message = "Invalid status value") })
@@ -93,6 +93,14 @@ default CompletableFuture<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet
9393
method = RequestMethod.GET)
9494
default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List<String> status) {
9595
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
96+
if (getAcceptHeader().get().contains("application/json")) {
97+
try {
98+
return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]", List.class), HttpStatus.NOT_IMPLEMENTED));
99+
} catch (IOException e) {
100+
log.error("Couldn't serialize response for content type application/json", e);
101+
return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
102+
}
103+
}
96104
} else {
97105
log.warn("ObjectMapper or HttpServletRequest not configured in default PetApi interface so no example is generated");
98106
}
@@ -102,7 +110,7 @@ default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus(@NotNull @
102110

103111
@ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
104112
@Authorization(value = "petstore_auth", scopes = {
105-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
113+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
106114
@ApiResponses(value = {
107115
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
108116
@ApiResponse(code = 400, message = "Invalid tag value") })
@@ -111,6 +119,14 @@ default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus(@NotNull @
111119
method = RequestMethod.GET)
112120
default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags) {
113121
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
122+
if (getAcceptHeader().get().contains("application/json")) {
123+
try {
124+
return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]", List.class), HttpStatus.NOT_IMPLEMENTED));
125+
} catch (IOException e) {
126+
log.error("Couldn't serialize response for content type application/json", e);
127+
return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
128+
}
129+
}
114130
} else {
115131
log.warn("ObjectMapper or HttpServletRequest not configured in default PetApi interface so no example is generated");
116132
}
@@ -119,16 +135,24 @@ default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags(@NotNull @Ap
119135

120136

121137
@ApiOperation(value = "Find pet by ID", nickname = "getPetById", notes = "Returns a single pet", response = Pet.class, authorizations = {
122-
@Authorization(value = "api_key") }, tags={ })
138+
@Authorization(value = "api_key") }, tags={ "pet", })
123139
@ApiResponses(value = {
124140
@ApiResponse(code = 200, message = "successful operation", response = Pet.class),
125141
@ApiResponse(code = 400, message = "Invalid ID supplied"),
126142
@ApiResponse(code = 404, message = "Pet not found") })
127143
@RequestMapping(value = "/pet/{petId}",
128144
produces = { "application/xml", "application/json" },
129145
method = RequestMethod.GET)
130-
default CompletableFuture<ResponseEntity<Pet>> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Integer petId) {
146+
default CompletableFuture<ResponseEntity<Pet>> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Long petId) {
131147
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
148+
if (getAcceptHeader().get().contains("application/json")) {
149+
try {
150+
return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}", Pet.class), HttpStatus.NOT_IMPLEMENTED));
151+
} catch (IOException e) {
152+
log.error("Couldn't serialize response for content type application/json", e);
153+
return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
154+
}
155+
}
132156
} else {
133157
log.warn("ObjectMapper or HttpServletRequest not configured in default PetApi interface so no example is generated");
134158
}
@@ -138,7 +162,7 @@ default CompletableFuture<ResponseEntity<Pet>> getPetById(@ApiParam(value = "ID
138162

139163
@ApiOperation(value = "Update an existing pet", nickname = "updatePet", notes = "", authorizations = {
140164
@Authorization(value = "petstore_auth", scopes = {
141-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
165+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
142166
@ApiResponses(value = {
143167
@ApiResponse(code = 400, message = "Invalid ID supplied"),
144168
@ApiResponse(code = 404, message = "Pet not found"),
@@ -157,13 +181,13 @@ default CompletableFuture<ResponseEntity<Void>> updatePet(@ApiParam(value = "Pet
157181

158182
@ApiOperation(value = "Updates a pet in the store with form data", nickname = "updatePetWithForm", notes = "", authorizations = {
159183
@Authorization(value = "petstore_auth", scopes = {
160-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
184+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
161185
@ApiResponses(value = {
162186
@ApiResponse(code = 405, message = "Invalid input") })
163187
@RequestMapping(value = "/pet/{petId}",
164188
consumes = { "application/x-www-form-urlencoded" },
165189
method = RequestMethod.POST)
166-
default CompletableFuture<ResponseEntity<Void>> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathVariable("petId") Integer petId,@ApiParam(value = "") @RequestParam(value="name", required=false) String name,@ApiParam(value = "") @RequestParam(value="status", required=false) String status) {
190+
default CompletableFuture<ResponseEntity<Void>> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "") @RequestParam(value="name", required=false) String name,@ApiParam(value = "") @RequestParam(value="status", required=false) String status) {
167191
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
168192
} else {
169193
log.warn("ObjectMapper or HttpServletRequest not configured in default PetApi interface so no example is generated");
@@ -174,15 +198,23 @@ default CompletableFuture<ResponseEntity<Void>> updatePetWithForm(@ApiParam(valu
174198

175199
@ApiOperation(value = "uploads an image", nickname = "uploadFile", notes = "", response = ModelApiResponse.class, authorizations = {
176200
@Authorization(value = "petstore_auth", scopes = {
177-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
201+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
178202
@ApiResponses(value = {
179203
@ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
180204
@RequestMapping(value = "/pet/{petId}/uploadImage",
181205
produces = { "application/json" },
182206
consumes = { "multipart/form-data" },
183207
method = RequestMethod.POST)
184-
default CompletableFuture<ResponseEntity<ModelApiResponse>> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Integer petId,@ApiParam(value = "") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file) {
208+
default CompletableFuture<ResponseEntity<ModelApiResponse>> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file) {
185209
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
210+
if (getAcceptHeader().get().contains("application/json")) {
211+
try {
212+
return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{\n \"code\" : 0,\n \"type\" : \"type\",\n \"message\" : \"message\"\n}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED));
213+
} catch (IOException e) {
214+
log.error("Couldn't serialize response for content type application/json", e);
215+
return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
216+
}
217+
}
186218
} else {
187219
log.warn("ObjectMapper or HttpServletRequest not configured in default PetApi interface so no example is generated");
188220
}

0 commit comments

Comments
 (0)