From d69c9348191759b3e03172a4d10a5564bacad1d6 Mon Sep 17 00:00:00 2001 From: Ignacio Molina Cuquerella Date: Fri, 16 Feb 2018 11:36:44 +0100 Subject: [PATCH 1/6] Add success code response property --- .../io/swagger/codegen/CodegenOperation.java | 10 ++ .../io/swagger/codegen/DefaultCodegen.java | 148 +++++++++--------- .../codegen/languages/AbstractAdaCodegen.java | 19 ++- .../codegen/languages/ApexClientCodegen.java | 2 +- .../languages/CppRestClientCodegen.java | 20 ++- .../languages/PistacheServerCodegen.java | 19 ++- 6 files changed, 126 insertions(+), 92 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java index 5857de4bb42..55346fde795 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java @@ -18,6 +18,7 @@ public class CodegenOperation { isResponseBinary = false, isResponseFile = false, hasReference = false, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, isRestful, isDeprecated; + public int successCode = 200; public String path, operationId, returnType, httpMethod, returnBaseType, returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse, discriminator; public List> consumes, produces, prioritizedContentTypes; @@ -43,6 +44,15 @@ public class CodegenOperation { public String operationIdCamelCase; // for class names public String operationIdSnakeCase; + /** + * Get http code for success responses + * + * @return success code, 200 by default + */ + public int getSuccessCode() { + return successCode; + } + /** * Check if there's at least one parameter * diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 68824a622a2..d5bb8b88884 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1975,20 +1975,20 @@ protected void setNonArrayMapProperty(CodegenProperty property, String type) { * @param responses Swagger Operation's responses * @return default method response or null if not found */ - protected Response findMethodResponse(Map responses) { + protected Entry findMethodResponse(Map responses) { - String code = null; - for (String responseCode : responses.keySet()) { - if (responseCode.startsWith("2") || responseCode.equals("default")) { - if (code == null || code.compareTo(responseCode) > 0) { - code = responseCode; + Entry response = null; + for (Entry entry : responses.entrySet()) { + if (entry.getKey().startsWith("2") || "default".equals(entry.getKey())) { + if (response == null || response.getKey().compareTo(entry.getKey()) > 0) { + response = entry; } } } - if (code == null) { + if (response == null) { return null; } - return responses.get(code); + return response; } /** @@ -2123,80 +2123,84 @@ public CodegenOperation fromOperation(String path, } if (operation.getResponses() != null && !operation.getResponses().isEmpty()) { - Response methodResponse = findMethodResponse(operation.getResponses()); - - for (Map.Entry entry : operation.getResponses().entrySet()) { - Response response = entry.getValue(); - CodegenResponse r = fromResponse(entry.getKey(), response); - r.hasMore = true; - if (r.baseType != null && - !defaultIncludes.contains(r.baseType) && - !languageSpecificPrimitives.contains(r.baseType)) { - imports.add(r.baseType); - } - r.isDefault = response == methodResponse; - op.responses.add(r); - if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.isDefault)){ - op.isResponseBinary = Boolean.TRUE; - } - if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.isDefault)){ - op.isResponseFile = Boolean.TRUE; - } - } - op.responses.get(op.responses.size() - 1).hasMore = false; + Entry methodResponse = findMethodResponse(operation.getResponses()); if (methodResponse != null) { - if (methodResponse.getSchema() != null) { - CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); - - Property responseProperty = methodResponse.getSchema(); - - if (responseProperty instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) responseProperty; - CodegenProperty innerProperty = fromProperty("response", ap.getItems()); - op.returnBaseType = innerProperty.baseType; - } else if (responseProperty instanceof MapProperty) { - MapProperty ap = (MapProperty) responseProperty; - CodegenProperty innerProperty = fromProperty("response", ap.getAdditionalProperties()); - op.returnBaseType = innerProperty.baseType; - } else { - if (cm.complexType != null) { - op.returnBaseType = cm.complexType; + String code = methodResponse.getKey(); + if (!"default".equals(code)) { + op.successCode = Integer.parseInt(code); + } + + for (Entry entry : operation.getResponses().entrySet()) { + Response response = entry.getValue(); + CodegenResponse r = fromResponse(entry.getKey(), response); + r.hasMore = true; + if (r.baseType != null && + !defaultIncludes.contains(r.baseType) && + !languageSpecificPrimitives.contains(r.baseType)) { + imports.add(r.baseType); + } + r.isDefault = response == methodResponse.getValue(); + op.responses.add(r); + if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.isDefault)){ + op.isResponseBinary = Boolean.TRUE; + } + if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.isDefault)){ + op.isResponseFile = Boolean.TRUE; + } + } + op.responses.get(op.responses.size() - 1).hasMore = false; + + Response response = methodResponse.getValue(); + if (response != null) { + if (response.getSchema() != null) { + CodegenProperty cm = fromProperty("response", response.getSchema()); + + Property responseProperty = response.getSchema(); + + if (responseProperty instanceof ArrayProperty) { + ArrayProperty ap = (ArrayProperty) responseProperty; + CodegenProperty innerProperty = fromProperty("response", ap.getItems()); + op.returnBaseType = innerProperty.baseType; + } else if (responseProperty instanceof MapProperty) { + MapProperty ap = (MapProperty) responseProperty; + CodegenProperty innerProperty = fromProperty("response", ap.getAdditionalProperties()); + op.returnBaseType = innerProperty.baseType; } else { op.returnBaseType = cm.baseType; } - } - op.examples = new ExampleGenerator(definitions).generate(methodResponse.getExamples(), operation.getProduces(), responseProperty); - op.defaultResponse = toDefaultValue(responseProperty); - op.returnType = cm.datatype; - op.hasReference = definitions != null && definitions.containsKey(op.returnBaseType); - - // lookup discriminator - if (definitions != null) { - Model m = definitions.get(op.returnBaseType); - if (m != null) { - CodegenModel cmod = fromModel(op.returnBaseType, m, definitions); - op.discriminator = cmod.discriminator; + op.examples = new ExampleGenerator(definitions).generate(response.getExamples(), operation.getProduces(), responseProperty); + op.defaultResponse = toDefaultValue(responseProperty); + op.returnType = cm.datatype; + op.hasReference = definitions != null && definitions.containsKey(op.returnBaseType); + + // lookup discriminator + if (definitions != null) { + Model m = definitions.get(op.returnBaseType); + if (m != null) { + CodegenModel cmod = fromModel(op.returnBaseType, m, definitions); + op.discriminator = cmod.discriminator; + } } - } - if (cm.isContainer) { - op.returnContainer = cm.containerType; - if ("map".equals(cm.containerType)) { - op.isMapContainer = true; - } else if ("list".equalsIgnoreCase(cm.containerType)) { - op.isListContainer = true; - } else if ("array".equalsIgnoreCase(cm.containerType)) { - op.isListContainer = true; + if (cm.isContainer) { + op.returnContainer = cm.containerType; + if ("map".equals(cm.containerType)) { + op.isMapContainer = true; + } else if ("list".equalsIgnoreCase(cm.containerType)) { + op.isListContainer = true; + } else if ("array".equalsIgnoreCase(cm.containerType)) { + op.isListContainer = true; + } + } else { + op.returnSimpleType = true; + } + if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null) { + op.returnTypeIsPrimitive = true; } - } else { - op.returnSimpleType = true; - } - if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null) { - op.returnTypeIsPrimitive = true; } + addHeaders(response, op.responseHeaders); } - addHeaders(methodResponse, op.responseHeaders); } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java index 2ae3eb8bb5e..306f982b0bf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java @@ -383,14 +383,21 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger); if (operation.getResponses() != null && !operation.getResponses().isEmpty()) { - Response methodResponse = findMethodResponse(operation.getResponses()); + Map.Entry methodResponse = findMethodResponse(operation.getResponses()); if (methodResponse != null) { - if (methodResponse.getSchema() != null) { - CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); - op.vendorExtensions.put("x-codegen-response", cm); - if(cm.datatype == "HttpContent") { - op.vendorExtensions.put("x-codegen-response-ishttpcontent", true); + String successCode = methodResponse.getKey(); + if ("default".equals(successCode)) { + op.successCode = Integer.parseInt(successCode); + } + Response response = methodResponse.getValue(); + if (response != null) { + if (response.getSchema() != null) { + CodegenProperty cm = fromProperty("response", response.getSchema()); + op.vendorExtensions.put("x-codegen-response", cm); + if (cm.datatype == "HttpContent") { + op.vendorExtensions.put("x-codegen-response-ishttpcontent", true); + } } } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ApexClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ApexClientCodegen.java index 41cc0b37270..e2c540f366d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ApexClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ApexClientCodegen.java @@ -284,7 +284,7 @@ public CodegenOperation fromOperation(String path, path, httpMethod, operation, definitions, swagger); if (op.getHasExamples()) { // prepare examples for Apex test classes - Property responseProperty = findMethodResponse(operation.getResponses()).getSchema(); + Property responseProperty = findMethodResponse(operation.getResponses()).getValue().getSchema(); String deserializedExample = toExampleValue(responseProperty); for (Map example : op.examples) { example.put("example", escapeText(example.get("example"))); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java index 315a6f0f27e..83ebdd343cb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java @@ -237,15 +237,21 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger); if (operation.getResponses() != null && !operation.getResponses().isEmpty()) { - Response methodResponse = findMethodResponse(operation.getResponses()); + Map.Entry methodResponse = findMethodResponse(operation.getResponses()); if (methodResponse != null) { - if (methodResponse.getSchema() != null) { - CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); - op.vendorExtensions.put("x-codegen-response", cm); - if(cm.datatype == "HttpContent") - { - op.vendorExtensions.put("x-codegen-response-ishttpcontent", true); + String successCode = methodResponse.getKey(); + if ("default".equals(successCode)) { + op.successCode = Integer.parseInt(successCode); + } + Response response = methodResponse.getValue(); + if (response != null) { + if (response.getSchema() != null) { + CodegenProperty cm = fromProperty("response", response.getSchema()); + op.vendorExtensions.put("x-codegen-response", cm); + if (cm.datatype == "HttpContent") { + op.vendorExtensions.put("x-codegen-response-ishttpcontent", true); + } } } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java index aa4825fd590..0e196463712 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java @@ -158,14 +158,21 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger); if (operation.getResponses() != null && !operation.getResponses().isEmpty()) { - Response methodResponse = findMethodResponse(operation.getResponses()); + Map.Entry methodResponse = findMethodResponse(operation.getResponses()); if (methodResponse != null) { - if (methodResponse.getSchema() != null) { - CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); - op.vendorExtensions.put("x-codegen-response", cm); - if(cm.datatype == "HttpContent") { - op.vendorExtensions.put("x-codegen-response-ishttpcontent", true); + String successCode = methodResponse.getKey(); + if ("default".equals(successCode)) { + op.successCode = Integer.parseInt(successCode); + } + Response response = methodResponse.getValue(); + if (response != null) { + if (response.getSchema() != null) { + CodegenProperty cm = fromProperty("response", response.getSchema()); + op.vendorExtensions.put("x-codegen-response", cm); + if ("HttpContent".equals(cm.datatype)) { + op.vendorExtensions.put("x-codegen-response-ishttpcontent", true); + } } } } From 0c5929cefd9a73231535d6dcd2b110b98a9c36c8 Mon Sep 17 00:00:00 2001 From: Ignacio Molina Cuquerella Date: Fri, 16 Feb 2018 11:37:13 +0100 Subject: [PATCH 2/6] Add success code response support to play framework controller --- .../JavaPlayFramework/newApiController.mustache | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache index 906dbd59b8a..b7bc4751f62 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -5,6 +5,7 @@ package {{package}}; import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -221,18 +222,18 @@ public class {{classname}}Controller extends Controller { {{/returnType}} {{#returnType}} {{^isResponseFile}}JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status({{{successCode}}}, result); {{/isResponseFile}} {{#isResponseFile}} - return ok(obj); + return Results.status({{{successCode}}}, obj); {{/isResponseFile}} {{/returnType}} {{^returnType}} - return ok(); + return Results.status({{{successCode}}}); {{/returnType}} {{/controllerOnly}} {{#controllerOnly}} - return ok(); + return Results.status({{{successCode}}}); {{/controllerOnly}} } {{/operation}} From 5124bd38bd3d416ec219b193e4d89f211e0ca31a Mon Sep 17 00:00:00 2001 From: Ignacio Molina Cuquerella Date: Fri, 16 Feb 2018 11:37:36 +0100 Subject: [PATCH 3/6] Update samples for java play framework --- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../public/swagger.json | 9 ++++----- .../controllers/AnotherFakeApiController.java | 3 ++- .../app/controllers/FakeApiController.java | 19 ++++++++++--------- .../FakeClassnameTags123ApiController.java | 3 ++- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../public/swagger.json | 18 +++++++++--------- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../public/swagger.json | 9 ++++----- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../public/swagger.json | 9 ++++----- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../public/swagger.json | 9 ++++----- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../public/swagger.json | 9 ++++----- .../app/controllers/PetApiController.java | 17 +++++++++-------- .../app/controllers/StoreApiController.java | 9 +++++---- .../app/controllers/UserApiController.java | 17 +++++++++-------- .../java-play-framework/public/swagger.json | 9 ++++----- 34 files changed, 231 insertions(+), 210 deletions(-) diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index eb903aaa762..0db61b2b226 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -47,7 +48,7 @@ public Result addPet() throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } @ApiAction @@ -59,7 +60,7 @@ public Result deletePet(Long petId) throws Exception { } else { apiKey = null; } - return ok(); + return Results.status(200); } @ApiAction @@ -76,7 +77,7 @@ public Result findPetsByStatus() throws Exception { status.add(curParam); } } - return ok(); + return Results.status(200); } @ApiAction @@ -93,12 +94,12 @@ public Result findPetsByTags() throws Exception { tags.add(curParam); } } - return ok(); + return Results.status(200); } @ApiAction public Result getPetById(Long petId) throws Exception { - return ok(); + return Results.status(200); } @ApiAction @@ -113,7 +114,7 @@ public Result updatePet() throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } @ApiAction @@ -132,7 +133,7 @@ public Result updatePetWithForm(Long petId) throws Exception { } else { status = null; } - return ok(); + return Results.status(200); } @ApiAction @@ -145,6 +146,6 @@ public Result uploadFile(Long petId) throws Exception { additionalMetadata = null; } Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - return ok(); + return Results.status(201); } } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java index 3482251783b..4d5c94e48cf 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -36,17 +37,17 @@ private StoreApiController(Configuration configuration) { @ApiAction public Result deleteOrder(String orderId) throws Exception { - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() throws Exception { - return ok(); + return Results.status(200); } @ApiAction public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - return ok(); + return Results.status(200); } @ApiAction @@ -61,6 +62,6 @@ public Result placeOrder() throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java index 862e317a341..1f10f9f5d80 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -46,7 +47,7 @@ public Result createUser() throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } @ApiAction @@ -63,7 +64,7 @@ public Result createUsersWithArrayInput() throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } @ApiAction @@ -80,17 +81,17 @@ public Result createUsersWithListInput() throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) throws Exception { - return ok(); + return Results.status(200); } @ApiAction public Result getUserByName(String username) throws Exception { - return ok(); + return Results.status(200); } @ApiAction @@ -109,12 +110,12 @@ public Result loginUser() throws Exception { } else { throw new IllegalArgumentException("'password' parameter is required"); } - return ok(); + return Results.status(200); } @ApiAction public Result logoutUser() throws Exception { - return ok(); + return Results.status(200); } @ApiAction @@ -129,6 +130,6 @@ public Result updateUser(String username) throws Exception { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-controller-only/public/swagger.json b/samples/server/petstore/java-play-framework-controller-only/public/swagger.json index 0f5defa6026..9c9cd798a17 100644 --- a/samples/server/petstore/java-play-framework-controller-only/public/swagger.json +++ b/samples/server/petstore/java-play-framework-controller-only/public/swagger.json @@ -13,7 +13,6 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, - "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", @@ -112,8 +111,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -307,7 +306,7 @@ "type" : "file" } ], "responses" : { - "200" : { + "201" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" @@ -588,7 +587,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java index a81d96a90a7..21d61fdcc62 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java @@ -4,6 +4,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -52,6 +53,6 @@ public Result testSpecialTags() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 2519b8ff355..cac5245676a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -8,6 +8,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -53,7 +54,7 @@ public Result fakeOuterBooleanSerialize() throws Exception { } Boolean obj = imp.fakeOuterBooleanSerialize(body); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -73,7 +74,7 @@ public Result fakeOuterCompositeSerialize() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -93,7 +94,7 @@ public Result fakeOuterNumberSerialize() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -110,7 +111,7 @@ public Result fakeOuterStringSerialize() throws Exception { } String obj = imp.fakeOuterStringSerialize(body); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -130,7 +131,7 @@ public Result testClientModel() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -234,7 +235,7 @@ public Result testEndpointParameters() throws Exception { paramCallback = null; } imp.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); - return ok(); + return Results.status(200); } @ApiAction @@ -302,7 +303,7 @@ public Result testEnumParameters() throws Exception { enumHeaderString = "-efg"; } imp.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble); - return ok(); + return Results.status(200); } @ApiAction @@ -318,7 +319,7 @@ public Result testInlineAdditionalProperties() throws Exception { throw new IllegalArgumentException("'param' parameter is required"); } imp.testInlineAdditionalProperties(param); - return ok(); + return Results.status(200); } @ApiAction @@ -338,6 +339,6 @@ public Result testJsonFormData() throws Exception { throw new IllegalArgumentException("'param2' parameter is required"); } imp.testJsonFormData(param, param2); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java index 89c227fa5db..aeeefdf709f 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java @@ -4,6 +4,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -52,6 +53,6 @@ public Result testClassname() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 2ce9fd28863..08be705180a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -50,7 +51,7 @@ public Result addPet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -63,7 +64,7 @@ public Result deletePet(Long petId) throws Exception { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @ApiAction @@ -87,7 +88,7 @@ public Result findPetsByStatus() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -111,7 +112,7 @@ public Result findPetsByTags() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -121,7 +122,7 @@ public Result getPetById(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -137,7 +138,7 @@ public Result updatePet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -157,7 +158,7 @@ public Result updatePetWithForm(Long petId) throws Exception { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @ApiAction @@ -175,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java index c94c5aa111a..29d3a5e93bb 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -39,14 +40,14 @@ private StoreApiController(Configuration configuration, StoreApiControllerImpInt @ApiAction public Result deleteOrder(String orderId) throws Exception { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() throws Exception { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -56,7 +57,7 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -76,6 +77,6 @@ public Result placeOrder() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java index 245d076858a..b4e24a7dc37 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public Result createUser() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @ApiAction @@ -67,7 +68,7 @@ public Result createUsersWithArrayInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @ApiAction @@ -85,13 +86,13 @@ public Result createUsersWithListInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) throws Exception { imp.deleteUser(username); - return ok(); + return Results.status(200); } @ApiAction @@ -101,7 +102,7 @@ public Result getUserByName(String username) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -122,13 +123,13 @@ public Result loginUser() throws Exception { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result logoutUser() throws Exception { imp.logoutUser(); - return ok(); + return Results.status(200); } @ApiAction @@ -144,6 +145,6 @@ public Result updateUser(String username) throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json b/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json index d23a6018638..dca4e4b58a9 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json +++ b/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -588,7 +588,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], @@ -711,8 +711,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_form_string", @@ -730,8 +730,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_header_string", @@ -749,8 +749,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_query_string", diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 6c4a7ca9247..354163a18d0 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -43,7 +44,7 @@ public Result addPet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -56,7 +57,7 @@ public Result deletePet(Long petId) throws Exception { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @ApiAction @@ -75,7 +76,7 @@ public Result findPetsByStatus() throws Exception { } List obj = imp.findPetsByStatus(status); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -94,14 +95,14 @@ public Result findPetsByTags() throws Exception { } List obj = imp.findPetsByTags(tags); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result getPetById(Long petId) throws Exception { Pet obj = imp.getPetById(petId); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -114,7 +115,7 @@ public Result updatePet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -134,7 +135,7 @@ public Result updatePetWithForm(Long petId) throws Exception { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @ApiAction @@ -149,6 +150,6 @@ public Result uploadFile(Long petId) throws Exception { Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(201, result); } } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java index b297256a2c9..82b3f21d1a5 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -35,21 +36,21 @@ private StoreApiController(StoreApiControllerImpInterface imp) { @ApiAction public Result deleteOrder(String orderId) throws Exception { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() throws Exception { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result getOrderById(Long orderId) throws Exception { Order obj = imp.getOrderById(orderId); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -63,6 +64,6 @@ public Result placeOrder() throws Exception { } Order obj = imp.placeOrder(body); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java index d186137d39c..00ddd1aaf91 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -42,7 +43,7 @@ public Result createUser() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @ApiAction @@ -55,7 +56,7 @@ public Result createUsersWithArrayInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @ApiAction @@ -68,20 +69,20 @@ public Result createUsersWithListInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) throws Exception { imp.deleteUser(username); - return ok(); + return Results.status(200); } @ApiAction public Result getUserByName(String username) throws Exception { User obj = imp.getUserByName(username); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -102,13 +103,13 @@ public Result loginUser() throws Exception { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result logoutUser() throws Exception { imp.logoutUser(); - return ok(); + return Results.status(200); } @ApiAction @@ -121,6 +122,6 @@ public Result updateUser(String username) throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json index 0f5defa6026..9c9cd798a17 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json @@ -13,7 +13,6 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, - "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", @@ -112,8 +111,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -307,7 +306,7 @@ "type" : "file" } ], "responses" : { - "200" : { + "201" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" @@ -588,7 +587,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index c6a88baf4dc..3ed61757738 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -51,7 +52,7 @@ public Result addPet() throws IOException { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -64,7 +65,7 @@ public Result deletePet(Long petId) { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @ApiAction @@ -88,7 +89,7 @@ public Result findPetsByStatus() { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -112,7 +113,7 @@ public Result findPetsByTags() { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -122,7 +123,7 @@ public Result getPetById(Long petId) { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -138,7 +139,7 @@ public Result updatePet() throws IOException { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -158,7 +159,7 @@ public Result updatePetWithForm(Long petId) { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @ApiAction @@ -176,6 +177,6 @@ public Result uploadFile(Long petId) { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(201, result); } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java index e98dea01e40..bdcd0fa3fb6 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -40,14 +41,14 @@ private StoreApiController(Configuration configuration, StoreApiControllerImpInt @ApiAction public Result deleteOrder(String orderId) { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -57,7 +58,7 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -77,6 +78,6 @@ public Result placeOrder() throws IOException { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java index 2afd562c7c8..17132d57bca 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -50,7 +51,7 @@ public Result createUser() throws IOException { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @ApiAction @@ -68,7 +69,7 @@ public Result createUsersWithArrayInput() throws IOException { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @ApiAction @@ -86,13 +87,13 @@ public Result createUsersWithListInput() throws IOException { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) { imp.deleteUser(username); - return ok(); + return Results.status(200); } @ApiAction @@ -102,7 +103,7 @@ public Result getUserByName(String username) { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -123,13 +124,13 @@ public Result loginUser() { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result logoutUser() { imp.logoutUser(); - return ok(); + return Results.status(200); } @ApiAction @@ -145,6 +146,6 @@ public Result updateUser(String username) throws IOException { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json index 0f5defa6026..9c9cd798a17 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json @@ -13,7 +13,6 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, - "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", @@ -112,8 +111,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -307,7 +306,7 @@ "type" : "file" } ], "responses" : { - "200" : { + "201" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" @@ -588,7 +587,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index 24f88d0a261..4980a9f3c82 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -50,7 +51,7 @@ public Result addPet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -63,7 +64,7 @@ public Result deletePet(Long petId) throws Exception { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @ApiAction @@ -87,7 +88,7 @@ public Result findPetsByStatus() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -111,7 +112,7 @@ public Result findPetsByTags() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -121,7 +122,7 @@ public Result getPetById(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -137,7 +138,7 @@ public Result updatePet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -157,7 +158,7 @@ public Result updatePetWithForm(Long petId) throws Exception { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @ApiAction @@ -175,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(201, result); } } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java index e5829bb4d81..da42f020487 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -39,14 +40,14 @@ private StoreApiController(Configuration configuration, StoreApiControllerImp im @ApiAction public Result deleteOrder(String orderId) throws Exception { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() throws Exception { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -56,7 +57,7 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -76,6 +77,6 @@ public Result placeOrder() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java index 8bb48133af9..f593e3706d6 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public Result createUser() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @ApiAction @@ -67,7 +68,7 @@ public Result createUsersWithArrayInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @ApiAction @@ -85,13 +86,13 @@ public Result createUsersWithListInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) throws Exception { imp.deleteUser(username); - return ok(); + return Results.status(200); } @ApiAction @@ -101,7 +102,7 @@ public Result getUserByName(String username) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -122,13 +123,13 @@ public Result loginUser() throws Exception { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result logoutUser() throws Exception { imp.logoutUser(); - return ok(); + return Results.status(200); } @ApiAction @@ -144,6 +145,6 @@ public Result updateUser(String username) throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json index 0f5defa6026..9c9cd798a17 100644 --- a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json @@ -13,7 +13,6 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, - "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", @@ -112,8 +111,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -307,7 +306,7 @@ "type" : "file" } ], "responses" : { - "200" : { + "201" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" @@ -588,7 +587,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 2ce9fd28863..8c6aa4d76ab 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -50,7 +51,7 @@ public Result addPet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -63,7 +64,7 @@ public Result deletePet(Long petId) throws Exception { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @ApiAction @@ -87,7 +88,7 @@ public Result findPetsByStatus() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -111,7 +112,7 @@ public Result findPetsByTags() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -121,7 +122,7 @@ public Result getPetById(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -137,7 +138,7 @@ public Result updatePet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -157,7 +158,7 @@ public Result updatePetWithForm(Long petId) throws Exception { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @ApiAction @@ -175,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(201, result); } } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java index c94c5aa111a..29d3a5e93bb 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -39,14 +40,14 @@ private StoreApiController(Configuration configuration, StoreApiControllerImpInt @ApiAction public Result deleteOrder(String orderId) throws Exception { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() throws Exception { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -56,7 +57,7 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -76,6 +77,6 @@ public Result placeOrder() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java index 245d076858a..b4e24a7dc37 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public Result createUser() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @ApiAction @@ -67,7 +68,7 @@ public Result createUsersWithArrayInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @ApiAction @@ -85,13 +86,13 @@ public Result createUsersWithListInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) throws Exception { imp.deleteUser(username); - return ok(); + return Results.status(200); } @ApiAction @@ -101,7 +102,7 @@ public Result getUserByName(String username) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -122,13 +123,13 @@ public Result loginUser() throws Exception { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result logoutUser() throws Exception { imp.logoutUser(); - return ok(); + return Results.status(200); } @ApiAction @@ -144,6 +145,6 @@ public Result updateUser(String username) throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index 7bbe23c4bc4..ca072300b65 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public Result addPet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @@ -62,7 +63,7 @@ public Result deletePet(Long petId) throws Exception { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @@ -86,7 +87,7 @@ public Result findPetsByStatus() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @@ -110,7 +111,7 @@ public Result findPetsByTags() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @@ -120,7 +121,7 @@ public Result getPetById(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @@ -136,7 +137,7 @@ public Result updatePet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @@ -156,7 +157,7 @@ public Result updatePetWithForm(Long petId) throws Exception { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @@ -174,6 +175,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(201, result); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java index 16a3e3c8efa..850f519ee50 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -38,14 +39,14 @@ private StoreApiController(Configuration configuration, StoreApiControllerImpInt public Result deleteOrder(String orderId) throws Exception { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } public Result getInventory() throws Exception { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @@ -55,7 +56,7 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @@ -75,6 +76,6 @@ public Result placeOrder() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java index 596ce528fff..3a107f0997f 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -48,7 +49,7 @@ public Result createUser() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @@ -66,7 +67,7 @@ public Result createUsersWithArrayInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @@ -84,13 +85,13 @@ public Result createUsersWithListInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } public Result deleteUser(String username) throws Exception { imp.deleteUser(username); - return ok(); + return Results.status(200); } @@ -100,7 +101,7 @@ public Result getUserByName(String username) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @@ -121,13 +122,13 @@ public Result loginUser() throws Exception { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } public Result logoutUser() throws Exception { imp.logoutUser(); - return ok(); + return Results.status(200); } @@ -143,6 +144,6 @@ public Result updateUser(String username) throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json index 0f5defa6026..9c9cd798a17 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json @@ -13,7 +13,6 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, - "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", @@ -112,8 +111,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -307,7 +306,7 @@ "type" : "file" } ], "responses" : { - "200" : { + "201" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" @@ -588,7 +587,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 2ce9fd28863..8c6aa4d76ab 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -6,6 +6,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -50,7 +51,7 @@ public Result addPet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -63,7 +64,7 @@ public Result deletePet(Long petId) throws Exception { apiKey = null; } imp.deletePet(petId, apiKey); - return ok(); + return Results.status(200); } @ApiAction @@ -87,7 +88,7 @@ public Result findPetsByStatus() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -111,7 +112,7 @@ public Result findPetsByTags() throws Exception { } } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -121,7 +122,7 @@ public Result getPetById(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -137,7 +138,7 @@ public Result updatePet() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(body); - return ok(); + return Results.status(200); } @ApiAction @@ -157,7 +158,7 @@ public Result updatePetWithForm(Long petId) throws Exception { status = null; } imp.updatePetWithForm(petId, name, status); - return ok(); + return Results.status(200); } @ApiAction @@ -175,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(201, result); } } diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java index c94c5aa111a..29d3a5e93bb 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -39,14 +40,14 @@ private StoreApiController(Configuration configuration, StoreApiControllerImpInt @ApiAction public Result deleteOrder(String orderId) throws Exception { imp.deleteOrder(orderId); - return ok(); + return Results.status(200); } @ApiAction public Result getInventory() throws Exception { Map obj = imp.getInventory(); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -56,7 +57,7 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -76,6 +77,6 @@ public Result placeOrder() throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java index 245d076858a..b4e24a7dc37 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -5,6 +5,7 @@ import play.mvc.Controller; import play.mvc.Result; +import play.mvc.Results; import play.mvc.Http; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public Result createUser() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(body); - return ok(); + return Results.status(200); } @ApiAction @@ -67,7 +68,7 @@ public Result createUsersWithArrayInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(body); - return ok(); + return Results.status(200); } @ApiAction @@ -85,13 +86,13 @@ public Result createUsersWithListInput() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(body); - return ok(); + return Results.status(200); } @ApiAction public Result deleteUser(String username) throws Exception { imp.deleteUser(username); - return ok(); + return Results.status(200); } @ApiAction @@ -101,7 +102,7 @@ public Result getUserByName(String username) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction @@ -122,13 +123,13 @@ public Result loginUser() throws Exception { } String obj = imp.loginUser(username, password); JsonNode result = mapper.valueToTree(obj); - return ok(result); + return Results.status(200, result); } @ApiAction public Result logoutUser() throws Exception { imp.logoutUser(); - return ok(); + return Results.status(200); } @ApiAction @@ -144,6 +145,6 @@ public Result updateUser(String username) throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(username, body); - return ok(); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework/public/swagger.json b/samples/server/petstore/java-play-framework/public/swagger.json index 0f5defa6026..9c9cd798a17 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -13,7 +13,6 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, - "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", @@ -112,8 +111,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -307,7 +306,7 @@ "type" : "file" } ], "responses" : { - "200" : { + "201" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" @@ -588,7 +587,7 @@ "parameters" : [ { "name" : "username", "in" : "path", - "description" : "The name that needs to be fetched. Use user1 for testing. ", + "description" : "The name that needs to be fetched. Use user1 for testing.", "required" : true, "type" : "string" } ], From bf8ee909c5d05909086cf16aaae2a9f70f046b9a Mon Sep 17 00:00:00 2001 From: Ignacio Molina Cuquerella Date: Fri, 16 Feb 2018 12:01:21 +0100 Subject: [PATCH 4/6] Fix default response condition bug --- .../java/io/swagger/codegen/languages/AbstractAdaCodegen.java | 2 +- .../java/io/swagger/codegen/languages/CppRestClientCodegen.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java index 306f982b0bf..82e101a0eca 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractAdaCodegen.java @@ -387,7 +387,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation if (methodResponse != null) { String successCode = methodResponse.getKey(); - if ("default".equals(successCode)) { + if (!"default".equals(successCode)) { op.successCode = Integer.parseInt(successCode); } Response response = methodResponse.getValue(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java index 83ebdd343cb..e35419ffa35 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java @@ -241,7 +241,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation if (methodResponse != null) { String successCode = methodResponse.getKey(); - if ("default".equals(successCode)) { + if (!"default".equals(successCode)) { op.successCode = Integer.parseInt(successCode); } Response response = methodResponse.getValue(); From 177b0d2dbf86ddaaab4bf17dfbc3c6e1eb86ef5f Mon Sep 17 00:00:00 2001 From: Ignacio Molina Cuquerella Date: Fri, 16 Feb 2018 14:12:01 +0100 Subject: [PATCH 5/6] Regenerate samples for java play framework --- .../app/controllers/PetApiController.java | 2 +- .../java-play-framework-controller-only/public/swagger.json | 2 +- .../app/controllers/PetApiController.java | 2 +- .../java-play-framework-no-bean-validation/public/swagger.json | 2 +- .../app/controllers/PetApiController.java | 2 +- .../public/swagger.json | 2 +- .../app/controllers/PetApiController.java | 2 +- .../java-play-framework-no-interface/public/swagger.json | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../java-play-framework-no-wrap-calls/public/swagger.json | 2 +- .../java-play-framework/app/controllers/PetApiController.java | 2 +- samples/server/petstore/java-play-framework/public/swagger.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index 0db61b2b226..4e4e5954cd7 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -146,6 +146,6 @@ public Result uploadFile(Long petId) throws Exception { additionalMetadata = null; } Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - return Results.status(201); + return Results.status(200); } } diff --git a/samples/server/petstore/java-play-framework-controller-only/public/swagger.json b/samples/server/petstore/java-play-framework-controller-only/public/swagger.json index 9c9cd798a17..3ab9cda2ce8 100644 --- a/samples/server/petstore/java-play-framework-controller-only/public/swagger.json +++ b/samples/server/petstore/java-play-framework-controller-only/public/swagger.json @@ -306,7 +306,7 @@ "type" : "file" } ], "responses" : { - "201" : { + "200" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 354163a18d0..5d8096539e1 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -150,6 +150,6 @@ public Result uploadFile(Long petId) throws Exception { Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); JsonNode result = mapper.valueToTree(obj); - return Results.status(201, result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json index 9c9cd798a17..3ab9cda2ce8 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json @@ -306,7 +306,7 @@ "type" : "file" } ], "responses" : { - "201" : { + "200" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index 3ed61757738..52d92245684 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -177,6 +177,6 @@ public Result uploadFile(Long petId) { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return Results.status(201, result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json index 9c9cd798a17..3ab9cda2ce8 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json @@ -306,7 +306,7 @@ "type" : "file" } ], "responses" : { - "201" : { + "200" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index 4980a9f3c82..b39ed4280e1 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -176,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return Results.status(201, result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json index 9c9cd798a17..3ab9cda2ce8 100644 --- a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json @@ -306,7 +306,7 @@ "type" : "file" } ], "responses" : { - "201" : { + "200" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 8c6aa4d76ab..08be705180a 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -176,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return Results.status(201, result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index ca072300b65..19e8c8aa20c 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -175,6 +175,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return Results.status(201, result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json index 9c9cd798a17..3ab9cda2ce8 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json @@ -306,7 +306,7 @@ "type" : "file" } ], "responses" : { - "201" : { + "200" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 8c6aa4d76ab..08be705180a 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -176,6 +176,6 @@ public Result uploadFile(Long petId) throws Exception { SwaggerUtils.validate(obj); } JsonNode result = mapper.valueToTree(obj); - return Results.status(201, result); + return Results.status(200, result); } } diff --git a/samples/server/petstore/java-play-framework/public/swagger.json b/samples/server/petstore/java-play-framework/public/swagger.json index 9c9cd798a17..3ab9cda2ce8 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -306,7 +306,7 @@ "type" : "file" } ], "responses" : { - "201" : { + "200" : { "description" : "successful operation", "schema" : { "$ref" : "#/definitions/ApiResponse" From 9e384abbaa5b4873296eb0ae56bc16e9082e72b6 Mon Sep 17 00:00:00 2001 From: Ignacio Molina Cuquerella Date: Thu, 1 Mar 2018 08:55:03 +0100 Subject: [PATCH 6/6] Fix bug in PistacheServerCodegen --- .../io/swagger/codegen/languages/PistacheServerCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java index 0e196463712..998ea78f78a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java @@ -162,7 +162,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation if (methodResponse != null) { String successCode = methodResponse.getKey(); - if ("default".equals(successCode)) { + if (!"default".equals(successCode)) { op.successCode = Integer.parseInt(successCode); } Response response = methodResponse.getValue();