Skip to content

Commit 53fd1a3

Browse files
HugoMarioHugoMario
committed
updated spring-mvc petstore sample
1 parent 6c4b1d6 commit 53fd1a3

File tree

7 files changed

+115
-34
lines changed

7 files changed

+115
-34
lines changed

‎samples/server/petstore/spring-mvc/.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/src/main/java/io/swagger/api/PetApi.java‎

Lines changed: 13 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
*/
@@ -29,7 +29,7 @@ public interface PetApi {
2929

3030
@ApiOperation(value = "Add a new pet to the store", nickname = "addPet", notes = "", authorizations = {
3131
@Authorization(value = "petstore_auth", scopes = {
32-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
32+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
3333
@ApiResponses(value = {
3434
@ApiResponse(code = 405, message = "Invalid input") })
3535
@RequestMapping(value = "/pet",
@@ -40,17 +40,17 @@ public interface PetApi {
4040

4141
@ApiOperation(value = "Deletes a pet", nickname = "deletePet", notes = "", authorizations = {
4242
@Authorization(value = "petstore_auth", scopes = {
43-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
43+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
4444
@ApiResponses(value = {
4545
@ApiResponse(code = 400, message = "Invalid pet value") })
4646
@RequestMapping(value = "/pet/{petId}",
4747
method = RequestMethod.DELETE)
48-
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);
48+
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);
4949

5050

5151
@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 = {
5252
@Authorization(value = "petstore_auth", scopes = {
53-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
53+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
5454
@ApiResponses(value = {
5555
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
5656
@ApiResponse(code = 400, message = "Invalid status value") })
@@ -62,7 +62,7 @@ public interface PetApi {
6262

6363
@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 = {
6464
@Authorization(value = "petstore_auth", scopes = {
65-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
65+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
6666
@ApiResponses(value = {
6767
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
6868
@ApiResponse(code = 400, message = "Invalid tag value") })
@@ -73,20 +73,20 @@ public interface PetApi {
7373

7474

7575
@ApiOperation(value = "Find pet by ID", nickname = "getPetById", notes = "Returns a single pet", response = Pet.class, authorizations = {
76-
@Authorization(value = "api_key") }, tags={ })
76+
@Authorization(value = "api_key") }, tags={ "pet", })
7777
@ApiResponses(value = {
7878
@ApiResponse(code = 200, message = "successful operation", response = Pet.class),
7979
@ApiResponse(code = 400, message = "Invalid ID supplied"),
8080
@ApiResponse(code = 404, message = "Pet not found") })
8181
@RequestMapping(value = "/pet/{petId}",
8282
produces = { "application/xml", "application/json" },
8383
method = RequestMethod.GET)
84-
ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Integer petId);
84+
ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Long petId);
8585

8686

8787
@ApiOperation(value = "Update an existing pet", nickname = "updatePet", notes = "", authorizations = {
8888
@Authorization(value = "petstore_auth", scopes = {
89-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
89+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
9090
@ApiResponses(value = {
9191
@ApiResponse(code = 400, message = "Invalid ID supplied"),
9292
@ApiResponse(code = 404, message = "Pet not found"),
@@ -99,24 +99,24 @@ public interface PetApi {
9999

100100
@ApiOperation(value = "Updates a pet in the store with form data", nickname = "updatePetWithForm", notes = "", authorizations = {
101101
@Authorization(value = "petstore_auth", scopes = {
102-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
102+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
103103
@ApiResponses(value = {
104104
@ApiResponse(code = 405, message = "Invalid input") })
105105
@RequestMapping(value = "/pet/{petId}",
106106
consumes = { "application/x-www-form-urlencoded" },
107107
method = RequestMethod.POST)
108-
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);
108+
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);
109109

110110

111111
@ApiOperation(value = "uploads an image", nickname = "uploadFile", notes = "", response = ModelApiResponse.class, authorizations = {
112112
@Authorization(value = "petstore_auth", scopes = {
113-
@AuthorizationScope(scope = "", description = "") }) }, tags={ })
113+
@AuthorizationScope(scope = "", description = "") }) }, tags={ "pet", })
114114
@ApiResponses(value = {
115115
@ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
116116
@RequestMapping(value = "/pet/{petId}/uploadImage",
117117
produces = { "application/json" },
118118
consumes = { "multipart/form-data" },
119119
method = RequestMethod.POST)
120-
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);
120+
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);
121121

122122
}

‎samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,50 @@ public ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to b
4343
return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
4444
}
4545

46-
public 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) {
46+
public 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) {
4747
String accept = request.getHeader("Accept");
4848
return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
4949
}
5050

5151
public 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) {
5252
String accept = request.getHeader("Accept");
53+
if (accept != null && accept.contains("application/json")) {
54+
try {
55+
return new ResponseEntity<List<Pet>>(objectMapper.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);
56+
} catch (IOException e) {
57+
log.error("Couldn't serialize response for content type application/json", e);
58+
return new ResponseEntity<List<Pet>>(HttpStatus.INTERNAL_SERVER_ERROR);
59+
}
60+
}
61+
5362
return new ResponseEntity<List<Pet>>(HttpStatus.NOT_IMPLEMENTED);
5463
}
5564

5665
public ResponseEntity<List<Pet>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags) {
5766
String accept = request.getHeader("Accept");
67+
if (accept != null && accept.contains("application/json")) {
68+
try {
69+
return new ResponseEntity<List<Pet>>(objectMapper.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);
70+
} catch (IOException e) {
71+
log.error("Couldn't serialize response for content type application/json", e);
72+
return new ResponseEntity<List<Pet>>(HttpStatus.INTERNAL_SERVER_ERROR);
73+
}
74+
}
75+
5876
return new ResponseEntity<List<Pet>>(HttpStatus.NOT_IMPLEMENTED);
5977
}
6078

61-
public ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Integer petId) {
79+
public ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Long petId) {
6280
String accept = request.getHeader("Accept");
81+
if (accept != null && accept.contains("application/json")) {
82+
try {
83+
return new ResponseEntity<Pet>(objectMapper.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);
84+
} catch (IOException e) {
85+
log.error("Couldn't serialize response for content type application/json", e);
86+
return new ResponseEntity<Pet>(HttpStatus.INTERNAL_SERVER_ERROR);
87+
}
88+
}
89+
6390
return new ResponseEntity<Pet>(HttpStatus.NOT_IMPLEMENTED);
6491
}
6592

@@ -68,13 +95,22 @@ public ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs t
6895
return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
6996
}
7097

71-
public 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) {
98+
public 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) {
7299
String accept = request.getHeader("Accept");
73100
return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
74101
}
75102

76-
public 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) {
103+
public 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) {
77104
String accept = request.getHeader("Accept");
105+
if (accept != null && accept.contains("application/json")) {
106+
try {
107+
return new ResponseEntity<ModelApiResponse>(objectMapper.readValue("{\n \"code\" : 0,\n \"type\" : \"type\",\n \"message\" : \"message\"\n}", ModelApiResponse.class), HttpStatus.NOT_IMPLEMENTED);
108+
} catch (IOException e) {
109+
log.error("Couldn't serialize response for content type application/json", e);
110+
return new ResponseEntity<ModelApiResponse>(HttpStatus.INTERNAL_SERVER_ERROR);
111+
}
112+
}
113+
78114
return new ResponseEntity<ModelApiResponse>(HttpStatus.NOT_IMPLEMENTED);
79115
}
80116

‎samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java‎

Lines changed: 6 additions & 6 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
*/
@@ -26,7 +26,7 @@
2626
@Api(value = "store", description = "the store API")
2727
public interface StoreApi {
2828

29-
@ApiOperation(value = "Delete purchase order by ID", nickname = "deleteOrder", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ })
29+
@ApiOperation(value = "Delete purchase order by ID", nickname = "deleteOrder", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store", })
3030
@ApiResponses(value = {
3131
@ApiResponse(code = 400, message = "Invalid ID supplied"),
3232
@ApiResponse(code = 404, message = "Order not found") })
@@ -36,7 +36,7 @@ public interface StoreApi {
3636

3737

3838
@ApiOperation(value = "Returns pet inventories by status", nickname = "getInventory", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
39-
@Authorization(value = "api_key") }, tags={ })
39+
@Authorization(value = "api_key") }, tags={ "store", })
4040
@ApiResponses(value = {
4141
@ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
4242
@RequestMapping(value = "/store/inventory",
@@ -45,18 +45,18 @@ public interface StoreApi {
4545
ResponseEntity<Map<String, Integer>> getInventory();
4646

4747

48-
@ApiOperation(value = "Find purchase order by ID", nickname = "getOrderById", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ })
48+
@ApiOperation(value = "Find purchase order by ID", nickname = "getOrderById", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
4949
@ApiResponses(value = {
5050
@ApiResponse(code = 200, message = "successful operation", response = Order.class),
5151
@ApiResponse(code = 400, message = "Invalid ID supplied"),
5252
@ApiResponse(code = 404, message = "Order not found") })
5353
@RequestMapping(value = "/store/order/{orderId}",
5454
produces = { "application/xml", "application/json" },
5555
method = RequestMethod.GET)
56-
ResponseEntity<Order> getOrderById(@DecimalMin("1") @DecimalMax("5") @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathVariable("orderId") Integer orderId);
56+
ResponseEntity<Order> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched",required=true, allowableValues = "") @PathVariable("orderId") Long orderId);
5757

5858

59-
@ApiOperation(value = "Place an order for a pet", nickname = "placeOrder", notes = "", response = Order.class, tags={ })
59+
@ApiOperation(value = "Place an order for a pet", nickname = "placeOrder", notes = "", response = Order.class, tags={ "store", })
6060
@ApiResponses(value = {
6161
@ApiResponse(code = 200, message = "successful operation", response = Order.class),
6262
@ApiResponse(code = 400, message = "Invalid Order") })

0 commit comments

Comments
 (0)