From 09200eb04edd4c1c893aa1924789dab6ec49c5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20C=C3=B4t=C3=A9?= Date: Sat, 12 Sep 2020 10:01:56 -0400 Subject: [PATCH] Update the for play 2.7 (#7398) * Fix the new package that deal with Configuration (the old one is depecrated) * First version to support Play Framework 2.7 * Fix small problems that prevent compilation of each samples. Now everything is compiling perfectly --- .../beanValidationQueryParams.mustache | 2 +- .../JavaPlayFramework/build.mustache | 2 +- .../buildproperties.mustache | 2 +- .../JavaPlayFramework/newApi.mustache | 6 +- .../newApiController.mustache | 20 +-- .../newApiInterface.mustache | 2 +- .../JavaPlayFramework/plugins.mustache | 2 +- .../JavaPlayFramework/routes.mustache | 2 +- .../puppies/store/apis/PetApiController.java | 50 +++--- .../store/apis/PetApiControllerImp.java | 16 +- .../apis/PetApiControllerImpInterface.java | 16 +- .../store/apis/StoreApiController.java | 18 +-- .../store/apis/StoreApiControllerImp.java | 8 +- .../apis/StoreApiControllerImpInterface.java | 8 +- .../puppies/store/apis/UserApiController.java | 44 +++--- .../store/apis/UserApiControllerImp.java | 16 +- .../apis/UserApiControllerImpInterface.java | 16 +- .../build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 18 ++- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 10 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 18 ++- .../UserApiControllerImpInterface.java | 16 +- .../java-play-framework-async/build.sbt | 2 +- .../java-play-framework-async/conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 34 ++-- .../app/controllers/StoreApiController.java | 10 +- .../app/controllers/UserApiController.java | 28 ++-- .../build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../controllers/AnotherFakeApiController.java | 6 +- .../AnotherFakeApiControllerImp.java | 2 +- .../AnotherFakeApiControllerImpInterface.java | 2 +- .../app/controllers/FakeApiController.java | 146 +++++++++--------- .../app/controllers/FakeApiControllerImp.java | 28 ++-- .../FakeApiControllerImpInterface.java | 28 ++-- .../FakeClassnameTags123ApiController.java | 6 +- .../FakeClassnameTags123ApiControllerImp.java | 2 +- ...snameTags123ApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 58 +++---- .../app/controllers/PetApiControllerImp.java | 18 +-- .../PetApiControllerImpInterface.java | 18 +-- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../build.sbt | 2 +- .../conf/routes | 74 ++++----- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../java-play-framework-no-nullable/build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../build.sbt | 2 +- .../conf/routes | 40 ++--- .../project/build.properties | 2 +- .../project/plugins.sbt | 2 +- .../app/controllers/PetApiController.java | 50 +++--- .../app/controllers/PetApiControllerImp.java | 16 +- .../PetApiControllerImpInterface.java | 16 +- .../app/controllers/StoreApiController.java | 18 +-- .../controllers/StoreApiControllerImp.java | 8 +- .../StoreApiControllerImpInterface.java | 8 +- .../app/controllers/UserApiController.java | 44 +++--- .../app/controllers/UserApiControllerImp.java | 16 +- .../UserApiControllerImpInterface.java | 16 +- .../petstore/java-play-framework/build.sbt | 2 +- .../petstore/java-play-framework/conf/routes | 40 ++--- .../project/build.properties | 2 +- .../java-play-framework/project/plugins.sbt | 2 +- 150 files changed, 1389 insertions(+), 1379 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationQueryParams.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationQueryParams.mustache index 0f99bffde09..9cca8cb8874 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationQueryParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationQueryParams.mustache @@ -1 +1 @@ -{{#required}} @NotNull {{/required}}{{>beanValidationCore}} \ No newline at end of file +{{#required}}@NotNull {{/required}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache index 6287b9038f7..379521797a2 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache @@ -7,7 +7,7 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" {{#useSwaggerUI}} -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" {{/useSwaggerUI}} {{#useBeanValidation}} libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/buildproperties.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/buildproperties.mustache index cf19fd026fd..d7ec7acfad2 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/buildproperties.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/buildproperties.mustache @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache index ea72f30b32a..d9dd20aaf92 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache @@ -9,6 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +{{#supportAsync}} +import java.util.concurrent.CompletionStage; +import java.util.concurrent.CompletableFuture; +{{/supportAsync}} {{#useBeanValidation}} import javax.validation.constraints.*; {{/useBeanValidation}} @@ -17,7 +21,7 @@ import javax.validation.constraints.*; public class {{classname}}ControllerImp {{#useInterfaces}}implements {{classname}}ControllerImpInterface{{/useInterfaces}} { {{#operation}} {{#useInterfaces}}@Override{{/useInterfaces}} - public {{^returnType}}void{{/returnType}}{{#returnType}}{{#supportAsync}}CompletionStage<{{/supportAsync}}{{>returnTypesNoVoid}}{{#supportAsync}}>{{/supportAsync}}{{/returnType}} {{operationId}}({{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}} { + public {{^returnType}}void{{/returnType}}{{#returnType}}{{#supportAsync}}CompletionStage<{{/supportAsync}}{{>returnTypesNoVoid}}{{#supportAsync}}>{{/supportAsync}}{{/returnType}} {{operationId}}(Http.Request request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}} { //Do your magic!!! {{#returnType}} {{#supportAsync}} diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache index f12ad7c4323..356cdf87e38 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -61,10 +61,10 @@ public class {{classname}}Controller extends Controller { {{#operation}} {{#wrapCalls}}@ApiAction{{/wrapCalls}} - public {{#supportAsync}}CompletionStage<{{/supportAsync}}Result{{#supportAsync}}>{{/supportAsync}} {{operationId}}({{#pathParams}}{{>pathParams}}{{#hasMore}},{{/hasMore}}{{/pathParams}}) {{^handleExceptions}}{{#bodyParams}}throws IOException{{/bodyParams}}{{/handleExceptions}}{{#handleExceptions}}throws Exception{{/handleExceptions}} { + public {{#supportAsync}}CompletionStage<{{/supportAsync}}Result{{#supportAsync}}>{{/supportAsync}} {{operationId}}(Http.Request request{{#hasPathParams}}, {{/hasPathParams}}{{#pathParams}}{{>pathParams}}{{#hasMore}},{{/hasMore}}{{/pathParams}}) {{^handleExceptions}}{{#bodyParams}}throws IOException{{/bodyParams}}{{/handleExceptions}}{{#handleExceptions}}throws Exception{{/handleExceptions}} { {{#bodyParams}} {{^collectionFormat}} - JsonNode node{{paramName}} = request().body().asJson(); + JsonNode node{{paramName}} = request.body().asJson(); {{{dataType}}} {{paramName}}; if (node{{paramName}} != null) { {{paramName}} = mapper.readValue(node{{paramName}}.toString(), {{#isContainer}}new TypeReference<{{{dataType}}}>(){}{{/isContainer}}{{^isContainer}}{{{dataType}}}.class{{/isContainer}}); @@ -97,7 +97,7 @@ public class {{classname}}Controller extends Controller { {{/bodyParams}} {{#queryParams}} {{#collectionFormat}} - String[] {{paramName}}Array = request().queryString().get("{{baseName}}"); + String[] {{paramName}}Array = request.queryString().get("{{baseName}}"); {{#required}} if ({{paramName}}Array == null) { throw new IllegalArgumentException("'{{baseName}}' parameter is required"); @@ -113,7 +113,7 @@ public class {{classname}}Controller extends Controller { } {{/collectionFormat}} {{^collectionFormat}} - String value{{paramName}} = request().getQueryString("{{baseName}}"); + String value{{paramName}} = request.getQueryString("{{baseName}}"); {{{dataType}}} {{paramName}}; if (value{{paramName}} != null) { {{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}}; @@ -129,7 +129,7 @@ public class {{classname}}Controller extends Controller { {{/queryParams}} {{#formParams}} {{#isFile}} - {{{dataType}}} {{paramName}} = request().body().asMultipartFormData().getFile("{{baseName}}"); + {{{dataType}}} {{paramName}} = request.body().asMultipartFormData().getFile("{{baseName}}"); {{#required}} if (({{paramName}} == null || ((File) {{paramName}}.getFile()).length() == 0)) { throw new IllegalArgumentException("'{{baseName}}' file cannot be empty"); @@ -138,7 +138,7 @@ public class {{classname}}Controller extends Controller { {{/isFile}} {{^isFile}} {{#collectionFormat}} - String[] {{paramName}}Array = request().body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"); + String[] {{paramName}}Array = request.body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"); {{#required}} if ({{paramName}}Array == null) { throw new IllegalArgumentException("'{{baseName}}' parameter is required"); @@ -154,7 +154,7 @@ public class {{classname}}Controller extends Controller { } {{/collectionFormat}} {{^collectionFormat}} - String value{{paramName}} = (request().body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"))[0]; + String value{{paramName}} = (request.body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"))[0]; {{{dataType}}} {{paramName}}; if (value{{paramName}} != null) { {{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}}; @@ -171,7 +171,7 @@ public class {{classname}}Controller extends Controller { {{/formParams}} {{#headerParams}} {{#collectionFormat}} - String[] {{paramName}}Array = request().headers().get("{{baseName}}"); + String[] {{paramName}}Array = request.getHeaders().getAll("{{baseName}}").toArray(new String[0]); {{#required}} if ({{paramName}}Array == null) { throw new IllegalArgumentException("'{{baseName}}' parameter is required"); @@ -187,7 +187,7 @@ public class {{classname}}Controller extends Controller { } {{/collectionFormat}} {{^collectionFormat}} - String value{{paramName}} = request().getHeader("{{baseName}}"); + String value{{paramName}} = request.header("{{baseName}}").get(); {{{dataType}}} {{paramName}}; if (value{{paramName}} != null) { {{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}}; @@ -207,7 +207,7 @@ public class {{classname}}Controller extends Controller { return CompletableFuture.supplyAsync(() -> { {{/supportAsync}} {{/returnType}} - {{#returnType}}{{#supportAsync}}CompletionStage<{{>returnTypesNoVoid}}> stage = {{/supportAsync}}{{^supportAsync}}{{>returnTypesNoVoid}} obj = {{/supportAsync}}{{/returnType}}{{^returnType}}{{#supportAsync}} {{/supportAsync}}{{/returnType}}imp.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}{{#supportAsync}}.thenApply(obj -> { {{/supportAsync}}{{/returnType}}{{^supportAsync}};{{/supportAsync}} + {{#returnType}}{{#supportAsync}}CompletionStage<{{>returnTypesNoVoid}}> stage = {{/supportAsync}}{{^supportAsync}}{{>returnTypesNoVoid}} obj = {{/supportAsync}}{{/returnType}}{{^returnType}}{{#supportAsync}} {{/supportAsync}}{{/returnType}}imp.{{operationId}}(request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}{{#supportAsync}}.thenApply(obj -> { {{/supportAsync}}{{/returnType}}{{^supportAsync}};{{/supportAsync}}{{#supportAsync}}{{^returnType}};{{/returnType}}{{/supportAsync}} {{#returnType}} {{^isResponseFile}} {{^returnTypeIsPrimitive}} diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache index 0b60e57db9d..9b0e4738c87 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache @@ -20,7 +20,7 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface {{classname}}ControllerImpInterface { {{#operation}} - {{^returnType}}void{{/returnType}}{{#returnType}}{{#supportAsync}}CompletionStage<{{/supportAsync}}{{>returnTypesNoVoid}}{{#supportAsync}}>{{/supportAsync}}{{/returnType}} {{operationId}}({{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}}; + {{^returnType}}void{{/returnType}}{{#returnType}}{{#supportAsync}}CompletionStage<{{/supportAsync}}{{>returnTypesNoVoid}}{{#supportAsync}}>{{/supportAsync}}{{/returnType}} {{operationId}}(Http.Request request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}}; {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache index 0baa33f9c05..23a36aef596 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/plugins.mustache @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/routes.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/routes.mustache index 10ef66b1d9a..024c3486ecc 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/routes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/routes.mustache @@ -12,7 +12,7 @@ GET /api {{apiPackage}}.ApiDocController.api #Functions for {{{baseName}}} API {{#operations}} {{#operation}} -{{httpMethod}} {{{contextPath}}}{{{path}}} {{apiPackage}}.{{classname}}Controller.{{operationId}}({{#pathParams}}{{paramName}}: {{#isUuid}}java.util.UUID{{/isUuid}}{{^isUuid}}{{{dataType}}}{{/isUuid}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) +{{httpMethod}} {{{contextPath}}}{{{path}}} {{apiPackage}}.{{classname}}Controller.{{operationId}}(request: Request{{#hasPathParams}}, {{/hasPathParams}}{{#pathParams}}{{paramName}}: {{#isUuid}}java.util.UUID{{/isUuid}}{{^isUuid}}{{{dataType}}}{{/isUuid}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) {{/operation}} {{/operations}} {{/apis}} diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java index 31c739f9063..4c7207fd8f2 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java @@ -40,8 +40,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -51,26 +51,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -82,7 +82,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -93,8 +93,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -106,7 +106,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -117,8 +117,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -127,8 +127,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -138,41 +138,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java index 6bc56487bee..95181dafd17 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags( @NotNull List tags) throws Exception { + public List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java index 39679e11f45..f6ca5109af8 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java @@ -13,20 +13,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus( @NotNull List status) throws Exception; + List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - List findPetsByTags( @NotNull List tags) throws Exception; + List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java index 8447ce817c4..a41058e9bb0 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java @@ -39,21 +39,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -62,8 +62,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -73,7 +73,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java index 956d5f73b3e..3ecdb8f6a79 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java index 4f2aadae998..ce5deb59f95 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java index 499a3299cc3..d95f368607f 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java @@ -39,8 +39,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -50,13 +50,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -68,13 +68,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,19 +86,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -107,35 +107,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -145,7 +145,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java index 9e2aebd9918..49dd6850244 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java index 4904073cbc2..85ca984afa1 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser( @NotNull String username, @NotNull String password) throws Exception; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-api-package-override/build.sbt b/samples/server/petstore/java-play-framework-api-package-override/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/build.sbt +++ b/samples/server/petstore/java-play-framework-api-package-override/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-api-package-override/conf/routes b/samples/server/petstore/java-play-framework-api-package-override/conf/routes index 9c9448118a9..17e1dab7a58 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/conf/routes +++ b/samples/server/petstore/java-play-framework-api-package-override/conf/routes @@ -6,30 +6,30 @@ GET /api com.puppies.store.apis.ApiDocController.api #Functions for Pet API -POST /v2/pet com.puppies.store.apis.PetApiController.addPet() -DELETE /v2/pet/:petId com.puppies.store.apis.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus com.puppies.store.apis.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags com.puppies.store.apis.PetApiController.findPetsByTags() -GET /v2/pet/:petId com.puppies.store.apis.PetApiController.getPetById(petId: Long) -PUT /v2/pet com.puppies.store.apis.PetApiController.updatePet() -POST /v2/pet/:petId com.puppies.store.apis.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage com.puppies.store.apis.PetApiController.uploadFile(petId: Long) +POST /v2/pet com.puppies.store.apis.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId com.puppies.store.apis.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus com.puppies.store.apis.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags com.puppies.store.apis.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId com.puppies.store.apis.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet com.puppies.store.apis.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId com.puppies.store.apis.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage com.puppies.store.apis.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId com.puppies.store.apis.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory com.puppies.store.apis.StoreApiController.getInventory() -GET /v2/store/order/:orderId com.puppies.store.apis.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order com.puppies.store.apis.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId com.puppies.store.apis.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory com.puppies.store.apis.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId com.puppies.store.apis.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order com.puppies.store.apis.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user com.puppies.store.apis.UserApiController.createUser() -POST /v2/user/createWithArray com.puppies.store.apis.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList com.puppies.store.apis.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username com.puppies.store.apis.UserApiController.deleteUser(username: String) -GET /v2/user/:username com.puppies.store.apis.UserApiController.getUserByName(username: String) -GET /v2/user/login com.puppies.store.apis.UserApiController.loginUser() -GET /v2/user/logout com.puppies.store.apis.UserApiController.logoutUser() -PUT /v2/user/:username com.puppies.store.apis.UserApiController.updateUser(username: String) +POST /v2/user com.puppies.store.apis.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray com.puppies.store.apis.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList com.puppies.store.apis.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username com.puppies.store.apis.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username com.puppies.store.apis.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login com.puppies.store.apis.UserApiController.loginUser(request: Request) +GET /v2/user/logout com.puppies.store.apis.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username com.puppies.store.apis.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-api-package-override/project/build.properties b/samples/server/petstore/java-play-framework-api-package-override/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/project/build.properties +++ b/samples/server/petstore/java-play-framework-api-package-override/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt b/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-api-package-override/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 fb36d104825..2616cd2fd6d 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 @@ -43,8 +43,8 @@ public class PetApiController extends Controller { @ApiAction - public CompletionStage addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -55,14 +55,14 @@ public class PetApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } return CompletableFuture.supplyAsync(() -> { - imp.addPet(body) + imp.addPet(request, body); return ok(); }); } @ApiAction - public CompletionStage deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public CompletionStage deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; @@ -70,14 +70,14 @@ public class PetApiController extends Controller { apiKey = null; } return CompletableFuture.supplyAsync(() -> { - imp.deletePet(petId, apiKey) + imp.deletePet(request, petId, apiKey); return ok(); }); } @ApiAction - public CompletionStage findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public CompletionStage findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -89,7 +89,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - CompletionStage> stage = imp.findPetsByStatus(status).thenApply(obj -> { + CompletionStage> stage = imp.findPetsByStatus(request, status).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -104,8 +104,8 @@ public class PetApiController extends Controller { } @ApiAction - public CompletionStage findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public CompletionStage findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -117,7 +117,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - CompletionStage> stage = imp.findPetsByTags(tags).thenApply(obj -> { + CompletionStage> stage = imp.findPetsByTags(request, tags).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -132,8 +132,8 @@ public class PetApiController extends Controller { } @ApiAction - public CompletionStage getPetById(Long petId) throws Exception { - CompletionStage stage = imp.getPetById(petId).thenApply(obj -> { + public CompletionStage getPetById(Http.Request request, Long petId) throws Exception { + CompletionStage stage = imp.getPetById(request, petId).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -146,8 +146,8 @@ public class PetApiController extends Controller { } @ApiAction - public CompletionStage updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -158,21 +158,21 @@ public class PetApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } return CompletableFuture.supplyAsync(() -> { - imp.updatePet(body) + imp.updatePet(request, body); return ok(); }); } @ApiAction - public CompletionStage updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public CompletionStage updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; @@ -180,22 +180,22 @@ public class PetApiController extends Controller { status = null; } return CompletableFuture.supplyAsync(() -> { - imp.updatePetWithForm(petId, name, status) + imp.updatePetWithForm(request, petId, name, status); return ok(); }); } @ApiAction - public CompletionStage uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public CompletionStage uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - CompletionStage stage = imp.uploadFile(petId, additionalMetadata, file).thenApply(obj -> { + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + CompletionStage stage = imp.uploadFile(request, petId, additionalMetadata, file).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java index 679dbe24854..d4c55be8a23 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java @@ -10,21 +10,23 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.CompletableFuture; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public CompletionStage> findPetsByStatus( @NotNull List status) throws Exception { + public CompletionStage> findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new ArrayList(); @@ -32,7 +34,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public CompletionStage> findPetsByTags( @NotNull List tags) throws Exception { + public CompletionStage> findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new ArrayList(); @@ -40,7 +42,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public CompletionStage getPetById(Long petId) throws Exception { + public CompletionStage getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new Pet(); @@ -48,17 +50,17 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public CompletionStage uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public CompletionStage uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new ModelApiResponse(); diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java index 7e4026b84cb..cef49b2d231 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java @@ -15,20 +15,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - CompletionStage> findPetsByStatus( @NotNull List status) throws Exception; + CompletionStage> findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - CompletionStage> findPetsByTags( @NotNull List tags) throws Exception; + CompletionStage> findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; - CompletionStage getPetById(Long petId) throws Exception; + CompletionStage getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - CompletionStage uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + CompletionStage uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } 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 770a95db209..5288f7ea46c 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 @@ -42,16 +42,16 @@ public class StoreApiController extends Controller { @ApiAction - public CompletionStage deleteOrder(String orderId) throws Exception { + public CompletionStage deleteOrder(Http.Request request, String orderId) throws Exception { return CompletableFuture.supplyAsync(() -> { - imp.deleteOrder(orderId) + imp.deleteOrder(request, orderId); return ok(); }); } @ApiAction - public CompletionStage getInventory() throws Exception { - CompletionStage> stage = imp.getInventory().thenApply(obj -> { + public CompletionStage getInventory(Http.Request request) throws Exception { + CompletionStage> stage = imp.getInventory(request).thenApply(obj -> { return obj; }); stage.thenApply(obj -> { @@ -61,8 +61,8 @@ public class StoreApiController extends Controller { } @ApiAction - public CompletionStage getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - CompletionStage stage = imp.getOrderById(orderId).thenApply(obj -> { + public CompletionStage getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + CompletionStage stage = imp.getOrderById(request, orderId).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -75,8 +75,8 @@ public class StoreApiController extends Controller { } @ApiAction - public CompletionStage placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -86,7 +86,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - CompletionStage stage = imp.placeOrder(body).thenApply(obj -> { + CompletionStage stage = imp.placeOrder(request, body).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java index 322dc5cfe19..faa02abb54f 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java @@ -9,16 +9,18 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.CompletableFuture; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public CompletionStage> getInventory() throws Exception { + public CompletionStage> getInventory(Http.Request request) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new HashMap(); @@ -26,7 +28,7 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { } @Override - public CompletionStage getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public CompletionStage getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new Order(); @@ -34,7 +36,7 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { } @Override - public CompletionStage placeOrder(Order body) throws Exception { + public CompletionStage placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new Order(); diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java index 60022bb1d23..a37df238f63 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java @@ -14,12 +14,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - CompletionStage> getInventory() throws Exception; + CompletionStage> getInventory(Http.Request request) throws Exception; - CompletionStage getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + CompletionStage getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - CompletionStage placeOrder(Order body) throws Exception; + CompletionStage placeOrder(Http.Request request, Order body) throws Exception; } 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 ea36f42eb3e..9e4808d0c12 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 @@ -42,8 +42,8 @@ public class UserApiController extends Controller { @ApiAction - public CompletionStage createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -54,14 +54,14 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } return CompletableFuture.supplyAsync(() -> { - imp.createUser(body) + imp.createUser(request, body); return ok(); }); } @ApiAction - public CompletionStage createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -74,14 +74,14 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } return CompletableFuture.supplyAsync(() -> { - imp.createUsersWithArrayInput(body) + imp.createUsersWithArrayInput(request, body); return ok(); }); } @ApiAction - public CompletionStage createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -94,22 +94,22 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } return CompletableFuture.supplyAsync(() -> { - imp.createUsersWithListInput(body) + imp.createUsersWithListInput(request, body); return ok(); }); } @ApiAction - public CompletionStage deleteUser(String username) throws Exception { + public CompletionStage deleteUser(Http.Request request, String username) throws Exception { return CompletableFuture.supplyAsync(() -> { - imp.deleteUser(username) + imp.deleteUser(request, username); return ok(); }); } @ApiAction - public CompletionStage getUserByName(String username) throws Exception { - CompletionStage stage = imp.getUserByName(username).thenApply(obj -> { + public CompletionStage getUserByName(Http.Request request, String username) throws Exception { + CompletionStage stage = imp.getUserByName(request, username).thenApply(obj -> { if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -122,22 +122,22 @@ public class UserApiController extends Controller { } @ApiAction - public CompletionStage loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public CompletionStage loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - CompletionStage stage = imp.loginUser(username, password).thenApply(obj -> { + CompletionStage stage = imp.loginUser(request, username, password).thenApply(obj -> { return obj; }); stage.thenApply(obj -> { @@ -147,16 +147,16 @@ public class UserApiController extends Controller { } @ApiAction - public CompletionStage logoutUser() throws Exception { + public CompletionStage logoutUser(Http.Request request) throws Exception { return CompletableFuture.supplyAsync(() -> { - imp.logoutUser() + imp.logoutUser(request); return ok(); }); } @ApiAction - public CompletionStage updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public CompletionStage updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -167,7 +167,7 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } return CompletableFuture.supplyAsync(() -> { - imp.updateUser(username, body) + imp.updateUser(request, username, body); return ok(); }); } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java index 916ed4cc14c..f5092a77f63 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java @@ -9,31 +9,33 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.CompletableFuture; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public CompletionStage getUserByName(String username) throws Exception { + public CompletionStage getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new User(); @@ -41,7 +43,7 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { } @Override - public CompletionStage loginUser( @NotNull String username, @NotNull String password) throws Exception { + public CompletionStage loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return CompletableFuture.supplyAsync(() -> { return new String(); @@ -49,12 +51,12 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java index 09b1d5042f0..32e3f34c9fa 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java @@ -14,20 +14,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - CompletionStage getUserByName(String username) throws Exception; + CompletionStage getUserByName(Http.Request request, String username) throws Exception; - CompletionStage loginUser( @NotNull String username, @NotNull String password) throws Exception; + CompletionStage loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-async/build.sbt b/samples/server/petstore/java-play-framework-async/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-async/build.sbt +++ b/samples/server/petstore/java-play-framework-async/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-async/conf/routes b/samples/server/petstore/java-play-framework-async/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-async/conf/routes +++ b/samples/server/petstore/java-play-framework-async/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-async/project/build.properties b/samples/server/petstore/java-play-framework-async/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-async/project/build.properties +++ b/samples/server/petstore/java-play-framework-async/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-async/project/plugins.sbt b/samples/server/petstore/java-play-framework-async/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-async/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-async/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 47d67805e2b..1401c062cd3 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 @@ -38,8 +38,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -53,8 +53,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; @@ -65,8 +65,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -82,8 +82,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -99,13 +99,13 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { + public Result getPetById(Http.Request request, Long petId) throws Exception { return ok(); } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -119,15 +119,15 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; @@ -138,15 +138,15 @@ public class PetApiController extends Controller { } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); return ok(); } } 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 5875ebd549c..b5226dc51bf 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 @@ -37,23 +37,23 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { + public Result deleteOrder(Http.Request request, String orderId) throws Exception { return ok(); } @ApiAction - public Result getInventory() throws Exception { + public Result getInventory(Http.Request request) throws Exception { return ok(); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { return ok(); } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); 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 6419bb8a489..5a56614f0f7 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 @@ -37,8 +37,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -52,8 +52,8 @@ public class UserApiController extends Controller { } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -69,8 +69,8 @@ public class UserApiController extends Controller { } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,25 +86,25 @@ public class UserApiController extends Controller { } @ApiAction - public Result deleteUser(String username) throws Exception { + public Result deleteUser(Http.Request request, String username) throws Exception { return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { + public Result getUserByName(Http.Request request, String username) throws Exception { return ok(); } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; @@ -115,13 +115,13 @@ public class UserApiController extends Controller { } @ApiAction - public Result logoutUser() throws Exception { + public Result logoutUser(Http.Request request) throws Exception { return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); diff --git a/samples/server/petstore/java-play-framework-controller-only/build.sbt b/samples/server/petstore/java-play-framework-controller-only/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-controller-only/build.sbt +++ b/samples/server/petstore/java-play-framework-controller-only/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-controller-only/conf/routes b/samples/server/petstore/java-play-framework-controller-only/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-controller-only/conf/routes +++ b/samples/server/petstore/java-play-framework-controller-only/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-controller-only/project/build.properties b/samples/server/petstore/java-play-framework-controller-only/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-controller-only/project/build.properties +++ b/samples/server/petstore/java-play-framework-controller-only/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt b/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-controller-only/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 34a629580d4..91b273f1c6a 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 @@ -38,8 +38,8 @@ public class AnotherFakeApiController extends Controller { @ApiAction - public Result call123testSpecialTags() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result call123testSpecialTags(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Client body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Client.class); @@ -49,7 +49,7 @@ public class AnotherFakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Client obj = imp.call123testSpecialTags(body); + Client obj = imp.call123testSpecialTags(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java index fccc2e5b015..fd2f431c5b8 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java @@ -12,7 +12,7 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class AnotherFakeApiControllerImp implements AnotherFakeApiControllerImpInterface { @Override - public Client call123testSpecialTags(Client body) throws Exception { + public Client call123testSpecialTags(Http.Request request, Client body) throws Exception { //Do your magic!!! return new Client(); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImpInterface.java index ebc18b14f24..54318801e56 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImpInterface.java @@ -11,6 +11,6 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface AnotherFakeApiControllerImpInterface { - Client call123testSpecialTags(Client body) throws Exception; + Client call123testSpecialTags(Http.Request request, Client body) throws Exception; } 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 e334b4908b2..2b41da8a952 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 @@ -47,8 +47,8 @@ public class FakeApiController extends Controller { @ApiAction - public Result createXmlItem() throws Exception { - JsonNode nodexmlItem = request().body().asJson(); + public Result createXmlItem(Http.Request request) throws Exception { + JsonNode nodexmlItem = request.body().asJson(); XmlItem xmlItem; if (nodexmlItem != null) { xmlItem = mapper.readValue(nodexmlItem.toString(), XmlItem.class); @@ -58,13 +58,13 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'XmlItem' parameter is required"); } - imp.createXmlItem(xmlItem); + imp.createXmlItem(request, xmlItem); return ok(); } @ApiAction - public Result fakeOuterBooleanSerialize() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result fakeOuterBooleanSerialize(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Boolean body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Boolean.class); @@ -74,14 +74,14 @@ public class FakeApiController extends Controller { } else { body = null; } - Boolean obj = imp.fakeOuterBooleanSerialize(body); + Boolean obj = imp.fakeOuterBooleanSerialize(request, body); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result fakeOuterCompositeSerialize() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result fakeOuterCompositeSerialize(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); OuterComposite body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), OuterComposite.class); @@ -91,7 +91,7 @@ public class FakeApiController extends Controller { } else { body = null; } - OuterComposite obj = imp.fakeOuterCompositeSerialize(body); + OuterComposite obj = imp.fakeOuterCompositeSerialize(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -100,8 +100,8 @@ public class FakeApiController extends Controller { } @ApiAction - public Result fakeOuterNumberSerialize() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result fakeOuterNumberSerialize(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); BigDecimal body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), BigDecimal.class); @@ -111,7 +111,7 @@ public class FakeApiController extends Controller { } else { body = null; } - BigDecimal obj = imp.fakeOuterNumberSerialize(body); + BigDecimal obj = imp.fakeOuterNumberSerialize(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -120,8 +120,8 @@ public class FakeApiController extends Controller { } @ApiAction - public Result fakeOuterStringSerialize() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result fakeOuterStringSerialize(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); String body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), String.class); @@ -131,14 +131,14 @@ public class FakeApiController extends Controller { } else { body = null; } - String obj = imp.fakeOuterStringSerialize(body); + String obj = imp.fakeOuterStringSerialize(request, body); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result testBodyWithFileSchema() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result testBodyWithFileSchema(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); FileSchemaTestClass body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), FileSchemaTestClass.class); @@ -148,13 +148,13 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.testBodyWithFileSchema(body); + imp.testBodyWithFileSchema(request, body); return ok(); } @ApiAction - public Result testBodyWithQueryParams() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result testBodyWithQueryParams(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -164,20 +164,20 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - String valuequery = request().getQueryString("query"); + String valuequery = request.getQueryString("query"); String query; if (valuequery != null) { query = valuequery; } else { throw new IllegalArgumentException("'query' parameter is required"); } - imp.testBodyWithQueryParams(query, body); + imp.testBodyWithQueryParams(request, query, body); return ok(); } @ApiAction - public Result testClientModel() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result testClientModel(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Client body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Client.class); @@ -187,7 +187,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Client obj = imp.testClientModel(body); + Client obj = imp.testClientModel(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -196,106 +196,106 @@ public class FakeApiController extends Controller { } @ApiAction - public Result testEndpointParameters() throws Exception { - String valueinteger = (request().body().asMultipartFormData().asFormUrlEncoded().get("integer"))[0]; + public Result testEndpointParameters(Http.Request request) throws Exception { + String valueinteger = (request.body().asMultipartFormData().asFormUrlEncoded().get("integer"))[0]; Integer integer; if (valueinteger != null) { integer = Integer.parseInt(valueinteger); } else { integer = null; } - String valueint32 = (request().body().asMultipartFormData().asFormUrlEncoded().get("int32"))[0]; + String valueint32 = (request.body().asMultipartFormData().asFormUrlEncoded().get("int32"))[0]; Integer int32; if (valueint32 != null) { int32 = Integer.parseInt(valueint32); } else { int32 = null; } - String valueint64 = (request().body().asMultipartFormData().asFormUrlEncoded().get("int64"))[0]; + String valueint64 = (request.body().asMultipartFormData().asFormUrlEncoded().get("int64"))[0]; Long int64; if (valueint64 != null) { int64 = Long.parseLong(valueint64); } else { int64 = null; } - String valuenumber = (request().body().asMultipartFormData().asFormUrlEncoded().get("number"))[0]; + String valuenumber = (request.body().asMultipartFormData().asFormUrlEncoded().get("number"))[0]; BigDecimal number; if (valuenumber != null) { number = new BigDecimal(valuenumber); } else { throw new IllegalArgumentException("'number' parameter is required"); } - String value_float = (request().body().asMultipartFormData().asFormUrlEncoded().get("float"))[0]; + String value_float = (request.body().asMultipartFormData().asFormUrlEncoded().get("float"))[0]; Float _float; if (value_float != null) { _float = Float.parseFloat(value_float); } else { _float = null; } - String value_double = (request().body().asMultipartFormData().asFormUrlEncoded().get("double"))[0]; + String value_double = (request.body().asMultipartFormData().asFormUrlEncoded().get("double"))[0]; Double _double; if (value_double != null) { _double = Double.parseDouble(value_double); } else { throw new IllegalArgumentException("'double' parameter is required"); } - String valuestring = (request().body().asMultipartFormData().asFormUrlEncoded().get("string"))[0]; + String valuestring = (request.body().asMultipartFormData().asFormUrlEncoded().get("string"))[0]; String string; if (valuestring != null) { string = valuestring; } else { string = null; } - String valuepatternWithoutDelimiter = (request().body().asMultipartFormData().asFormUrlEncoded().get("pattern_without_delimiter"))[0]; + String valuepatternWithoutDelimiter = (request.body().asMultipartFormData().asFormUrlEncoded().get("pattern_without_delimiter"))[0]; String patternWithoutDelimiter; if (valuepatternWithoutDelimiter != null) { patternWithoutDelimiter = valuepatternWithoutDelimiter; } else { throw new IllegalArgumentException("'pattern_without_delimiter' parameter is required"); } - String value_byte = (request().body().asMultipartFormData().asFormUrlEncoded().get("byte"))[0]; + String value_byte = (request.body().asMultipartFormData().asFormUrlEncoded().get("byte"))[0]; byte[] _byte; if (value_byte != null) { _byte = value_byte.getBytes(); } else { throw new IllegalArgumentException("'byte' parameter is required"); } - Http.MultipartFormData.FilePart binary = request().body().asMultipartFormData().getFile("binary"); - String valuedate = (request().body().asMultipartFormData().asFormUrlEncoded().get("date"))[0]; + Http.MultipartFormData.FilePart binary = request.body().asMultipartFormData().getFile("binary"); + String valuedate = (request.body().asMultipartFormData().asFormUrlEncoded().get("date"))[0]; LocalDate date; if (valuedate != null) { date = LocalDate.parse(valuedate); } else { date = null; } - String valuedateTime = (request().body().asMultipartFormData().asFormUrlEncoded().get("dateTime"))[0]; + String valuedateTime = (request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime"))[0]; OffsetDateTime dateTime; if (valuedateTime != null) { dateTime = OffsetDateTime.parse(valuedateTime); } else { dateTime = null; } - String valuepassword = (request().body().asMultipartFormData().asFormUrlEncoded().get("password"))[0]; + String valuepassword = (request.body().asMultipartFormData().asFormUrlEncoded().get("password"))[0]; String password; if (valuepassword != null) { password = valuepassword; } else { password = null; } - String valueparamCallback = (request().body().asMultipartFormData().asFormUrlEncoded().get("callback"))[0]; + String valueparamCallback = (request.body().asMultipartFormData().asFormUrlEncoded().get("callback"))[0]; String paramCallback; if (valueparamCallback != null) { paramCallback = valueparamCallback; } else { paramCallback = null; } - imp.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + imp.testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); return ok(); } @ApiAction - public Result testEnumParameters() throws Exception { - String[] enumQueryStringArrayArray = request().queryString().get("enum_query_string_array"); + public Result testEnumParameters(Http.Request request) throws Exception { + String[] enumQueryStringArrayArray = request.queryString().get("enum_query_string_array"); List enumQueryStringArrayList = OpenAPIUtils.parametersToList("csv", enumQueryStringArrayArray); List enumQueryStringArray = new ArrayList<>(); for (String curParam : enumQueryStringArrayList) { @@ -304,28 +304,28 @@ public class FakeApiController extends Controller { enumQueryStringArray.add(curParam); } } - String valueenumQueryString = request().getQueryString("enum_query_string"); + String valueenumQueryString = request.getQueryString("enum_query_string"); String enumQueryString; if (valueenumQueryString != null) { enumQueryString = valueenumQueryString; } else { enumQueryString = "-efg"; } - String valueenumQueryInteger = request().getQueryString("enum_query_integer"); + String valueenumQueryInteger = request.getQueryString("enum_query_integer"); Integer enumQueryInteger; if (valueenumQueryInteger != null) { enumQueryInteger = Integer.parseInt(valueenumQueryInteger); } else { enumQueryInteger = null; } - String valueenumQueryDouble = request().getQueryString("enum_query_double"); + String valueenumQueryDouble = request.getQueryString("enum_query_double"); Double enumQueryDouble; if (valueenumQueryDouble != null) { enumQueryDouble = Double.parseDouble(valueenumQueryDouble); } else { enumQueryDouble = null; } - String[] enumFormStringArrayArray = request().body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string_array"); + String[] enumFormStringArrayArray = request.body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string_array"); List enumFormStringArrayList = OpenAPIUtils.parametersToList("csv", enumFormStringArrayArray); List enumFormStringArray = new ArrayList<>(); for (String curParam : enumFormStringArrayList) { @@ -334,14 +334,14 @@ public class FakeApiController extends Controller { enumFormStringArray.add(curParam); } } - String valueenumFormString = (request().body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string"))[0]; + String valueenumFormString = (request.body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string"))[0]; String enumFormString; if (valueenumFormString != null) { enumFormString = valueenumFormString; } else { enumFormString = "-efg"; } - String[] enumHeaderStringArrayArray = request().headers().get("enum_header_string_array"); + String[] enumHeaderStringArrayArray = request.getHeaders().getAll("enum_header_string_array").toArray(new String[0]); List enumHeaderStringArrayList = OpenAPIUtils.parametersToList("csv", enumHeaderStringArrayArray); List enumHeaderStringArray = new ArrayList<>(); for (String curParam : enumHeaderStringArrayList) { @@ -350,68 +350,68 @@ public class FakeApiController extends Controller { enumHeaderStringArray.add(curParam); } } - String valueenumHeaderString = request().getHeader("enum_header_string"); + String valueenumHeaderString = request.header("enum_header_string").get(); String enumHeaderString; if (valueenumHeaderString != null) { enumHeaderString = valueenumHeaderString; } else { enumHeaderString = "-efg"; } - imp.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + imp.testEnumParameters(request, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); return ok(); } @ApiAction - public Result testGroupParameters() throws Exception { - String valuerequiredStringGroup = request().getQueryString("required_string_group"); + public Result testGroupParameters(Http.Request request) throws Exception { + String valuerequiredStringGroup = request.getQueryString("required_string_group"); Integer requiredStringGroup; if (valuerequiredStringGroup != null) { requiredStringGroup = Integer.parseInt(valuerequiredStringGroup); } else { throw new IllegalArgumentException("'required_string_group' parameter is required"); } - String valuerequiredInt64Group = request().getQueryString("required_int64_group"); + String valuerequiredInt64Group = request.getQueryString("required_int64_group"); Long requiredInt64Group; if (valuerequiredInt64Group != null) { requiredInt64Group = Long.parseLong(valuerequiredInt64Group); } else { throw new IllegalArgumentException("'required_int64_group' parameter is required"); } - String valuestringGroup = request().getQueryString("string_group"); + String valuestringGroup = request.getQueryString("string_group"); Integer stringGroup; if (valuestringGroup != null) { stringGroup = Integer.parseInt(valuestringGroup); } else { stringGroup = null; } - String valueint64Group = request().getQueryString("int64_group"); + String valueint64Group = request.getQueryString("int64_group"); Long int64Group; if (valueint64Group != null) { int64Group = Long.parseLong(valueint64Group); } else { int64Group = null; } - String valuerequiredBooleanGroup = request().getHeader("required_boolean_group"); + String valuerequiredBooleanGroup = request.header("required_boolean_group").get(); Boolean requiredBooleanGroup; if (valuerequiredBooleanGroup != null) { requiredBooleanGroup = Boolean.valueOf(valuerequiredBooleanGroup); } else { throw new IllegalArgumentException("'required_boolean_group' parameter is required"); } - String valuebooleanGroup = request().getHeader("boolean_group"); + String valuebooleanGroup = request.header("boolean_group").get(); Boolean booleanGroup; if (valuebooleanGroup != null) { booleanGroup = Boolean.valueOf(valuebooleanGroup); } else { booleanGroup = null; } - imp.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + imp.testGroupParameters(request, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); return ok(); } @ApiAction - public Result testInlineAdditionalProperties() throws Exception { - JsonNode nodeparam = request().body().asJson(); + public Result testInlineAdditionalProperties(Http.Request request) throws Exception { + JsonNode nodeparam = request.body().asJson(); Map param; if (nodeparam != null) { param = mapper.readValue(nodeparam.toString(), new TypeReference>(){}); @@ -423,33 +423,33 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'param' parameter is required"); } - imp.testInlineAdditionalProperties(param); + imp.testInlineAdditionalProperties(request, param); return ok(); } @ApiAction - public Result testJsonFormData() throws Exception { - String valueparam = (request().body().asMultipartFormData().asFormUrlEncoded().get("param"))[0]; + public Result testJsonFormData(Http.Request request) throws Exception { + String valueparam = (request.body().asMultipartFormData().asFormUrlEncoded().get("param"))[0]; String param; if (valueparam != null) { param = valueparam; } else { throw new IllegalArgumentException("'param' parameter is required"); } - String valueparam2 = (request().body().asMultipartFormData().asFormUrlEncoded().get("param2"))[0]; + String valueparam2 = (request.body().asMultipartFormData().asFormUrlEncoded().get("param2"))[0]; String param2; if (valueparam2 != null) { param2 = valueparam2; } else { throw new IllegalArgumentException("'param2' parameter is required"); } - imp.testJsonFormData(param, param2); + imp.testJsonFormData(request, param, param2); return ok(); } @ApiAction - public Result testQueryParameterCollectionFormat() throws Exception { - String[] pipeArray = request().queryString().get("pipe"); + public Result testQueryParameterCollectionFormat(Http.Request request) throws Exception { + String[] pipeArray = request.queryString().get("pipe"); if (pipeArray == null) { throw new IllegalArgumentException("'pipe' parameter is required"); } @@ -461,7 +461,7 @@ public class FakeApiController extends Controller { pipe.add(curParam); } } - String[] ioutilArray = request().queryString().get("ioutil"); + String[] ioutilArray = request.queryString().get("ioutil"); if (ioutilArray == null) { throw new IllegalArgumentException("'ioutil' parameter is required"); } @@ -473,7 +473,7 @@ public class FakeApiController extends Controller { ioutil.add(curParam); } } - String[] httpArray = request().queryString().get("http"); + String[] httpArray = request.queryString().get("http"); if (httpArray == null) { throw new IllegalArgumentException("'http' parameter is required"); } @@ -485,7 +485,7 @@ public class FakeApiController extends Controller { http.add(curParam); } } - String[] urlArray = request().queryString().get("url"); + String[] urlArray = request.queryString().get("url"); if (urlArray == null) { throw new IllegalArgumentException("'url' parameter is required"); } @@ -497,7 +497,7 @@ public class FakeApiController extends Controller { url.add(curParam); } } - String[] contextArray = request().queryString().get("context"); + String[] contextArray = request.queryString().get("context"); if (contextArray == null) { throw new IllegalArgumentException("'context' parameter is required"); } @@ -509,7 +509,7 @@ public class FakeApiController extends Controller { context.add(curParam); } } - imp.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + imp.testQueryParameterCollectionFormat(request, pipe, ioutil, http, url, context); return ok(); } } 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 236eaf1956f..7eb83b8bc0e 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 @@ -21,77 +21,77 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class FakeApiControllerImp implements FakeApiControllerImpInterface { @Override - public void createXmlItem(XmlItem xmlItem) throws Exception { + public void createXmlItem(Http.Request request, XmlItem xmlItem) throws Exception { //Do your magic!!! } @Override - public Boolean fakeOuterBooleanSerialize(Boolean body) throws Exception { + public Boolean fakeOuterBooleanSerialize(Http.Request request, Boolean body) throws Exception { //Do your magic!!! return new Boolean(true); } @Override - public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Exception { + public OuterComposite fakeOuterCompositeSerialize(Http.Request request, OuterComposite body) throws Exception { //Do your magic!!! return new OuterComposite(); } @Override - public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws Exception { + public BigDecimal fakeOuterNumberSerialize(Http.Request request, BigDecimal body) throws Exception { //Do your magic!!! return new BigDecimal(1.0); } @Override - public String fakeOuterStringSerialize(String body) throws Exception { + public String fakeOuterStringSerialize(Http.Request request, String body) throws Exception { //Do your magic!!! return new String(); } @Override - public void testBodyWithFileSchema(FileSchemaTestClass body) throws Exception { + public void testBodyWithFileSchema(Http.Request request, FileSchemaTestClass body) throws Exception { //Do your magic!!! } @Override - public void testBodyWithQueryParams( @NotNull String query, User body) throws Exception { + public void testBodyWithQueryParams(Http.Request request, @NotNull String query, User body) throws Exception { //Do your magic!!! } @Override - public Client testClientModel(Client body) throws Exception { + public Client testClientModel(Http.Request request, Client body) throws Exception { //Do your magic!!! return new Client(); } @Override - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception { + public void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception { //Do your magic!!! } @Override - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception { + public void testEnumParameters(Http.Request request, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception { //Do your magic!!! } @Override - public void testGroupParameters( @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception { + public void testGroupParameters(Http.Request request, @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception { //Do your magic!!! } @Override - public void testInlineAdditionalProperties(Map param) throws Exception { + public void testInlineAdditionalProperties(Http.Request request, Map param) throws Exception { //Do your magic!!! } @Override - public void testJsonFormData(String param, String param2) throws Exception { + public void testJsonFormData(Http.Request request, String param, String param2) throws Exception { //Do your magic!!! } @Override - public void testQueryParameterCollectionFormat( @NotNull List pipe, @NotNull List ioutil, @NotNull List http, @NotNull List url, @NotNull List context) throws Exception { + public void testQueryParameterCollectionFormat(Http.Request request, @NotNull List pipe, @NotNull List ioutil, @NotNull List http, @NotNull List url, @NotNull List context) 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 3363805d153..2d34548a3ba 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 @@ -20,32 +20,32 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface FakeApiControllerImpInterface { - void createXmlItem(XmlItem xmlItem) throws Exception; + void createXmlItem(Http.Request request, XmlItem xmlItem) throws Exception; - Boolean fakeOuterBooleanSerialize(Boolean body) throws Exception; + Boolean fakeOuterBooleanSerialize(Http.Request request, Boolean body) throws Exception; - OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Exception; + OuterComposite fakeOuterCompositeSerialize(Http.Request request, OuterComposite body) throws Exception; - BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws Exception; + BigDecimal fakeOuterNumberSerialize(Http.Request request, BigDecimal body) throws Exception; - String fakeOuterStringSerialize(String body) throws Exception; + String fakeOuterStringSerialize(Http.Request request, String body) throws Exception; - void testBodyWithFileSchema(FileSchemaTestClass body) throws Exception; + void testBodyWithFileSchema(Http.Request request, FileSchemaTestClass body) throws Exception; - void testBodyWithQueryParams( @NotNull String query, User body) throws Exception; + void testBodyWithQueryParams(Http.Request request, @NotNull String query, User body) throws Exception; - Client testClientModel(Client body) throws Exception; + Client testClientModel(Http.Request request, Client body) throws Exception; - void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception; + void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception; - void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception; + void testEnumParameters(Http.Request request, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception; - void testGroupParameters( @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception; + void testGroupParameters(Http.Request request, @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception; - void testInlineAdditionalProperties(Map param) throws Exception; + void testInlineAdditionalProperties(Http.Request request, Map param) throws Exception; - void testJsonFormData(String param, String param2) throws Exception; + void testJsonFormData(Http.Request request, String param, String param2) throws Exception; - void testQueryParameterCollectionFormat( @NotNull List pipe, @NotNull List ioutil, @NotNull List http, @NotNull List url, @NotNull List context) throws Exception; + void testQueryParameterCollectionFormat(Http.Request request, @NotNull List pipe, @NotNull List ioutil, @NotNull List http, @NotNull List url, @NotNull List context) 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 f0e0767843c..88f4e6387c3 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 @@ -38,8 +38,8 @@ public class FakeClassnameTags123ApiController extends Controller { @ApiAction - public Result testClassname() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result testClassname(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Client body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Client.class); @@ -49,7 +49,7 @@ public class FakeClassnameTags123ApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Client obj = imp.testClassname(body); + Client obj = imp.testClassname(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java index 90adc5ff21c..78c3ad6b6f1 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java @@ -12,7 +12,7 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class FakeClassnameTags123ApiControllerImp implements FakeClassnameTags123ApiControllerImpInterface { @Override - public Client testClassname(Client body) throws Exception { + public Client testClassname(Http.Request request, Client body) throws Exception { //Do your magic!!! return new Client(); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImpInterface.java index 8ea6e6598f1..559e67dc85a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImpInterface.java @@ -11,6 +11,6 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface FakeClassnameTags123ApiControllerImpInterface { - Client testClassname(Client body) throws Exception; + Client testClassname(Http.Request request, Client body) throws Exception; } 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 70989e28248..b2aff6a1d95 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 @@ -41,8 +41,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -52,26 +52,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -83,7 +83,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -94,8 +94,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -107,7 +107,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - Set obj = imp.findPetsByTags(tags); + Set obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -118,8 +118,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -128,8 +128,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -139,41 +139,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -182,19 +182,19 @@ public class PetApiController extends Controller { } @ApiAction - public Result uploadFileWithRequiredFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFileWithRequiredFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart requiredFile = request().body().asMultipartFormData().getFile("requiredFile"); + Http.MultipartFormData.FilePart requiredFile = request.body().asMultipartFormData().getFile("requiredFile"); if ((requiredFile == null || ((File) requiredFile.getFile()).length() == 0)) { throw new IllegalArgumentException("'requiredFile' file cannot be empty"); } - ModelApiResponse obj = imp.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + ModelApiResponse obj = imp.uploadFileWithRequiredFile(request, petId, requiredFile, additionalMetadata); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java index 42cbef67a5f..74250653bee 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java @@ -15,51 +15,51 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Set findPetsByTags( @NotNull Set tags) throws Exception { + public Set findPetsByTags(Http.Request request, @NotNull Set tags) throws Exception { //Do your magic!!! return new LinkedHashSet(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } @Override - public ModelApiResponse uploadFileWithRequiredFile(Long petId, Http.MultipartFormData.FilePart requiredFile, String additionalMetadata) throws Exception { + public ModelApiResponse uploadFileWithRequiredFile(Http.Request request, Long petId, Http.MultipartFormData.FilePart requiredFile, String additionalMetadata) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java index 77a658334b2..339c0b60be3 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java @@ -14,22 +14,22 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus( @NotNull List status) throws Exception; + List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - Set findPetsByTags( @NotNull Set tags) throws Exception; + Set findPetsByTags(Http.Request request, @NotNull Set tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; - ModelApiResponse uploadFileWithRequiredFile(Long petId, Http.MultipartFormData.FilePart requiredFile, String additionalMetadata) throws Exception; + ModelApiResponse uploadFileWithRequiredFile(Http.Request request, Long petId, Http.MultipartFormData.FilePart requiredFile, String additionalMetadata) throws Exception; } 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 1d0e23d3c65..72c0f37c806 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 @@ -39,21 +39,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -62,8 +62,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -73,7 +73,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java index d0d354a167c..5f10e1c1087 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d0..21c2882cee8 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } 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 bc58281c258..74f87a82658 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 @@ -39,8 +39,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -50,13 +50,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -68,13 +68,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,19 +86,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -107,35 +107,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -145,7 +145,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java index 573053bb537..6297e93df65 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java index 1290c84835f..4f68a438b4b 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser( @NotNull String username, @NotNull String password) throws Exception; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt b/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt +++ b/samples/server/petstore/java-play-framework-fake-endpoints/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice 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 29ab19d9951..2124662eb7f 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes +++ b/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes @@ -6,53 +6,53 @@ GET /api controllers.ApiDocController.api #Functions for AnotherFake API -PATCH /v2/another-fake/dummy controllers.AnotherFakeApiController.call123testSpecialTags() +PATCH /v2/another-fake/dummy controllers.AnotherFakeApiController.call123testSpecialTags(request: Request) #Functions for Fake API -POST /v2/fake/create_xml_item controllers.FakeApiController.createXmlItem() -POST /v2/fake/outer/boolean controllers.FakeApiController.fakeOuterBooleanSerialize() -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-file-schema controllers.FakeApiController.testBodyWithFileSchema() -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() -DELETE /v2/fake controllers.FakeApiController.testGroupParameters() -POST /v2/fake/inline-additionalProperties controllers.FakeApiController.testInlineAdditionalProperties() -GET /v2/fake/jsonFormData controllers.FakeApiController.testJsonFormData() -PUT /v2/fake/test-query-paramters controllers.FakeApiController.testQueryParameterCollectionFormat() +POST /v2/fake/create_xml_item controllers.FakeApiController.createXmlItem(request: Request) +POST /v2/fake/outer/boolean controllers.FakeApiController.fakeOuterBooleanSerialize(request: Request) +POST /v2/fake/outer/composite controllers.FakeApiController.fakeOuterCompositeSerialize(request: Request) +POST /v2/fake/outer/number controllers.FakeApiController.fakeOuterNumberSerialize(request: Request) +POST /v2/fake/outer/string controllers.FakeApiController.fakeOuterStringSerialize(request: Request) +PUT /v2/fake/body-with-file-schema controllers.FakeApiController.testBodyWithFileSchema(request: Request) +PUT /v2/fake/body-with-query-params controllers.FakeApiController.testBodyWithQueryParams(request: Request) +PATCH /v2/fake controllers.FakeApiController.testClientModel(request: Request) +POST /v2/fake controllers.FakeApiController.testEndpointParameters(request: Request) +GET /v2/fake controllers.FakeApiController.testEnumParameters(request: Request) +DELETE /v2/fake controllers.FakeApiController.testGroupParameters(request: Request) +POST /v2/fake/inline-additionalProperties controllers.FakeApiController.testInlineAdditionalProperties(request: Request) +GET /v2/fake/jsonFormData controllers.FakeApiController.testJsonFormData(request: Request) +PUT /v2/fake/test-query-paramters controllers.FakeApiController.testQueryParameterCollectionFormat(request: Request) #Functions for FakeClassnameTags123 API -PATCH /v2/fake_classname_test controllers.FakeClassnameTags123ApiController.testClassname() +PATCH /v2/fake_classname_test controllers.FakeClassnameTags123ApiController.testClassname(request: Request) #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -POST /v2/fake/:petId/uploadImageWithRequiredFile controllers.PetApiController.uploadFileWithRequiredFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) +POST /v2/fake/:petId/uploadImageWithRequiredFile controllers.PetApiController.uploadFileWithRequiredFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/project/build.properties b/samples/server/petstore/java-play-framework-fake-endpoints/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/project/build.properties +++ b/samples/server/petstore/java-play-framework-fake-endpoints/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt b/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-fake-endpoints/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 da7f08a8d77..e3bd0dbb7a2 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 @@ -36,34 +36,34 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -75,14 +75,14 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -94,62 +94,62 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); JsonNode result = mapper.valueToTree(obj); return ok(result); } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java index abd47c90513..1fd9d9d7324 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java @@ -13,45 +13,45 @@ import java.io.FileInputStream; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus(List status) throws Exception { + public List findPetsByStatus(Http.Request request, List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags(List tags) throws Exception { + public List findPetsByTags(Http.Request request, List tags) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java index 144362644af..42a76030ad5 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java @@ -12,20 +12,20 @@ import java.util.HashMap; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus(List status) throws Exception; + List findPetsByStatus(Http.Request request, List status) throws Exception; - List findPetsByTags(List tags) throws Exception; + List findPetsByTags(Http.Request request, List tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } 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 8d2e69e71a9..51ccde4f843 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 @@ -35,35 +35,35 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById(Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); JsonNode result = mapper.valueToTree(obj); return ok(result); } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java index 0728571e5e5..46ede712360 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java @@ -12,24 +12,24 @@ import java.io.FileInputStream; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById(Long orderId) throws Exception { + public Order getOrderById(Http.Request request, Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java index 7a9c3fd82e8..153102ae6a7 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java @@ -11,12 +11,12 @@ import java.util.HashMap; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById(Long orderId) throws Exception; + Order getOrderById(Http.Request request, Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } 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 f7ff6777993..d140c89626a 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 @@ -35,94 +35,94 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java index 2ef2abaaff8..f51f8b1bd55 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java @@ -12,44 +12,44 @@ import java.io.FileInputStream; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser(String username, String password) throws Exception { + public String loginUser(Http.Request request, String username, String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java index 8c5a5ee0af6..f71d2f3245d 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java @@ -11,20 +11,20 @@ import java.util.HashMap; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser(String username, String password) throws Exception; + String loginUser(Http.Request request, String username, String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt b/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt index ae954d60a3f..2b72c7e17af 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt +++ b/samples/server/petstore/java-play-framework-no-bean-validation/build.sbt @@ -6,5 +6,5 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes b/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes +++ b/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/project/build.properties b/samples/server/petstore/java-play-framework-no-bean-validation/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/project/build.properties +++ b/samples/server/petstore/java-play-framework-no-bean-validation/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-bean-validation/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 4921789755a..c5cc90d897d 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 @@ -41,8 +41,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws IOException { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -52,26 +52,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -83,7 +83,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -94,8 +94,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -107,7 +107,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -118,8 +118,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -128,8 +128,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws IOException { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -139,41 +139,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java index 49b9ea1ada7..cbed4103b88 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) { + public void addPet(Http.Request request, Pet body) { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) { + public void deletePet(Http.Request request, Long petId, String apiKey) { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) { + public List findPetsByStatus(Http.Request request, @NotNull List status) { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags( @NotNull List tags) { + public List findPetsByTags(Http.Request request, @NotNull List tags) { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) { + public Pet getPetById(Http.Request request, Long petId) { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) { + public void updatePet(Http.Request request, Pet body) { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java index 6efc073d0f2..a520ed7dc1f 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java @@ -13,20 +13,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) ; + void addPet(Http.Request request, Pet body) ; - void deletePet(Long petId, String apiKey) ; + void deletePet(Http.Request request, Long petId, String apiKey) ; - List findPetsByStatus( @NotNull List status) ; + List findPetsByStatus(Http.Request request, @NotNull List status) ; - List findPetsByTags( @NotNull List tags) ; + List findPetsByTags(Http.Request request, @NotNull List tags) ; - Pet getPetById(Long petId) ; + Pet getPetById(Http.Request request, Long petId) ; - void updatePet(Pet body) ; + void updatePet(Http.Request request, Pet body) ; - void updatePetWithForm(Long petId, String name, String status) ; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) ; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) ; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) ; } 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 9f49cd92fd5..3fe9ee62e58 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 @@ -40,21 +40,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -63,8 +63,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws IOException { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -74,7 +74,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java index 477ad09d5d7..2abf5ca13f5 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) { + public void deleteOrder(Http.Request request, String orderId) { //Do your magic!!! } @Override - public Map getInventory() { + public Map getInventory(Http.Request request) { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) { + public Order placeOrder(Http.Request request, Order body) { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java index 70d313028c6..bf385ce9367 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) ; + void deleteOrder(Http.Request request, String orderId) ; - Map getInventory() ; + Map getInventory(Http.Request request) ; - Order getOrderById( @Min(1) @Max(5)Long orderId) ; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) ; - Order placeOrder(Order body) ; + Order placeOrder(Http.Request request, Order body) ; } 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 00753b987c5..abde2ad4ce0 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 @@ -40,8 +40,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws IOException { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -51,13 +51,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws IOException { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -69,13 +69,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws IOException { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -87,19 +87,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -108,35 +108,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() { - imp.logoutUser(); + public Result logoutUser(Http.Request request) { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws IOException { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws IOException { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -146,7 +146,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java index 251ffce1f09..f119c308f86 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) { + public void createUser(Http.Request request, User body) { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) { + public void createUsersWithArrayInput(Http.Request request, List body) { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) { + public void createUsersWithListInput(Http.Request request, List body) { //Do your magic!!! } @Override - public void deleteUser(String username) { + public void deleteUser(Http.Request request, String username) { //Do your magic!!! } @Override - public User getUserByName(String username) { + public User getUserByName(Http.Request request, String username) { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) { //Do your magic!!! return new String(); } @Override - public void logoutUser() { + public void logoutUser(Http.Request request) { //Do your magic!!! } @Override - public void updateUser(String username, User body) { + public void updateUser(Http.Request request, String username, User body) { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java index c79d4b93820..1c429d4665b 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) ; + void createUser(Http.Request request, User body) ; - void createUsersWithArrayInput(List body) ; + void createUsersWithArrayInput(Http.Request request, List body) ; - void createUsersWithListInput(List body) ; + void createUsersWithListInput(Http.Request request, List body) ; - void deleteUser(String username) ; + void deleteUser(Http.Request request, String username) ; - User getUserByName(String username) ; + User getUserByName(Http.Request request, String username) ; - String loginUser( @NotNull String username, @NotNull String password) ; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) ; - void logoutUser() ; + void logoutUser(Http.Request request) ; - void updateUser(String username, User body) ; + void updateUser(Http.Request request, String username, User body) ; } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt b/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt +++ b/samples/server/petstore/java-play-framework-no-exception-handling/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes b/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes +++ b/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/project/build.properties b/samples/server/petstore/java-play-framework-no-exception-handling/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/project/build.properties +++ b/samples/server/petstore/java-play-framework-no-exception-handling/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-exception-handling/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 13199dce851..65c17d2fe69 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 @@ -40,8 +40,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -51,26 +51,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -82,7 +82,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -93,8 +93,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -106,7 +106,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -117,8 +117,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -127,8 +127,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -138,41 +138,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java index 0269dfb9877..3ef89adebbf 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp { - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } - public List findPetsByTags( @NotNull List tags) throws Exception { + public List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return new ArrayList(); } - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } 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 b4bb4edab35..a9eb99e4f0c 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 @@ -39,21 +39,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -62,8 +62,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -73,7 +73,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java index 2ac36157699..84379628926 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp { - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } 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 24081b8da90..7f74b10c4d8 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 @@ -39,8 +39,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -50,13 +50,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -68,13 +68,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,19 +86,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -107,35 +107,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -145,7 +145,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java index d69bd467a77..93ecadd555e 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp { - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-no-interface/build.sbt b/samples/server/petstore/java-play-framework-no-interface/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-no-interface/build.sbt +++ b/samples/server/petstore/java-play-framework-no-interface/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-interface/conf/routes b/samples/server/petstore/java-play-framework-no-interface/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-no-interface/conf/routes +++ b/samples/server/petstore/java-play-framework-no-interface/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-interface/project/build.properties b/samples/server/petstore/java-play-framework-no-interface/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-no-interface/project/build.properties +++ b/samples/server/petstore/java-play-framework-no-interface/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-interface/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java index 665512747fd..00de0b0a6bc 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java @@ -40,8 +40,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -51,26 +51,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -82,7 +82,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -93,8 +93,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -106,7 +106,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -117,8 +117,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -127,8 +127,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -138,41 +138,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImp.java index 591c99e164a..5a638f0392c 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags( @NotNull List tags) throws Exception { + public List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb..394d8978e0d 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiControllerImpInterface.java @@ -13,20 +13,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus( @NotNull List status) throws Exception; + List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - List findPetsByTags( @NotNull List tags) throws Exception; + List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiController.java index 1d0e23d3c65..72c0f37c806 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiController.java @@ -39,21 +39,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -62,8 +62,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -73,7 +73,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImp.java index d0d354a167c..5f10e1c1087 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d0..21c2882cee8 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiController.java index bc58281c258..74f87a82658 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiController.java @@ -39,8 +39,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -50,13 +50,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -68,13 +68,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,19 +86,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -107,35 +107,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -145,7 +145,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImp.java index 573053bb537..6297e93df65 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImpInterface.java index 1290c84835f..4f68a438b4b 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser( @NotNull String username, @NotNull String password) throws Exception; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-nullable/build.sbt b/samples/server/petstore/java-play-framework-no-nullable/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/build.sbt +++ b/samples/server/petstore/java-play-framework-no-nullable/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-nullable/conf/routes b/samples/server/petstore/java-play-framework-no-nullable/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/conf/routes +++ b/samples/server/petstore/java-play-framework-no-nullable/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-nullable/project/build.properties b/samples/server/petstore/java-play-framework-no-nullable/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/project/build.properties +++ b/samples/server/petstore/java-play-framework-no-nullable/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-nullable/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-nullable/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-nullable/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 665512747fd..00de0b0a6bc 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 @@ -40,8 +40,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -51,26 +51,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -82,7 +82,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -93,8 +93,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -106,7 +106,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -117,8 +117,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -127,8 +127,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -138,41 +138,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java index 591c99e164a..5a638f0392c 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags( @NotNull List tags) throws Exception { + public List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb..394d8978e0d 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java @@ -13,20 +13,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus( @NotNull List status) throws Exception; + List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - List findPetsByTags( @NotNull List tags) throws Exception; + List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } 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 1d0e23d3c65..72c0f37c806 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 @@ -39,21 +39,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -62,8 +62,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -73,7 +73,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java index d0d354a167c..5f10e1c1087 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d0..21c2882cee8 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } 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 bc58281c258..74f87a82658 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 @@ -39,8 +39,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -50,13 +50,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -68,13 +68,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,19 +86,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -107,35 +107,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -145,7 +145,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java index 573053bb537..6297e93df65 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java index 1290c84835f..4f68a438b4b 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser( @NotNull String username, @NotNull String password) throws Exception; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes b/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes index faa1a4f028f..bae70fd93e6 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes @@ -5,30 +5,30 @@ #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/project/build.properties b/samples/server/petstore/java-play-framework-no-swagger-ui/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/project/build.properties +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 8641206a316..739e8bccaef 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 @@ -39,8 +39,8 @@ public class PetApiController extends Controller { - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -50,26 +50,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -81,7 +81,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -92,8 +92,8 @@ public class PetApiController extends Controller { } - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -105,7 +105,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -116,8 +116,8 @@ public class PetApiController extends Controller { } - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -126,8 +126,8 @@ public class PetApiController extends Controller { } - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -137,41 +137,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java index 591c99e164a..5a638f0392c 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags( @NotNull List tags) throws Exception { + public List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb..394d8978e0d 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java @@ -13,20 +13,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus( @NotNull List status) throws Exception; + List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - List findPetsByTags( @NotNull List tags) throws Exception; + List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } 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 5384dda3750..394616af289 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 @@ -38,21 +38,21 @@ public class StoreApiController extends Controller { - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -61,8 +61,8 @@ public class StoreApiController extends Controller { } - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -72,7 +72,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java index d0d354a167c..5f10e1c1087 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d0..21c2882cee8 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } 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 923cbd359ca..90180c35f68 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 @@ -38,8 +38,8 @@ public class UserApiController extends Controller { - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -49,13 +49,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -67,13 +67,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -85,19 +85,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -106,35 +106,35 @@ public class UserApiController extends Controller { } - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -144,7 +144,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java index 573053bb537..6297e93df65 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java index 1290c84835f..4f68a438b4b 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser( @NotNull String username, @NotNull String password) throws Exception; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt b/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes b/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/project/build.properties b/samples/server/petstore/java-play-framework-no-wrap-calls/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/project/build.properties +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt b/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file 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 665512747fd..00de0b0a6bc 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -40,8 +40,8 @@ public class PetApiController extends Controller { @ApiAction - public Result addPet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result addPet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -51,26 +51,26 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(body); + imp.addPet(request, body); return ok(); } @ApiAction - public Result deletePet(Long petId) throws Exception { - String valueapiKey = request().getHeader("api_key"); + public Result deletePet(Http.Request request, Long petId) throws Exception { + String valueapiKey = request.header("api_key").get(); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; } else { apiKey = null; } - imp.deletePet(petId, apiKey); + imp.deletePet(request, petId, apiKey); return ok(); } @ApiAction - public Result findPetsByStatus() throws Exception { - String[] statusArray = request().queryString().get("status"); + public Result findPetsByStatus(Http.Request request) throws Exception { + String[] statusArray = request.queryString().get("status"); if (statusArray == null) { throw new IllegalArgumentException("'status' parameter is required"); } @@ -82,7 +82,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(status); + List obj = imp.findPetsByStatus(request, status); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -93,8 +93,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result findPetsByTags() throws Exception { - String[] tagsArray = request().queryString().get("tags"); + public Result findPetsByTags(Http.Request request) throws Exception { + String[] tagsArray = request.queryString().get("tags"); if (tagsArray == null) { throw new IllegalArgumentException("'tags' parameter is required"); } @@ -106,7 +106,7 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + List obj = imp.findPetsByTags(request, tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); @@ -117,8 +117,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result getPetById(Long petId) throws Exception { - Pet obj = imp.getPetById(petId); + public Result getPetById(Http.Request request, Long petId) throws Exception { + Pet obj = imp.getPetById(request, petId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -127,8 +127,8 @@ public class PetApiController extends Controller { } @ApiAction - public Result updatePet() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updatePet(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Pet body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Pet.class); @@ -138,41 +138,41 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(body); + imp.updatePet(request, body); return ok(); } @ApiAction - public Result updatePetWithForm(Long petId) throws Exception { - String valuename = (request().body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; + public Result updatePetWithForm(Http.Request request, Long petId) throws Exception { + String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0]; String name; if (valuename != null) { name = valuename; } else { name = null; } - String valuestatus = (request().body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; + String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0]; String status; if (valuestatus != null) { status = valuestatus; } else { status = null; } - imp.updatePetWithForm(petId, name, status); + imp.updatePetWithForm(request, petId, name, status); return ok(); } @ApiAction - public Result uploadFile(Long petId) throws Exception { - String valueadditionalMetadata = (request().body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; + public Result uploadFile(Http.Request request, Long petId) throws Exception { + String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0]; String additionalMetadata; if (valueadditionalMetadata != null) { additionalMetadata = valueadditionalMetadata; } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request().body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(petId, additionalMetadata, file); + Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java index 591c99e164a..5a638f0392c 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java @@ -14,45 +14,45 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp implements PetApiControllerImpInterface { @Override - public void addPet(Pet body) throws Exception { + public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void deletePet(Long petId, String apiKey) throws Exception { + public void deletePet(Http.Request request, Long petId, String apiKey) throws Exception { //Do your magic!!! } @Override - public List findPetsByStatus( @NotNull List status) throws Exception { + public List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public List findPetsByTags( @NotNull List tags) throws Exception { + public List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception { //Do your magic!!! return new ArrayList(); } @Override - public Pet getPetById(Long petId) throws Exception { + public Pet getPetById(Http.Request request, Long petId) throws Exception { //Do your magic!!! return new Pet(); } @Override - public void updatePet(Pet body) throws Exception { + public void updatePet(Http.Request request, Pet body) throws Exception { //Do your magic!!! } @Override - public void updatePetWithForm(Long petId, String name, String status) throws Exception { + public void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception { //Do your magic!!! } @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { //Do your magic!!! return new ModelApiResponse(); } diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb..394d8978e0d 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java @@ -13,20 +13,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface PetApiControllerImpInterface { - void addPet(Pet body) throws Exception; + void addPet(Http.Request request, Pet body) throws Exception; - void deletePet(Long petId, String apiKey) throws Exception; + void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - List findPetsByStatus( @NotNull List status) throws Exception; + List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; - List findPetsByTags( @NotNull List tags) throws Exception; + List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; - Pet getPetById(Long petId) throws Exception; + Pet getPetById(Http.Request request, Long petId) throws Exception; - void updatePet(Pet body) throws Exception; + void updatePet(Http.Request request, Pet body) throws Exception; - void updatePetWithForm(Long petId, String name, String status) throws Exception; + void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; - ModelApiResponse uploadFile(Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; } 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 1d0e23d3c65..72c0f37c806 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -39,21 +39,21 @@ public class StoreApiController extends Controller { @ApiAction - public Result deleteOrder(String orderId) throws Exception { - imp.deleteOrder(orderId); + public Result deleteOrder(Http.Request request, String orderId) throws Exception { + imp.deleteOrder(request, orderId); return ok(); } @ApiAction - public Result getInventory() throws Exception { - Map obj = imp.getInventory(); + public Result getInventory(Http.Request request) throws Exception { + Map obj = imp.getInventory(request); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { - Order obj = imp.getOrderById(orderId); + public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = imp.getOrderById(request, orderId); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -62,8 +62,8 @@ public class StoreApiController extends Controller { } @ApiAction - public Result placeOrder() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result placeOrder(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); Order body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), Order.class); @@ -73,7 +73,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(body); + Order obj = imp.placeOrder(request, body); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java index d0d354a167c..5f10e1c1087 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java @@ -13,24 +13,24 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override - public void deleteOrder(String orderId) throws Exception { + public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! } @Override - public Map getInventory() throws Exception { + public Map getInventory(Http.Request request) throws Exception { //Do your magic!!! return new HashMap(); } @Override - public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception { + public Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { //Do your magic!!! return new Order(); } @Override - public Order placeOrder(Order body) throws Exception { + public Order placeOrder(Http.Request request, Order body) throws Exception { //Do your magic!!! return new Order(); } diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d0..21c2882cee8 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java @@ -12,12 +12,12 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface StoreApiControllerImpInterface { - void deleteOrder(String orderId) throws Exception; + void deleteOrder(Http.Request request, String orderId) throws Exception; - Map getInventory() throws Exception; + Map getInventory(Http.Request request) throws Exception; - Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception; + Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; - Order placeOrder(Order body) throws Exception; + Order placeOrder(Http.Request request, Order body) throws Exception; } 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 bc58281c258..74f87a82658 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -39,8 +39,8 @@ public class UserApiController extends Controller { @ApiAction - public Result createUser() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUser(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -50,13 +50,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(body); + imp.createUser(request, body); return ok(); } @ApiAction - public Result createUsersWithArrayInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithArrayInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -68,13 +68,13 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(body); + imp.createUsersWithArrayInput(request, body); return ok(); } @ApiAction - public Result createUsersWithListInput() throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result createUsersWithListInput(Http.Request request) throws Exception { + JsonNode nodebody = request.body().asJson(); List body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), new TypeReference>(){}); @@ -86,19 +86,19 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(body); + imp.createUsersWithListInput(request, body); return ok(); } @ApiAction - public Result deleteUser(String username) throws Exception { - imp.deleteUser(username); + public Result deleteUser(Http.Request request, String username) throws Exception { + imp.deleteUser(request, username); return ok(); } @ApiAction - public Result getUserByName(String username) throws Exception { - User obj = imp.getUserByName(username); + public Result getUserByName(Http.Request request, String username) throws Exception { + User obj = imp.getUserByName(request, username); if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); } @@ -107,35 +107,35 @@ public class UserApiController extends Controller { } @ApiAction - public Result loginUser() throws Exception { - String valueusername = request().getQueryString("username"); + public Result loginUser(Http.Request request) throws Exception { + String valueusername = request.getQueryString("username"); String username; if (valueusername != null) { username = valueusername; } else { throw new IllegalArgumentException("'username' parameter is required"); } - String valuepassword = request().getQueryString("password"); + String valuepassword = request.getQueryString("password"); String password; if (valuepassword != null) { password = valuepassword; } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(username, password); + String obj = imp.loginUser(request, username, password); JsonNode result = mapper.valueToTree(obj); return ok(result); } @ApiAction - public Result logoutUser() throws Exception { - imp.logoutUser(); + public Result logoutUser(Http.Request request) throws Exception { + imp.logoutUser(request); return ok(); } @ApiAction - public Result updateUser(String username) throws Exception { - JsonNode nodebody = request().body().asJson(); + public Result updateUser(Http.Request request, String username) throws Exception { + JsonNode nodebody = request.body().asJson(); User body; if (nodebody != null) { body = mapper.readValue(nodebody.toString(), User.class); @@ -145,7 +145,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(username, body); + imp.updateUser(request, username, body); return ok(); } } diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java index 573053bb537..6297e93df65 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java @@ -13,44 +13,44 @@ import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp implements UserApiControllerImpInterface { @Override - public void createUser(User body) throws Exception { + public void createUser(Http.Request request, User body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithArrayInput(List body) throws Exception { + public void createUsersWithArrayInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void createUsersWithListInput(List body) throws Exception { + public void createUsersWithListInput(Http.Request request, List body) throws Exception { //Do your magic!!! } @Override - public void deleteUser(String username) throws Exception { + public void deleteUser(Http.Request request, String username) throws Exception { //Do your magic!!! } @Override - public User getUserByName(String username) throws Exception { + public User getUserByName(Http.Request request, String username) throws Exception { //Do your magic!!! return new User(); } @Override - public String loginUser( @NotNull String username, @NotNull String password) throws Exception { + public String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { //Do your magic!!! return new String(); } @Override - public void logoutUser() throws Exception { + public void logoutUser(Http.Request request) throws Exception { //Do your magic!!! } @Override - public void updateUser(String username, User body) throws Exception { + public void updateUser(Http.Request request, String username, User body) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java index 1290c84835f..4f68a438b4b 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java @@ -12,20 +12,20 @@ import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") public interface UserApiControllerImpInterface { - void createUser(User body) throws Exception; + void createUser(Http.Request request, User body) throws Exception; - void createUsersWithArrayInput(List body) throws Exception; + void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void createUsersWithListInput(List body) throws Exception; + void createUsersWithListInput(Http.Request request, List body) throws Exception; - void deleteUser(String username) throws Exception; + void deleteUser(Http.Request request, String username) throws Exception; - User getUserByName(String username) throws Exception; + User getUserByName(Http.Request request, String username) throws Exception; - String loginUser( @NotNull String username, @NotNull String password) throws Exception; + String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; - void logoutUser() throws Exception; + void logoutUser(Http.Request request) throws Exception; - void updateUser(String username, User body) throws Exception; + void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework/build.sbt b/samples/server/petstore/java-play-framework/build.sbt index 76d960068cd..83a17e91013 100644 --- a/samples/server/petstore/java-play-framework/build.sbt +++ b/samples/server/petstore/java-play-framework/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava) scalaVersion := "2.12.6" -libraryDependencies += "org.webjars" % "swagger-ui" % "3.23.5" +libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5" libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final" libraryDependencies += guice diff --git a/samples/server/petstore/java-play-framework/conf/routes b/samples/server/petstore/java-play-framework/conf/routes index 775497a59fc..69cc666cc77 100644 --- a/samples/server/petstore/java-play-framework/conf/routes +++ b/samples/server/petstore/java-play-framework/conf/routes @@ -6,30 +6,30 @@ GET /api controllers.ApiDocController.api #Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) +POST /v2/pet controllers.PetApiController.addPet(request: Request) +DELETE /v2/pet/:petId controllers.PetApiController.deletePet(request: Request, petId: Long) +GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus(request: Request) +GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags(request: Request) +GET /v2/pet/:petId controllers.PetApiController.getPetById(request: Request, petId: Long) +PUT /v2/pet controllers.PetApiController.updatePet(request: Request) +POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(request: Request, petId: Long) +POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(request: Request, petId: Long) #Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() +DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(request: Request, orderId: String) +GET /v2/store/inventory controllers.StoreApiController.getInventory(request: Request) +GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(request: Request, orderId: Long) +POST /v2/store/order controllers.StoreApiController.placeOrder(request: Request) #Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) +POST /v2/user controllers.UserApiController.createUser(request: Request) +POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput(request: Request) +POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput(request: Request) +DELETE /v2/user/:username controllers.UserApiController.deleteUser(request: Request, username: String) +GET /v2/user/:username controllers.UserApiController.getUserByName(request: Request, username: String) +GET /v2/user/login controllers.UserApiController.loginUser(request: Request) +GET /v2/user/logout controllers.UserApiController.logoutUser(request: Request) +PUT /v2/user/:username controllers.UserApiController.updateUser(request: Request, username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework/project/build.properties b/samples/server/petstore/java-play-framework/project/build.properties index cf19fd026fd..d7ec7acfad2 100644 --- a/samples/server/petstore/java-play-framework/project/build.properties +++ b/samples/server/petstore/java-play-framework/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 \ No newline at end of file +sbt.version=1.3.13 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/project/plugins.sbt b/samples/server/petstore/java-play-framework/project/plugins.sbt index 0baa33f9c05..23a36aef596 100644 --- a/samples/server/petstore/java-play-framework/project/plugins.sbt +++ b/samples/server/petstore/java-play-framework/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.5") \ No newline at end of file