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 d551e3d9feb..9040be70761 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 @@ -1985,20 +1985,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; } /** @@ -2133,80 +2133,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 bf326490cf4..fc0eb31c209 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 @@ -376,14 +376,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 64d47bb500f..f875c582fa4 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 @@ -230,15 +230,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..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 @@ -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); + } } } } diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache index d492b376d0c..45f7670bccf 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; @@ -257,22 +258,22 @@ public class {{classname}}Controller extends Controller { stage.thenApply(obj -> { {{/supportAsync}} {{^isResponseFile}} - {{#supportAsync}} {{/supportAsync}}JsonNode result = mapper.valueToTree(obj); - {{#supportAsync}} {{/supportAsync}}return ok(result); + {{#supportAsync}} {{/supportAsync}}JsonNode result = mapper.valueToTree(obj); + {{#supportAsync}} {{/supportAsync}}return Results.status({{{successCode}}}, result); {{/isResponseFile}} {{#isResponseFile}} - {{#supportAsync}} {{/supportAsync}}return ok(obj); + {{#supportAsync}} {{/supportAsync}}return Results.status({{{successCode}}}, obj); {{/isResponseFile}} {{/returnType}} {{^returnType}} - {{#supportAsync}} {{/supportAsync}}return ok(); + {{#supportAsync}} {{/supportAsync}}return Results.status({{{successCode}}}); {{/returnType}} {{#supportAsync}} }); {{/supportAsync}} {{/controllerOnly}} {{#controllerOnly}} - return ok(); + return Results.status({{{successCode}}}); {{/controllerOnly}} } {{/operation}} diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java index d5ab1946282..6ece34f2f07 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-async/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; @@ -54,7 +55,7 @@ public CompletionStage addPet() throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.addPet(body) - return ok(); + return Results.status(200); }); } @@ -69,7 +70,7 @@ public CompletionStage deletePet(Long petId) throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.deletePet(petId, apiKey) - return ok(); + return Results.status(200); }); } @@ -96,8 +97,8 @@ public CompletionStage findPetsByStatus() throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -124,8 +125,8 @@ public CompletionStage findPetsByTags() throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -138,8 +139,8 @@ public CompletionStage getPetById(Long petId) throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -157,7 +158,7 @@ public CompletionStage updatePet() throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.updatePet(body) - return ok(); + return Results.status(200); }); } @@ -179,7 +180,7 @@ public CompletionStage updatePetWithForm(Long petId) throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.updatePetWithForm(petId, name, status) - return ok(); + return Results.status(200); }); } @@ -200,8 +201,8 @@ public CompletionStage uploadFile(Long petId) throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java index 74c34d1fc5e..921fbdd0871 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-async/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; @@ -43,7 +44,7 @@ private StoreApiController(Configuration configuration, StoreApiControllerImpInt public CompletionStage deleteOrder(String orderId) throws Exception { return CompletableFuture.supplyAsync(() -> { imp.deleteOrder(orderId) - return ok(); + return Results.status(200); }); } @@ -53,8 +54,8 @@ public CompletionStage getInventory() throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -67,8 +68,8 @@ public CompletionStage getOrderById( @Min(1) @Max(5)Long orderId) throws return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -91,8 +92,8 @@ public CompletionStage placeOrder() throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java index fce7743435f..df6b75b53fe 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-async/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; @@ -53,7 +54,7 @@ public CompletionStage createUser() throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.createUser(body) - return ok(); + return Results.status(200); }); } @@ -73,7 +74,7 @@ public CompletionStage createUsersWithArrayInput() throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.createUsersWithArrayInput(body) - return ok(); + return Results.status(200); }); } @@ -93,7 +94,7 @@ public CompletionStage createUsersWithListInput() throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.createUsersWithListInput(body) - return ok(); + return Results.status(200); }); } @@ -101,7 +102,7 @@ public CompletionStage createUsersWithListInput() throws Exception { public CompletionStage deleteUser(String username) throws Exception { return CompletableFuture.supplyAsync(() -> { imp.deleteUser(username) - return ok(); + return Results.status(200); }); } @@ -114,8 +115,8 @@ public CompletionStage getUserByName(String username) throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -139,8 +140,8 @@ public CompletionStage loginUser() throws Exception { return obj; }); stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); }); } @@ -148,7 +149,7 @@ public CompletionStage loginUser() throws Exception { public CompletionStage logoutUser() throws Exception { return CompletableFuture.supplyAsync(() -> { imp.logoutUser() - return ok(); + return Results.status(200); }); } @@ -166,7 +167,7 @@ public CompletionStage updateUser(String username) throws Exception { } return CompletableFuture.supplyAsync(() -> { imp.updateUser(username, body) - return ok(); + return Results.status(200); }); } } diff --git a/samples/server/petstore/java-play-framework-async/public/swagger.json b/samples/server/petstore/java-play-framework-async/public/swagger.json index 3ab9cda2ce8..930d19f08ae 100644 --- a/samples/server/petstore/java-play-framework-async/public/swagger.json +++ b/samples/server/petstore/java-play-framework-async/public/swagger.json @@ -13,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", 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..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 @@ -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(200); } } 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 3ab9cda2ce8..930d19f08ae 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,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java index 8b202da4f10..861a7e57777 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java @@ -48,6 +48,42 @@ public static EnumStringEnum fromValue(String text) { @JsonProperty("enum_string") private EnumStringEnum enumString = null; + /** + * Gets or Sets enumStringRequired + */ + public enum EnumStringRequiredEnum { + UPPER("UPPER"), + + LOWER("lower"), + + EMPTY(""); + + private final String value; + + EnumStringRequiredEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static EnumStringRequiredEnum fromValue(String text) { + for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + return null; + } + } + + @JsonProperty("enum_string_required") + private EnumStringRequiredEnum enumStringRequired = null; + /** * Gets or Sets enumInteger */ @@ -136,6 +172,24 @@ public void setEnumString(EnumStringEnum enumString) { this.enumString = enumString; } + public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { + this.enumStringRequired = enumStringRequired; + return this; + } + + /** + * Get enumStringRequired + * @return enumStringRequired + **/ + @NotNull + public EnumStringRequiredEnum getEnumStringRequired() { + return enumStringRequired; + } + + public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) { + this.enumStringRequired = enumStringRequired; + } + public EnumTest enumInteger(EnumIntegerEnum enumInteger) { this.enumInteger = enumInteger; return this; @@ -199,6 +253,7 @@ public boolean equals(java.lang.Object o) { } EnumTest enumTest = (EnumTest) o; return Objects.equals(enumString, enumTest.enumString) && + Objects.equals(enumStringRequired, enumTest.enumStringRequired) && Objects.equals(enumInteger, enumTest.enumInteger) && Objects.equals(enumNumber, enumTest.enumNumber) && Objects.equals(outerEnum, enumTest.outerEnum); @@ -206,7 +261,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(enumString, enumInteger, enumNumber, outerEnum); + return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum); } @SuppressWarnings("StringBufferReplaceableByString") @@ -216,6 +271,7 @@ public String toString() { sb.append("class EnumTest {\n"); sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); + sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n"); sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); 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..daecbf8bc47 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; @@ -51,7 +52,7 @@ public Result testSpecialTags() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..4f94043c843 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 @@ -5,9 +5,11 @@ import java.time.LocalDate; import java.time.OffsetDateTime; import apimodels.OuterComposite; +import apimodels.User; 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,8 +54,8 @@ public Result fakeOuterBooleanSerialize() throws Exception { body = null; } Boolean obj = imp.fakeOuterBooleanSerialize(body); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -72,8 +74,8 @@ public Result fakeOuterCompositeSerialize() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -92,8 +94,8 @@ public Result fakeOuterNumberSerialize() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -109,8 +111,31 @@ public Result fakeOuterStringSerialize() throws Exception { body = null; } String obj = imp.fakeOuterStringSerialize(body); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); + } + + @ApiAction + public Result testBodyWithQueryParams() throws Exception { + JsonNode nodebody = request().body().asJson(); + User body; + if (nodebody != null) { + body = mapper.readValue(nodebody.toString(), User.class); + if (configuration.getBoolean("useInputBeanValidation")) { + SwaggerUtils.validate(body); + } + } else { + throw new IllegalArgumentException("'body' parameter is required"); + } + String valuequery = request().getQueryString("query"); + String query; + if (valuequery != null) { + query = valuequery; + } else { + throw new IllegalArgumentException("'query' parameter is required"); + } + imp.testBodyWithQueryParams(body, query); + return Results.status(200); } @ApiAction @@ -129,8 +154,8 @@ public Result testClientModel() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -234,7 +259,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 +327,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 +343,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 +363,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/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java index f4d890300e1..5f61e52dde0 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java @@ -5,6 +5,7 @@ import java.time.LocalDate; import java.time.OffsetDateTime; import apimodels.OuterComposite; +import apimodels.User; import play.mvc.Http; import java.util.List; @@ -38,6 +39,11 @@ public String fakeOuterStringSerialize(String body) throws Exception { return new String(); } + @Override + public void testBodyWithQueryParams(User body, @NotNull String query) throws Exception { + //Do your magic!!! + } + @Override public Client testClientModel(Client body) throws Exception { //Do your magic!!! diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java index 48828746e09..d13ccc3658e 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java @@ -5,6 +5,7 @@ import java.time.LocalDate; import java.time.OffsetDateTime; import apimodels.OuterComposite; +import apimodels.User; import play.mvc.Http; import java.util.List; @@ -23,6 +24,8 @@ public interface FakeApiControllerImpInterface { String fakeOuterStringSerialize(String body) throws Exception; + void testBodyWithQueryParams(User body, @NotNull String query) throws Exception; + Client testClientModel(Client body) throws Exception; void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception; 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..ca1f16c3efa 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; @@ -51,7 +52,7 @@ public Result testClassname() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..2d46b993a32 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 @@ -86,8 +87,8 @@ public Result findPetsByStatus() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -110,8 +111,8 @@ public Result findPetsByTags() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -120,8 +121,8 @@ public Result getPetById(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 @@ -174,7 +175,7 @@ public Result uploadFile(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..d3446cde809 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -55,8 +56,8 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -75,7 +76,7 @@ public Result placeOrder() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..545fdef9cd9 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 @@ -100,8 +101,8 @@ public Result getUserByName(String username) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -121,14 +122,14 @@ public Result loginUser() throws Exception { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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/conf/routes b/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes index 6a342645b5d..de7b52199cb 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes +++ b/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes @@ -13,6 +13,7 @@ POST /v2/fake/outer/boolean controllers.FakeApiControlle POST /v2/fake/outer/composite controllers.FakeApiController.fakeOuterCompositeSerialize() POST /v2/fake/outer/number controllers.FakeApiController.fakeOuterNumberSerialize() POST /v2/fake/outer/string controllers.FakeApiController.fakeOuterStringSerialize() +PUT /v2/fake/body-with-query-params controllers.FakeApiController.testBodyWithQueryParams() PATCH /v2/fake controllers.FakeApiController.testClientModel() POST /v2/fake controllers.FakeApiController.testEndpointParameters() GET /v2/fake controllers.FakeApiController.testEnumParameters() 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 dca4e4b58a9..0b4559fc0a5 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 @@ -551,7 +551,7 @@ "X-Expires-After" : { "type" : "string", "format" : "date-time", - "description" : "date in UTC when toekn expires" + "description" : "date in UTC when token expires" } } }, @@ -668,6 +668,7 @@ "patch" : { "tags" : [ "fake_classname_tags 123#$%^" ], "summary" : "To test class name in snake case", + "description" : "To test class name in snake case", "operationId" : "testClassname", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], @@ -1107,6 +1108,33 @@ "x-accepts" : "application/json" } }, + "/fake/body-with-query-params" : { + "put" : { + "tags" : [ "fake" ], + "operationId" : "testBodyWithQueryParams", + "consumes" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "required" : true, + "schema" : { + "$ref" : "#/definitions/User" + } + }, { + "name" : "query", + "in" : "query", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "Success" + } + }, + "x-contentType" : "application/json", + "x-accepts" : "application/json" + } + }, "/another-fake/dummy" : { "patch" : { "tags" : [ "$another-fake?" ], @@ -1561,11 +1589,16 @@ }, "Enum_Test" : { "type" : "object", + "required" : [ "enum_string_required" ], "properties" : { "enum_string" : { "type" : "string", "enum" : [ "UPPER", "lower", "" ] }, + "enum_string_required" : { + "type" : "string", + "enum" : [ "UPPER", "lower", "" ] + }, "enum_integer" : { "type" : "integer", "format" : "int32", 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..8928f280a7c 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 @@ -74,8 +75,8 @@ public Result findPetsByStatus() throws Exception { } } List obj = imp.findPetsByStatus(status); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -93,15 +94,15 @@ public Result findPetsByTags() throws Exception { } } List obj = imp.findPetsByTags(tags); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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); + JsonNode result = mapper.valueToTree(obj); + 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 @@ -148,7 +149,7 @@ 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, 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..e91ce51b23a 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); + JsonNode result = mapper.valueToTree(obj); + 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -62,7 +63,7 @@ public Result placeOrder() throws Exception { throw new IllegalArgumentException("'body' parameter is required"); } Order obj = imp.placeOrder(body); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..01d983d52d8 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -101,14 +102,14 @@ public Result loginUser() throws Exception { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 3ab9cda2ce8..930d19f08ae 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,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", 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..f904481f919 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 @@ -87,8 +88,8 @@ public Result findPetsByStatus() { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -111,8 +112,8 @@ public Result findPetsByTags() { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -121,8 +122,8 @@ public Result getPetById(Long petId) { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 @@ -175,7 +176,7 @@ public Result uploadFile(Long petId) { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, 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..3023c087a58 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -56,8 +57,8 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -76,7 +77,7 @@ public Result placeOrder() throws IOException { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..7debcb02d54 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 @@ -101,8 +102,8 @@ public Result getUserByName(String username) { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -122,14 +123,14 @@ public Result loginUser() { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 3ab9cda2ce8..930d19f08ae 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,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", 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..e094b91bb9f 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 @@ -86,8 +87,8 @@ public Result findPetsByStatus() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -110,8 +111,8 @@ public Result findPetsByTags() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -120,8 +121,8 @@ public Result getPetById(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 @@ -174,7 +175,7 @@ public Result uploadFile(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, 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..0b7e8575af0 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -55,8 +56,8 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -75,7 +76,7 @@ public Result placeOrder() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..b270ac0970b 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 @@ -100,8 +101,8 @@ public Result getUserByName(String username) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -121,14 +122,14 @@ public Result loginUser() throws Exception { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 3ab9cda2ce8..930d19f08ae 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,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", 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..2d46b993a32 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 @@ -86,8 +87,8 @@ public Result findPetsByStatus() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -110,8 +111,8 @@ public Result findPetsByTags() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -120,8 +121,8 @@ public Result getPetById(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 @@ -174,7 +175,7 @@ public Result uploadFile(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, 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..d3446cde809 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -55,8 +56,8 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -75,7 +76,7 @@ public Result placeOrder() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..545fdef9cd9 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 @@ -100,8 +101,8 @@ public Result getUserByName(String username) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -121,14 +122,14 @@ public Result loginUser() throws Exception { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..2a895206fa7 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); } @@ -85,8 +86,8 @@ public Result findPetsByStatus() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @@ -109,8 +110,8 @@ public Result findPetsByTags() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @@ -119,8 +120,8 @@ public Result getPetById(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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); } @@ -173,7 +174,7 @@ public Result uploadFile(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, 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..0e6ac630246 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @@ -54,8 +55,8 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @@ -74,7 +75,7 @@ public Result placeOrder() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..0db63ec2f9d 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); } @@ -99,8 +100,8 @@ public Result getUserByName(String username) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @@ -120,14 +121,14 @@ public Result loginUser() throws Exception { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 3ab9cda2ce8..930d19f08ae 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,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet", 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..2d46b993a32 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 @@ -86,8 +87,8 @@ public Result findPetsByStatus() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -110,8 +111,8 @@ public Result findPetsByTags() throws Exception { SwaggerUtils.validate(curItem); } } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -120,8 +121,8 @@ public Result getPetById(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 @@ -174,7 +175,7 @@ public Result uploadFile(Long petId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, 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..d3446cde809 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); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -55,8 +56,8 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -75,7 +76,7 @@ public Result placeOrder() throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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..545fdef9cd9 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 @@ -100,8 +101,8 @@ public Result getUserByName(String username) throws Exception { if (configuration.getBoolean("useOutputBeanValidation")) { SwaggerUtils.validate(obj); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + return Results.status(200, result); } @ApiAction @@ -121,14 +122,14 @@ public Result loginUser() throws Exception { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + JsonNode result = mapper.valueToTree(obj); + 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 3ab9cda2ce8..930d19f08ae 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -13,6 +13,7 @@ "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, + "host" : "petstore.swagger.io", "basePath" : "/v2", "tags" : [ { "name" : "pet",