diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java index 1cfd2e63ad9..38c06150c56 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java @@ -297,13 +297,13 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea for (CodegenParameter param : operation.allParams) { if (param.isFormParam && param.isFile) { - param.dataType = "Http.MultipartFormData.FilePart"; + param.dataType = "Http.MultipartFormData.FilePart"; } } for (CodegenParameter param : operation.formParams) { if (param.isFile) { - param.dataType = "Http.MultipartFormData.FilePart"; + param.dataType = "Http.MultipartFormData.FilePart"; } } diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiCall.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiCall.mustache index 7f7d3f78484..7a74f4e6716 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiCall.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/apiCall.mustache @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache index d9dd20aaf92..9236d00f63f 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; {{#supportAsync}} import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletableFuture; @@ -18,7 +19,7 @@ import javax.validation.constraints.*; {{/useBeanValidation}} {{>generatedAnnotation}} {{#operations}} -public class {{classname}}ControllerImp {{#useInterfaces}}implements {{classname}}ControllerImpInterface{{/useInterfaces}} { +public class {{classname}}ControllerImp {{#useInterfaces}}extends {{classname}}ControllerImpInterface{{/useInterfaces}} { {{#operation}} {{#useInterfaces}}@Override{{/useInterfaces}} 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}} { diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache index 78590697b8f..277751a3084 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; {{^handleExceptions}} import java.io.IOException; {{/handleExceptions}} @@ -38,7 +39,6 @@ import openapitools.OpenAPIUtils.ApiAction; {{>generatedAnnotation}} {{#operations}} public class {{classname}}Controller extends Controller { - {{^controllerOnly}} private final {{classname}}ControllerImp{{#useInterfaces}}Interface{{/useInterfaces}} imp; {{/controllerOnly}} @@ -59,7 +59,6 @@ public class {{classname}}Controller extends Controller { } {{#operation}} - {{#wrapCalls}}@ApiAction{{/wrapCalls}} 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}} @@ -129,9 +128,10 @@ public class {{classname}}Controller extends Controller { {{/queryParams}} {{#formParams}} {{#isFile}} - {{{dataType}}} {{paramName}} = request.body().asMultipartFormData().getFile("{{baseName}}"); + Http.MultipartFormData body{{paramName}} = request.body().asMultipartFormData(); + {{{dataType}}} {{paramName}} = body{{paramName}}.getFile("{{baseName}}"); {{#required}} - if (({{paramName}} == null || ((File) {{paramName}}.getFile()).length() == 0)) { + if (({{paramName}} == null || {{paramName}}.getFileSize() == 0)) { throw new IllegalArgumentException("'{{baseName}}' file cannot be empty"); } {{/required}} @@ -201,82 +201,24 @@ public class {{classname}}Controller extends Controller { } {{/collectionFormat}} {{/headerParams}} - {{^controllerOnly}} - {{^returnType}} - {{#supportAsync}} - return CompletableFuture.supplyAsync(() -> { - {{/supportAsync}} - {{/returnType}} - {{#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}} - {{#useBeanValidation}} - {{^supportAsync}} - if (configuration.getBoolean("useOutputBeanValidation")) { - {{#isArray}} - for ({{{returnType}}} curItem : obj) { - OpenAPIUtils.validate(curItem); - } - {{/isArray}} - {{#isMap}} - for (Map.Entry entry : obj.entrySet()) { - OpenAPIUtils.validate(entry.getValue()); - } - {{/isMap}} - {{^returnContainer}} - OpenAPIUtils.validate(obj); - {{/returnContainer}} - } - {{/supportAsync}} - {{#supportAsync}} - if (configuration.getBoolean("useOutputBeanValidation")) { - {{#isArray}} - for ({{{returnType}}} curItem : obj) { - OpenAPIUtils.validate(curItem); - } - {{/isArray}} - {{#isMap}} - for (Map.Entry entry : obj.entrySet()) { - OpenAPIUtils.validate(entry.getValue()); - } - {{/isMap}} - {{^returnContainer}} - OpenAPIUtils.validate(obj); - {{/returnContainer}} - } - {{/supportAsync}} - {{/useBeanValidation}} - {{/returnTypeIsPrimitive}} - {{/isResponseFile}} - {{#supportAsync}} - return obj; - }); - {{/supportAsync}} - {{/returnType}} - {{#returnType}} - {{#supportAsync}} - stage.thenApply(obj -> { - {{/supportAsync}} - {{^isResponseFile}} - {{#supportAsync}} {{/supportAsync}}JsonNode result = mapper.valueToTree(obj); - {{#supportAsync}} {{/supportAsync}}return ok(result); - {{/isResponseFile}} - {{#isResponseFile}} - {{#supportAsync}} {{/supportAsync}}return ok(obj); - {{/isResponseFile}} - {{/returnType}} - {{^returnType}} - {{#supportAsync}} {{/supportAsync}}return ok(); - {{/returnType}} - {{#supportAsync}} - }); - {{/supportAsync}} - {{/controllerOnly}} + {{#useInterfaces}} {{#controllerOnly}} return ok(); {{/controllerOnly}} + {{^controllerOnly}} + {{#supportAsync}} + return imp.{{operationId}}Http(request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); + {{/supportAsync}} + {{^supportAsync}} + return imp.{{operationId}}Http(request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); + {{/supportAsync}} + {{/controllerOnly}} + {{/useInterfaces}} + {{^useInterfaces}} + {{>responseToResult}} + {{/useInterfaces}} } + {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache index 9b0e4738c87..8802c16a7be 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache @@ -3,10 +3,19 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; {{#supportAsync}} import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletableFuture; @@ -18,9 +27,18 @@ import javax.validation.constraints.*; {{#operations}} @SuppressWarnings("RedundantThrows") -public interface {{classname}}ControllerImpInterface { +public abstract class {{classname}}ControllerImpInterface { + {{#useBeanValidation}} + @Inject private Config configuration; + {{/useBeanValidation}} + private ObjectMapper mapper = new ObjectMapper(); + {{#operation}} - {{^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}}; + public {{#supportAsync}}CompletionStage<{{/supportAsync}}Result{{#supportAsync}}>{{/supportAsync}} {{operationId}}Http(Http.Request request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}} { + {{>responseToResult}} + } + + public abstract {{^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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/responseToResult.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/responseToResult.mustache new file mode 100644 index 00000000000..1ffc3bbe73b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/responseToResult.mustache @@ -0,0 +1,75 @@ +{{^controllerOnly}} +{{^returnType}} +{{#supportAsync}} +return CompletableFuture.supplyAsync(() -> { +{{/supportAsync}} +{{/returnType}} +{{#returnType}}{{#supportAsync}}CompletionStage<{{>returnTypesNoVoid}}> stage = {{/supportAsync}}{{^supportAsync}}{{>returnTypesNoVoid}} obj = {{/supportAsync}}{{/returnType}}{{^returnType}}{{#supportAsync}} {{/supportAsync}}{{/returnType}}{{^useInterfaces}}imp.{{/useInterfaces}}{{operationId}}(request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}{{#supportAsync}}.thenApply(obj -> { {{/supportAsync}}{{/returnType}}{{^supportAsync}};{{/supportAsync}}{{#supportAsync}}{{^returnType}};{{/returnType}}{{/supportAsync}} +{{#returnType}} +{{^isResponseFile}} +{{^returnTypeIsPrimitive}} +{{#useBeanValidation}} +{{^supportAsync}} + if (configuration.getBoolean("useOutputBeanValidation")) { + {{#isArray}} + for ({{{returnType}}} curItem : obj) { + OpenAPIUtils.validate(curItem); + } + {{/isArray}} + {{#isMap}} + for (Map.Entry entry : obj.entrySet()) { + OpenAPIUtils.validate(entry.getValue()); + } + {{/isMap}} + {{^returnContainer}} + OpenAPIUtils.validate(obj); + {{/returnContainer}} + } +{{/supportAsync}} +{{#supportAsync}} + if (configuration.getBoolean("useOutputBeanValidation")) { + {{#isArray}} + for ({{{returnType}}} curItem : obj) { + OpenAPIUtils.validate(curItem); + } + {{/isArray}} + {{#isMap}} + for (Map.Entry entry : obj.entrySet()) { + OpenAPIUtils.validate(entry.getValue()); + } + {{/isMap}} + {{^returnContainer}} + OpenAPIUtils.validate(obj); + {{/returnContainer}} + } +{{/supportAsync}} +{{/useBeanValidation}} +{{/returnTypeIsPrimitive}} +{{/isResponseFile}} +{{#supportAsync}} + return obj; +}); +{{/supportAsync}} +{{/returnType}} +{{#returnType}} +{{#supportAsync}} +stage.thenApply(obj -> { +{{/supportAsync}} +{{^isResponseFile}} +{{#supportAsync}} {{/supportAsync}}JsonNode result = mapper.valueToTree(obj); +{{#supportAsync}} {{/supportAsync}}return ok(result); +{{/isResponseFile}} +{{#isResponseFile}} +{{#supportAsync}} {{/supportAsync}}return ok(obj); +{{/isResponseFile}} +{{/returnType}} +{{^returnType}} +{{#supportAsync}} {{/supportAsync}}return ok(); +{{/returnType}} +{{#supportAsync}} +}); +{{/supportAsync}} +{{/controllerOnly}} +{{#controllerOnly}} +return ok(); +{{/controllerOnly}} \ No newline at end of file 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 4c7207fd8f2..bf698553c72 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,7 +38,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -51,8 +50,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -64,8 +62,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -82,14 +79,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -106,24 +96,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -138,8 +116,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -158,8 +135,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -171,12 +147,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 95181dafd17..fc544e94a8a 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 @@ -10,9 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -52,7 +53,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 f6ca5109af8..04b819b6419 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 @@ -4,29 +4,109 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull List tags) throws Exception { + List obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 a41058e9bb0..938275ae86a 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,28 +37,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -73,11 +64,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 3ecdb8f6a79..a2023ed961e 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 ce5deb59f95..74de37a8286 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 @@ -3,21 +3,66 @@ package com.puppies.store.apis; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 d95f368607f..4ed309b5ccb 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -50,8 +49,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -68,8 +66,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -86,24 +83,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -122,15 +112,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -145,7 +132,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 49dd6850244..f9c327a7df6 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 85ca984afa1..7598a69e94e 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 @@ -3,29 +3,94 @@ package com.puppies.store.apis; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 2616cd2fd6d..e319357a0da 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -29,7 +30,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -41,7 +41,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public CompletionStage addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -54,10 +53,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return CompletableFuture.supplyAsync(() -> { - imp.addPet(request, body); - return ok(); - }); + return imp.addPetHttp(request, body); } @ApiAction @@ -69,10 +65,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - return CompletableFuture.supplyAsync(() -> { - imp.deletePet(request, petId, apiKey); - return ok(); - }); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -89,18 +82,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - CompletionStage> stage = imp.findPetsByStatus(request, status).thenApply(obj -> { - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -117,32 +99,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - CompletionStage> stage = imp.findPetsByTags(request, tags).thenApply(obj -> { - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction 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); - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -157,10 +119,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return CompletableFuture.supplyAsync(() -> { - imp.updatePet(request, body); - return ok(); - }); + return imp.updatePetHttp(request, body); } @ApiAction @@ -179,10 +138,7 @@ public class PetApiController extends Controller { } else { status = null; } - return CompletableFuture.supplyAsync(() -> { - imp.updatePetWithForm(request, petId, name, status); - return ok(); - }); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -194,16 +150,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - 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); - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 d4c55be8a23..840de8c10c0 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,11 +10,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; 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 { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -60,7 +61,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public CompletionStage uploadFile(Http.Request request, 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 cef49b2d231..5c1864e46b9 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 @@ -4,31 +4,135 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletableFuture; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public CompletionStage addPetHttp(Http.Request request, Pet body) throws Exception { + return CompletableFuture.supplyAsync(() -> { + addPet(request, body); + return ok(); +}); - CompletionStage> findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - CompletionStage> findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - CompletionStage getPetById(Http.Request request, Long petId) throws Exception; + public CompletionStage deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + return CompletableFuture.supplyAsync(() -> { + deletePet(request, petId, apiKey); + return ok(); +}); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - CompletionStage uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public CompletionStage findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + CompletionStage> stage = findPetsByStatus(request, status).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage> findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public CompletionStage findPetsByTagsHttp(Http.Request request, @NotNull List tags) throws Exception { + CompletionStage> stage = findPetsByTags(request, tags).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage> findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + + public CompletionStage getPetByIdHttp(Http.Request request, Long petId) throws Exception { + CompletionStage stage = getPetById(request, petId).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage getPetById(Http.Request request, Long petId) throws Exception; + + public CompletionStage updatePetHttp(Http.Request request, Pet body) throws Exception { + return CompletableFuture.supplyAsync(() -> { + updatePet(request, body); + return ok(); +}); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public CompletionStage updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + return CompletableFuture.supplyAsync(() -> { + updatePetWithForm(request, petId, name, status); + return ok(); +}); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public CompletionStage uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + CompletionStage stage = uploadFile(request, petId, additionalMetadata, file).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract 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 5288f7ea46c..3ef234d8197 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -28,7 +29,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -40,38 +40,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public CompletionStage deleteOrder(Http.Request request, String orderId) throws Exception { - return CompletableFuture.supplyAsync(() -> { - imp.deleteOrder(request, orderId); - return ok(); - }); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public CompletionStage getInventory(Http.Request request) throws Exception { - CompletionStage> stage = imp.getInventory(request).thenApply(obj -> { - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -86,15 +67,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - CompletionStage stage = imp.placeOrder(request, body).thenApply(obj -> { - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.placeOrderHttp(request, body); } + } 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 faa02abb54f..bc81c623fe1 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,11 +9,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; 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 { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 a37df238f63..3c59e23a74e 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 @@ -3,23 +3,82 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletableFuture; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - CompletionStage> getInventory(Http.Request request) throws Exception; + public CompletionStage deleteOrderHttp(Http.Request request, String orderId) throws Exception { + return CompletableFuture.supplyAsync(() -> { + deleteOrder(request, orderId); + return ok(); +}); - CompletionStage getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - CompletionStage placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public CompletionStage getInventoryHttp(Http.Request request) throws Exception { + CompletionStage> stage = getInventory(request).thenApply(obj -> { + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage> getInventory(Http.Request request) throws Exception; + + public CompletionStage getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + CompletionStage stage = getOrderById(request, orderId).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public CompletionStage placeOrderHttp(Http.Request request, Order body) throws Exception { + CompletionStage stage = placeOrder(request, body).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract 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 9e4808d0c12..e69c5acae5a 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -28,7 +29,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -40,7 +40,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public CompletionStage createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -53,10 +52,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return CompletableFuture.supplyAsync(() -> { - imp.createUser(request, body); - return ok(); - }); + return imp.createUserHttp(request, body); } @ApiAction @@ -73,10 +69,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return CompletableFuture.supplyAsync(() -> { - imp.createUsersWithArrayInput(request, body); - return ok(); - }); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -93,32 +86,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return CompletableFuture.supplyAsync(() -> { - imp.createUsersWithListInput(request, body); - return ok(); - }); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public CompletionStage deleteUser(Http.Request request, String username) throws Exception { - return CompletableFuture.supplyAsync(() -> { - imp.deleteUser(request, username); - return ok(); - }); + return imp.deleteUserHttp(request, username); } @ApiAction 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); - } - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -137,21 +115,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - CompletionStage stage = imp.loginUser(request, username, password).thenApply(obj -> { - return obj; - }); - stage.thenApply(obj -> { - JsonNode result = mapper.valueToTree(obj); - return ok(result); - }); + return imp.loginUserHttp(request, username, password); } @ApiAction public CompletionStage logoutUser(Http.Request request) throws Exception { - return CompletableFuture.supplyAsync(() -> { - imp.logoutUser(request); - return ok(); - }); + return imp.logoutUserHttp(request); } @ApiAction @@ -166,9 +135,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - return CompletableFuture.supplyAsync(() -> { - imp.updateUser(request, username, body); - return ok(); - }); + return imp.updateUserHttp(request, username, body); } + } 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 f5092a77f63..ab320c969cf 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,11 +9,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; 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 { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 32e3f34c9fa..62e6468f672 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 @@ -3,31 +3,116 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletableFuture; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public CompletionStage createUserHttp(Http.Request request, User body) throws Exception { + return CompletableFuture.supplyAsync(() -> { + createUser(request, body); + return ok(); +}); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - CompletionStage getUserByName(Http.Request request, String username) throws Exception; + public CompletionStage createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + return CompletableFuture.supplyAsync(() -> { + createUsersWithArrayInput(request, body); + return ok(); +}); - CompletionStage loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public CompletionStage createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + return CompletableFuture.supplyAsync(() -> { + createUsersWithListInput(request, body); + return ok(); +}); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public CompletionStage deleteUserHttp(Http.Request request, String username) throws Exception { + return CompletableFuture.supplyAsync(() -> { + deleteUser(request, username); + return ok(); +}); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public CompletionStage getUserByNameHttp(Http.Request request, String username) throws Exception { + CompletionStage stage = getUserByName(request, username).thenApply(obj -> { + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage getUserByName(Http.Request request, String username) throws Exception; + + public CompletionStage loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + CompletionStage stage = loginUser(request, username, password).thenApply(obj -> { + return obj; +}); +stage.thenApply(obj -> { + JsonNode result = mapper.valueToTree(obj); + return ok(result); +}); + + } + + public abstract CompletionStage loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public CompletionStage logoutUserHttp(Http.Request request) throws Exception { + return CompletableFuture.supplyAsync(() -> { + logoutUser(request); + return ok(); +}); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public CompletionStage updateUserHttp(Http.Request request, String username, User body) throws Exception { + return CompletableFuture.supplyAsync(() -> { + updateUser(request, username, body); + return ok(); +}); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-async/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-async/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-async/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-async/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 1401c062cd3..9d3581ada51 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final ObjectMapper mapper; private final Config configuration; @@ -36,7 +36,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -146,7 +145,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.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 b5226dc51bf..78a5e62deb0 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final ObjectMapper mapper; private final Config configuration; @@ -35,7 +35,6 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { return ok(); @@ -65,4 +64,5 @@ public class StoreApiController extends Controller { } return ok(); } + } 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 5a56614f0f7..8abbdf5b326 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final ObjectMapper mapper; private final Config configuration; @@ -35,7 +35,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -133,4 +132,5 @@ public class UserApiController extends Controller { } return ok(); } + } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 91b273f1c6a..7d3a96cc0bd 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 @@ -14,6 +14,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -24,7 +25,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class AnotherFakeApiController extends Controller { - private final AnotherFakeApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -36,7 +36,6 @@ public class AnotherFakeApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result call123testSpecialTags(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -49,11 +48,7 @@ public class AnotherFakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Client obj = imp.call123testSpecialTags(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.call123testSpecialTagsHttp(request, body); } + } 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 fd2f431c5b8..3aa93fff166 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 @@ -8,9 +8,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class AnotherFakeApiControllerImp implements AnotherFakeApiControllerImpInterface { +public class AnotherFakeApiControllerImp extends AnotherFakeApiControllerImpInterface { @Override public Client call123testSpecialTags(Http.Request request, Client body) throws Exception { //Do your magic!!! 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 54318801e56..6be777ea58d 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 @@ -2,15 +2,37 @@ package controllers; import apimodels.Client; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface AnotherFakeApiControllerImpInterface { - Client call123testSpecialTags(Http.Request request, Client body) throws Exception; +public abstract class AnotherFakeApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); + + public Result call123testSpecialTagsHttp(Http.Request request, Client body) throws Exception { + Client obj = call123testSpecialTags(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 2b41da8a952..2009aaef989 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 @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -33,7 +34,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class FakeApiController extends Controller { - private final FakeApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -45,7 +45,6 @@ public class FakeApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createXmlItem(Http.Request request) throws Exception { JsonNode nodexmlItem = request.body().asJson(); @@ -58,8 +57,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'XmlItem' parameter is required"); } - imp.createXmlItem(request, xmlItem); - return ok(); + return imp.createXmlItemHttp(request, xmlItem); } @ApiAction @@ -74,9 +72,7 @@ public class FakeApiController extends Controller { } else { body = null; } - Boolean obj = imp.fakeOuterBooleanSerialize(request, body); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.fakeOuterBooleanSerializeHttp(request, body); } @ApiAction @@ -91,12 +87,7 @@ public class FakeApiController extends Controller { } else { body = null; } - OuterComposite obj = imp.fakeOuterCompositeSerialize(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.fakeOuterCompositeSerializeHttp(request, body); } @ApiAction @@ -111,12 +102,7 @@ public class FakeApiController extends Controller { } else { body = null; } - BigDecimal obj = imp.fakeOuterNumberSerialize(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.fakeOuterNumberSerializeHttp(request, body); } @ApiAction @@ -131,9 +117,7 @@ public class FakeApiController extends Controller { } else { body = null; } - String obj = imp.fakeOuterStringSerialize(request, body); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.fakeOuterStringSerializeHttp(request, body); } @ApiAction @@ -148,8 +132,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.testBodyWithFileSchema(request, body); - return ok(); + return imp.testBodyWithFileSchemaHttp(request, body); } @ApiAction @@ -171,8 +154,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'query' parameter is required"); } - imp.testBodyWithQueryParams(request, query, body); - return ok(); + return imp.testBodyWithQueryParamsHttp(request, query, body); } @ApiAction @@ -187,12 +169,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Client obj = imp.testClientModel(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.testClientModelHttp(request, body); } @ApiAction @@ -260,7 +237,8 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'byte' parameter is required"); } - Http.MultipartFormData.FilePart binary = request.body().asMultipartFormData().getFile("binary"); + Http.MultipartFormData bodybinary = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart binary = bodybinary.getFile("binary"); String valuedate = (request.body().asMultipartFormData().asFormUrlEncoded().get("date"))[0]; LocalDate date; if (valuedate != null) { @@ -289,8 +267,7 @@ public class FakeApiController extends Controller { } else { paramCallback = null; } - imp.testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); - return ok(); + return imp.testEndpointParametersHttp(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @ApiAction @@ -357,8 +334,7 @@ public class FakeApiController extends Controller { } else { enumHeaderString = "-efg"; } - imp.testEnumParameters(request, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); - return ok(); + return imp.testEnumParametersHttp(request, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @ApiAction @@ -405,8 +381,7 @@ public class FakeApiController extends Controller { } else { booleanGroup = null; } - imp.testGroupParameters(request, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); - return ok(); + return imp.testGroupParametersHttp(request, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @ApiAction @@ -423,8 +398,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'param' parameter is required"); } - imp.testInlineAdditionalProperties(request, param); - return ok(); + return imp.testInlineAdditionalPropertiesHttp(request, param); } @ApiAction @@ -443,8 +417,7 @@ public class FakeApiController extends Controller { } else { throw new IllegalArgumentException("'param2' parameter is required"); } - imp.testJsonFormData(request, param, param2); - return ok(); + return imp.testJsonFormDataHttp(request, param, param2); } @ApiAction @@ -509,7 +482,7 @@ public class FakeApiController extends Controller { context.add(curParam); } } - imp.testQueryParameterCollectionFormat(request, pipe, ioutil, http, url, context); - return ok(); + return imp.testQueryParameterCollectionFormatHttp(request, pipe, ioutil, http, url, context); } + } 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 7eb83b8bc0e..d57b5250c99 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 @@ -17,9 +17,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class FakeApiControllerImp implements FakeApiControllerImpInterface { +public class FakeApiControllerImp extends FakeApiControllerImpInterface { @Override public void createXmlItem(Http.Request request, XmlItem xmlItem) throws Exception { //Do your magic!!! @@ -66,7 +67,7 @@ public class FakeApiControllerImp implements FakeApiControllerImpInterface { } @Override - 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 { + 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!!! } 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 2d34548a3ba..ae8cb9d6b06 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 @@ -11,41 +11,151 @@ import apimodels.OuterComposite; import apimodels.User; import apimodels.XmlItem; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface FakeApiControllerImpInterface { - void createXmlItem(Http.Request request, XmlItem xmlItem) throws Exception; +public abstract class FakeApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Boolean fakeOuterBooleanSerialize(Http.Request request, Boolean body) throws Exception; + public Result createXmlItemHttp(Http.Request request, XmlItem xmlItem) throws Exception { + createXmlItem(request, xmlItem); +return ok(); - OuterComposite fakeOuterCompositeSerialize(Http.Request request, OuterComposite body) throws Exception; + } - BigDecimal fakeOuterNumberSerialize(Http.Request request, BigDecimal body) throws Exception; + public abstract void createXmlItem(Http.Request request, XmlItem xmlItem) throws Exception; - String fakeOuterStringSerialize(Http.Request request, String body) throws Exception; + public Result fakeOuterBooleanSerializeHttp(Http.Request request, Boolean body) throws Exception { + Boolean obj = fakeOuterBooleanSerialize(request, body); +JsonNode result = mapper.valueToTree(obj); +return ok(result); - void testBodyWithFileSchema(Http.Request request, FileSchemaTestClass body) throws Exception; + } - void testBodyWithQueryParams(Http.Request request, @NotNull String query, User body) throws Exception; + public abstract Boolean fakeOuterBooleanSerialize(Http.Request request, Boolean body) throws Exception; - Client testClientModel(Http.Request request, Client body) throws Exception; + public Result fakeOuterCompositeSerializeHttp(Http.Request request, OuterComposite body) throws Exception { + OuterComposite obj = fakeOuterCompositeSerialize(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); - 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(Http.Request request, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception; + public abstract OuterComposite fakeOuterCompositeSerialize(Http.Request request, OuterComposite body) throws Exception; - void testGroupParameters(Http.Request request, @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception; + public Result fakeOuterNumberSerializeHttp(Http.Request request, BigDecimal body) throws Exception { + BigDecimal obj = fakeOuterNumberSerialize(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); - void testInlineAdditionalProperties(Http.Request request, Map param) throws Exception; + } - void testJsonFormData(Http.Request request, String param, String param2) throws Exception; + public abstract BigDecimal fakeOuterNumberSerialize(Http.Request request, BigDecimal body) throws Exception; - void testQueryParameterCollectionFormat(Http.Request request, @NotNull List pipe, @NotNull List ioutil, @NotNull List http, @NotNull List url, @NotNull List context) throws Exception; + public Result fakeOuterStringSerializeHttp(Http.Request request, String body) throws Exception { + String obj = fakeOuterStringSerialize(request, body); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String fakeOuterStringSerialize(Http.Request request, String body) throws Exception; + + public Result testBodyWithFileSchemaHttp(Http.Request request, FileSchemaTestClass body) throws Exception { + testBodyWithFileSchema(request, body); +return ok(); + + } + + public abstract void testBodyWithFileSchema(Http.Request request, FileSchemaTestClass body) throws Exception; + + public Result testBodyWithQueryParamsHttp(Http.Request request, @NotNull String query, User body) throws Exception { + testBodyWithQueryParams(request, query, body); +return ok(); + + } + + public abstract void testBodyWithQueryParams(Http.Request request, @NotNull String query, User body) throws Exception; + + public Result testClientModelHttp(Http.Request request, Client body) throws Exception { + Client obj = testClientModel(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Client testClientModel(Http.Request request, Client body) throws Exception; + + public Result testEndpointParametersHttp(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 { + testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); +return ok(); + + } + + public abstract 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; + + public Result testEnumParametersHttp(Http.Request request, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception { + testEnumParameters(request, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); +return ok(); + + } + + public abstract void testEnumParameters(Http.Request request, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception; + + public Result testGroupParametersHttp(Http.Request request, @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception { + testGroupParameters(request, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); +return ok(); + + } + + public abstract void testGroupParameters(Http.Request request, @NotNull Integer requiredStringGroup, Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws Exception; + + public Result testInlineAdditionalPropertiesHttp(Http.Request request, Map param) throws Exception { + testInlineAdditionalProperties(request, param); +return ok(); + + } + + public abstract void testInlineAdditionalProperties(Http.Request request, Map param) throws Exception; + + public Result testJsonFormDataHttp(Http.Request request, String param, String param2) throws Exception { + testJsonFormData(request, param, param2); +return ok(); + + } + + public abstract void testJsonFormData(Http.Request request, String param, String param2) throws Exception; + + public Result testQueryParameterCollectionFormatHttp(Http.Request request, @NotNull List pipe, @NotNull List ioutil, @NotNull List http, @NotNull List url, @NotNull List context) throws Exception { + testQueryParameterCollectionFormat(request, pipe, ioutil, http, url, context); +return ok(); + + } + + public abstract 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 88f4e6387c3..dbc96b742da 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 @@ -14,6 +14,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -24,7 +25,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class FakeClassnameTags123ApiController extends Controller { - private final FakeClassnameTags123ApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -36,7 +36,6 @@ public class FakeClassnameTags123ApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result testClassname(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -49,11 +48,7 @@ public class FakeClassnameTags123ApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Client obj = imp.testClassname(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.testClassnameHttp(request, body); } + } 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 78c3ad6b6f1..142ab1945db 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 @@ -8,9 +8,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class FakeClassnameTags123ApiControllerImp implements FakeClassnameTags123ApiControllerImpInterface { +public class FakeClassnameTags123ApiControllerImp extends FakeClassnameTags123ApiControllerImpInterface { @Override public Client testClassname(Http.Request request, Client body) throws Exception { //Do your magic!!! 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 559e67dc85a..b7da5f12db2 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 @@ -2,15 +2,37 @@ package controllers; import apimodels.Client; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface FakeClassnameTags123ApiControllerImpInterface { - Client testClassname(Http.Request request, Client body) throws Exception; +public abstract class FakeClassnameTags123ApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); + + public Result testClassnameHttp(Http.Request request, Client body) throws Exception { + Client obj = testClassname(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 b2aff6a1d95..19a05c08f8c 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 @@ -17,6 +17,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -27,7 +28,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -39,7 +39,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -52,8 +51,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -65,8 +63,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -83,14 +80,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -107,24 +97,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - Set obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -139,8 +117,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -159,8 +136,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -172,13 +148,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } @ApiAction @@ -190,15 +162,12 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart requiredFile = request.body().asMultipartFormData().getFile("requiredFile"); - if ((requiredFile == null || ((File) requiredFile.getFile()).length() == 0)) { + Http.MultipartFormData bodyrequiredFile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart requiredFile = bodyrequiredFile.getFile("requiredFile"); + if ((requiredFile == null || requiredFile.getFileSize() == 0)) { throw new IllegalArgumentException("'requiredFile' file cannot be empty"); } - ModelApiResponse obj = imp.uploadFileWithRequiredFile(request, petId, requiredFile, additionalMetadata); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.uploadFileWithRequiredFileHttp(request, petId, requiredFile, additionalMetadata); } + } 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 74250653bee..990bbda5151 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 @@ -11,9 +11,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -53,13 +54,13 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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(Http.Request request, 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 339c0b60be3..537ce582ac2 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 @@ -5,31 +5,121 @@ import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - Set findPetsByTags(Http.Request request, @NotNull Set tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); - ModelApiResponse uploadFileWithRequiredFile(Http.Request request, Long petId, Http.MultipartFormData.FilePart requiredFile, String additionalMetadata) throws Exception; + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull Set tags) throws Exception { + Set obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Set findPetsByTags(Http.Request request, @NotNull Set tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + + public Result uploadFileWithRequiredFileHttp(Http.Request request, Long petId, Http.MultipartFormData.FilePart requiredFile, String additionalMetadata) throws Exception { + ModelApiResponse obj = uploadFileWithRequiredFile(request, petId, requiredFile, additionalMetadata); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 72c0f37c806..c8734ebe8ea 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,28 +37,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -73,11 +64,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 5f10e1c1087..1715aeba67c 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 21c2882cee8..2d15d750c2c 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 @@ -3,21 +3,66 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 74f87a82658..22e303ad3fe 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -50,8 +49,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -68,8 +66,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -86,24 +83,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -122,15 +112,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -145,7 +132,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 6297e93df65..267c4636db8 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 4f68a438b4b..e1f0e030b1c 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 @@ -3,29 +3,94 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 e3bd0dbb7a2..08339f1c579 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -24,7 +25,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; @@ -34,7 +34,6 @@ public class PetApiController extends Controller { mapper = new ObjectMapper(); } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -44,8 +43,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -57,8 +55,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -75,9 +72,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -94,16 +89,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -115,8 +106,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -135,8 +125,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -148,9 +137,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - 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); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 1fd9d9d7324..f368184ed7c 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 @@ -10,8 +10,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -51,7 +52,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 42a76030ad5..f004f765d73 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 @@ -4,28 +4,91 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, List status) throws Exception; + } - List findPetsByTags(Http.Request request, List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, List status) throws Exception { + List obj = findPetsByStatus(request, status); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, List tags) throws Exception { + List obj = findPetsByTags(request, tags); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, List tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 51ccde4f843..b7f19acfb5a 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -23,7 +24,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; @@ -33,25 +33,19 @@ public class StoreApiController extends Controller { mapper = new ObjectMapper(); } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction public Result getOrderById(Http.Request request, Long orderId) throws Exception { - Order obj = imp.getOrderById(request, orderId); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -63,8 +57,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 46ede712360..fe181835352 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 @@ -9,8 +9,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 153102ae6a7..8f515678673 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 @@ -3,20 +3,58 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 d140c89626a..0aa5d8580ea 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -23,7 +24,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; @@ -33,7 +33,6 @@ public class UserApiController extends Controller { mapper = new ObjectMapper(); } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -43,8 +42,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -56,8 +54,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -69,21 +66,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -102,15 +95,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -122,7 +112,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 f51f8b1bd55..be409ef3526 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 @@ -9,8 +9,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 f71d2f3245d..ac972fe05d8 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 @@ -3,28 +3,89 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, String username, String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, String username, String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, String username, String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 c5cc90d897d..80bdb1834f1 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import java.io.IOException; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -27,7 +28,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -39,7 +39,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws IOException { JsonNode nodebody = request.body().asJson(); @@ -52,8 +51,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -65,8 +63,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -83,14 +80,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -107,24 +97,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -139,8 +117,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -159,8 +136,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -172,12 +148,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 cbed4103b88..2657785e743 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 @@ -10,9 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) { //Do your magic!!! @@ -52,7 +53,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 a520ed7dc1f..df09f44ef89 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 @@ -4,29 +4,109 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) ; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) ; + public Result addPetHttp(Http.Request request, Pet body) { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) ; + } - List findPetsByTags(Http.Request request, @NotNull List tags) ; + public abstract void addPet(Http.Request request, Pet body) ; - Pet getPetById(Http.Request request, Long petId) ; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) ; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) ; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) ; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) ; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) ; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull List tags) { + List obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, @NotNull List tags) ; + + public Result getPetByIdHttp(Http.Request request, Long petId) { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) ; + + public Result updatePetHttp(Http.Request request, Pet body) { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) ; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) ; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 3fe9ee62e58..9fb9ce6fd4a 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import java.io.IOException; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,28 +38,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -74,11 +65,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 2abf5ca13f5..c9c4f5b2d4a 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) { //Do your magic!!! 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 bf385ce9367..54e3aa358ce 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 @@ -3,21 +3,66 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) ; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) ; + public Result deleteOrderHttp(Http.Request request, String orderId) { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) ; + } - Order placeOrder(Http.Request request, Order body) ; + public abstract void deleteOrder(Http.Request request, String orderId) ; + + public Result getInventoryHttp(Http.Request request) { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) ; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) ; + + public Result placeOrderHttp(Http.Request request, Order body) { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 abde2ad4ce0..177eb4c0000 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import java.io.IOException; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,7 +38,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws IOException { JsonNode nodebody = request.body().asJson(); @@ -51,8 +50,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -69,8 +67,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -87,24 +84,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -123,15 +113,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -146,7 +133,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 f119c308f86..591e2971e51 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 1c429d4665b..84b3ee88add 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 @@ -3,29 +3,94 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) ; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) ; + public Result createUserHttp(Http.Request request, User body) { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) ; + } - void deleteUser(Http.Request request, String username) ; + public abstract void createUser(Http.Request request, User body) ; - User getUserByName(Http.Request request, String username) ; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) ; + } - void logoutUser(Http.Request request) ; + public abstract void createUsersWithArrayInput(Http.Request request, List body) ; - void updateUser(Http.Request request, String username, User body) ; + public Result createUsersWithListInputHttp(Http.Request request, List body) { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) ; + + public Result deleteUserHttp(Http.Request request, String username) { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) ; + + public Result getUserByNameHttp(Http.Request request, String username) { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) ; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) ; + + public Result logoutUserHttp(Http.Request request) { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) ; + + public Result updateUserHttp(Http.Request request, String username, User body) { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) ; } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 65c17d2fe69..bff360b2ad9 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImp imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,7 +38,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -52,7 +51,8 @@ public class PetApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } imp.addPet(request, body); - return ok(); +return ok(); + } @ApiAction @@ -65,7 +65,8 @@ public class PetApiController extends Controller { apiKey = null; } imp.deletePet(request, petId, apiKey); - return ok(); +return ok(); + } @ApiAction @@ -83,13 +84,14 @@ public class PetApiController extends Controller { } } List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction @@ -107,23 +109,25 @@ public class PetApiController extends Controller { } } List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { + if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction @@ -139,7 +143,8 @@ public class PetApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } imp.updatePet(request, body); - return ok(); +return ok(); + } @ApiAction @@ -159,7 +164,8 @@ public class PetApiController extends Controller { status = null; } imp.updatePetWithForm(request, petId, name, status); - return ok(); +return ok(); + } @ApiAction @@ -171,12 +177,15 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { + if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + } 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 3ef89adebbf..6f84547fbd4 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 @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiControllerImp { @@ -52,7 +53,7 @@ public class PetApiControllerImp { } - public ModelApiResponse uploadFile(Http.Request request, 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 a9eb99e4f0c..4d8f7fb8f7a 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImp imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,28 +37,30 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { imp.deleteOrder(request, orderId); - return ok(); +return ok(); + } @ApiAction public Result getInventory(Http.Request request) throws Exception { Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction public Result getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { Order obj = imp.getOrderById(request, orderId); - if (configuration.getBoolean("useOutputBeanValidation")) { + if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction @@ -74,10 +76,12 @@ public class StoreApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { + if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + } 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 84379628926..f531e3267e8 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 @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiControllerImp { 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 7f74b10c4d8..31db7bd333c 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImp imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -51,7 +50,8 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUser(request, body); - return ok(); +return ok(); + } @ApiAction @@ -69,7 +69,8 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithArrayInput(request, body); - return ok(); +return ok(); + } @ApiAction @@ -87,23 +88,26 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } imp.createUsersWithListInput(request, body); - return ok(); +return ok(); + } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { imp.deleteUser(request, username); - return ok(); +return ok(); + } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { + if (configuration.getBoolean("useOutputBeanValidation")) { OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction @@ -123,14 +127,16 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'password' parameter is required"); } String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + } @ApiAction public Result logoutUser(Http.Request request) throws Exception { imp.logoutUser(request); - return ok(); +return ok(); + } @ApiAction @@ -146,6 +152,8 @@ public class UserApiController extends Controller { throw new IllegalArgumentException("'body' parameter is required"); } imp.updateUser(request, username, body); - return ok(); +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 93ecadd555e..0c7ef76b2c8 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 @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiControllerImp { diff --git a/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 00de0b0a6bc..ddf45c00f58 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,7 +38,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -51,8 +50,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -64,8 +62,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -82,14 +79,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -106,24 +96,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -138,8 +116,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -158,8 +135,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -171,12 +147,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 5a638f0392c..6686efa026c 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 @@ -10,9 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -52,7 +53,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 394d8978e0d..d1d2d9eb73a 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 @@ -4,29 +4,109 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull List tags) throws Exception { + List obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 72c0f37c806..c8734ebe8ea 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,28 +37,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -73,11 +64,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 5f10e1c1087..1715aeba67c 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 21c2882cee8..2d15d750c2c 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 @@ -3,21 +3,66 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 74f87a82658..22e303ad3fe 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -50,8 +49,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -68,8 +66,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -86,24 +83,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -122,15 +112,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -145,7 +132,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 6297e93df65..267c4636db8 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 4f68a438b4b..e1f0e030b1c 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 @@ -3,29 +3,94 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-no-nullable/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 00de0b0a6bc..ddf45c00f58 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,7 +38,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -51,8 +50,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -64,8 +62,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -82,14 +79,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -106,24 +96,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -138,8 +116,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -158,8 +135,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -171,12 +147,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 5a638f0392c..6686efa026c 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 @@ -10,9 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -52,7 +53,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 394d8978e0d..d1d2d9eb73a 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 @@ -4,29 +4,109 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull List tags) throws Exception { + List obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 72c0f37c806..c8734ebe8ea 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,28 +37,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -73,11 +64,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 5f10e1c1087..1715aeba67c 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 21c2882cee8..2d15d750c2c 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 @@ -3,21 +3,66 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 74f87a82658..22e303ad3fe 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -50,8 +49,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -68,8 +66,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -86,24 +83,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -122,15 +112,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -145,7 +132,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 6297e93df65..267c4636db8 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 4f68a438b4b..e1f0e030b1c 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 @@ -3,29 +3,94 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 739e8bccaef..283df7f591b 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 @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import com.typesafe.config.Config; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -50,8 +49,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @@ -63,8 +61,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @@ -81,14 +78,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @@ -105,24 +95,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @@ -137,8 +115,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @@ -157,8 +134,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @@ -170,12 +146,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 5a638f0392c..6686efa026c 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 @@ -10,9 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -52,7 +53,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 394d8978e0d..d1d2d9eb73a 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 @@ -4,29 +4,109 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull List tags) throws Exception { + List obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 394616af289..2243e9dc58d 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -24,7 +25,6 @@ import com.typesafe.config.Config; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -36,28 +36,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @@ -72,11 +63,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 5f10e1c1087..1715aeba67c 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 21c2882cee8..2d15d750c2c 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 @@ -3,21 +3,66 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 90180c35f68..731fc136155 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 @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -24,7 +25,6 @@ import com.typesafe.config.Config; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -36,7 +36,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -49,8 +48,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @@ -67,8 +65,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @@ -85,24 +82,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @@ -121,15 +111,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @@ -144,7 +131,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 6297e93df65..267c4636db8 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 @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 4f68a438b4b..e1f0e030b1c 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 @@ -3,29 +3,94 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } 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 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ 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 00de0b0a6bc..ddf45c00f58 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,7 +27,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class PetApiController extends Controller { - private final PetApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -38,7 +38,6 @@ public class PetApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result addPet(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -51,8 +50,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.addPet(request, body); - return ok(); + return imp.addPetHttp(request, body); } @ApiAction @@ -64,8 +62,7 @@ public class PetApiController extends Controller { } else { apiKey = null; } - imp.deletePet(request, petId, apiKey); - return ok(); + return imp.deletePetHttp(request, petId, apiKey); } @ApiAction @@ -82,14 +79,7 @@ public class PetApiController extends Controller { status.add(curParam); } } - List obj = imp.findPetsByStatus(request, status); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByStatusHttp(request, status); } @ApiAction @@ -106,24 +96,12 @@ public class PetApiController extends Controller { tags.add(curParam); } } - List obj = imp.findPetsByTags(request, tags); - if (configuration.getBoolean("useOutputBeanValidation")) { - for (Pet curItem : obj) { - OpenAPIUtils.validate(curItem); - } - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.findPetsByTagsHttp(request, tags); } @ApiAction public Result getPetById(Http.Request request, Long petId) throws Exception { - Pet obj = imp.getPetById(request, petId); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getPetByIdHttp(request, petId); } @ApiAction @@ -138,8 +116,7 @@ public class PetApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updatePet(request, body); - return ok(); + return imp.updatePetHttp(request, body); } @ApiAction @@ -158,8 +135,7 @@ public class PetApiController extends Controller { } else { status = null; } - imp.updatePetWithForm(request, petId, name, status); - return ok(); + return imp.updatePetWithFormHttp(request, petId, name, status); } @ApiAction @@ -171,12 +147,9 @@ public class PetApiController extends Controller { } else { additionalMetadata = null; } - Http.MultipartFormData.FilePart file = request.body().asMultipartFormData().getFile("file"); - ModelApiResponse obj = imp.uploadFile(request, petId, additionalMetadata, file); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + Http.MultipartFormData bodyfile = request.body().asMultipartFormData(); + Http.MultipartFormData.FilePart file = bodyfile.getFile("file"); + return imp.uploadFileHttp(request, petId, additionalMetadata, file); } + } 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 5a638f0392c..6686efa026c 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java @@ -10,9 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class PetApiControllerImp implements PetApiControllerImpInterface { +public class PetApiControllerImp extends PetApiControllerImpInterface { @Override public void addPet(Http.Request request, Pet body) throws Exception { //Do your magic!!! @@ -52,7 +53,7 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { } @Override - public ModelApiResponse uploadFile(Http.Request request, 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 394d8978e0d..d1d2d9eb73a 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java @@ -4,29 +4,109 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface PetApiControllerImpInterface { - void addPet(Http.Request request, Pet body) throws Exception; +public abstract class PetApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; + public Result addPetHttp(Http.Request request, Pet body) throws Exception { + addPet(request, body); +return ok(); - List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + } - List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + public abstract void addPet(Http.Request request, Pet body) throws Exception; - Pet getPetById(Http.Request request, Long petId) throws Exception; + public Result deletePetHttp(Http.Request request, Long petId, String apiKey) throws Exception { + deletePet(request, petId, apiKey); +return ok(); - void updatePet(Http.Request request, Pet body) throws Exception; + } - void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + public abstract void deletePet(Http.Request request, Long petId, String apiKey) throws Exception; - ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception; + public Result findPetsByStatusHttp(Http.Request request, @NotNull List status) throws Exception { + List obj = findPetsByStatus(request, status); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByStatus(Http.Request request, @NotNull List status) throws Exception; + + public Result findPetsByTagsHttp(Http.Request request, @NotNull List tags) throws Exception { + List obj = findPetsByTags(request, tags); + if (configuration.getBoolean("useOutputBeanValidation")) { + for (Pet curItem : obj) { + OpenAPIUtils.validate(curItem); + } + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract List findPetsByTags(Http.Request request, @NotNull List tags) throws Exception; + + public Result getPetByIdHttp(Http.Request request, Long petId) throws Exception { + Pet obj = getPetById(request, petId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Pet getPetById(Http.Request request, Long petId) throws Exception; + + public Result updatePetHttp(Http.Request request, Pet body) throws Exception { + updatePet(request, body); +return ok(); + + } + + public abstract void updatePet(Http.Request request, Pet body) throws Exception; + + public Result updatePetWithFormHttp(Http.Request request, Long petId, String name, String status) throws Exception { + updatePetWithForm(request, petId, name, status); +return ok(); + + } + + public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception; + + public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart file) throws Exception { + ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 72c0f37c806..c8734ebe8ea 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class StoreApiController extends Controller { - private final StoreApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,28 +37,19 @@ public class StoreApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result deleteOrder(Http.Request request, String orderId) throws Exception { - imp.deleteOrder(request, orderId); - return ok(); + return imp.deleteOrderHttp(request, orderId); } @ApiAction public Result getInventory(Http.Request request) throws Exception { - Map obj = imp.getInventory(request); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getInventoryHttp(request); } @ApiAction 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); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getOrderByIdHttp(request, orderId); } @ApiAction @@ -73,11 +64,7 @@ public class StoreApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - Order obj = imp.placeOrder(request, body); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.placeOrderHttp(request, body); } + } 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 5f10e1c1087..1715aeba67c 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class StoreApiControllerImp implements StoreApiControllerImpInterface { +public class StoreApiControllerImp extends StoreApiControllerImpInterface { @Override public void deleteOrder(Http.Request request, String orderId) throws Exception { //Do your magic!!! 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 21c2882cee8..2d15d750c2c 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java @@ -3,21 +3,66 @@ package controllers; import java.util.Map; import apimodels.Order; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface StoreApiControllerImpInterface { - void deleteOrder(Http.Request request, String orderId) throws Exception; +public abstract class StoreApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - Map getInventory(Http.Request request) throws Exception; + public Result deleteOrderHttp(Http.Request request, String orderId) throws Exception { + deleteOrder(request, orderId); +return ok(); - Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + } - Order placeOrder(Http.Request request, Order body) throws Exception; + public abstract void deleteOrder(Http.Request request, String orderId) throws Exception; + + public Result getInventoryHttp(Http.Request request) throws Exception { + Map obj = getInventory(request); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Map getInventory(Http.Request request) throws Exception; + + public Result getOrderByIdHttp(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception { + Order obj = getOrderById(request, orderId); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract Order getOrderById(Http.Request request, @Min(1) @Max(5)Long orderId) throws Exception; + + public Result placeOrderHttp(Http.Request request, Order body) throws Exception { + Order obj = placeOrder(request, body); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract 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 74f87a82658..22e303ad3fe 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import java.io.File; +import play.api.libs.Files.TemporaryFile; import openapitools.OpenAPIUtils; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,7 +26,6 @@ import openapitools.OpenAPIUtils.ApiAction; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") public class UserApiController extends Controller { - private final UserApiControllerImpInterface imp; private final ObjectMapper mapper; private final Config configuration; @@ -37,7 +37,6 @@ public class UserApiController extends Controller { this.configuration = configuration; } - @ApiAction public Result createUser(Http.Request request) throws Exception { JsonNode nodebody = request.body().asJson(); @@ -50,8 +49,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUser(request, body); - return ok(); + return imp.createUserHttp(request, body); } @ApiAction @@ -68,8 +66,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithArrayInput(request, body); - return ok(); + return imp.createUsersWithArrayInputHttp(request, body); } @ApiAction @@ -86,24 +83,17 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.createUsersWithListInput(request, body); - return ok(); + return imp.createUsersWithListInputHttp(request, body); } @ApiAction public Result deleteUser(Http.Request request, String username) throws Exception { - imp.deleteUser(request, username); - return ok(); + return imp.deleteUserHttp(request, username); } @ApiAction public Result getUserByName(Http.Request request, String username) throws Exception { - User obj = imp.getUserByName(request, username); - if (configuration.getBoolean("useOutputBeanValidation")) { - OpenAPIUtils.validate(obj); - } - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.getUserByNameHttp(request, username); } @ApiAction @@ -122,15 +112,12 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'password' parameter is required"); } - String obj = imp.loginUser(request, username, password); - JsonNode result = mapper.valueToTree(obj); - return ok(result); + return imp.loginUserHttp(request, username, password); } @ApiAction public Result logoutUser(Http.Request request) throws Exception { - imp.logoutUser(request); - return ok(); + return imp.logoutUserHttp(request); } @ApiAction @@ -145,7 +132,7 @@ public class UserApiController extends Controller { } else { throw new IllegalArgumentException("'body' parameter is required"); } - imp.updateUser(request, username, body); - return ok(); + return imp.updateUserHttp(request, username, body); } + } 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 6297e93df65..267c4636db8 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.io.FileInputStream; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen") -public class UserApiControllerImp implements UserApiControllerImpInterface { +public class UserApiControllerImp extends UserApiControllerImpInterface { @Override public void createUser(Http.Request request, 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 4f68a438b4b..e1f0e030b1c 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java @@ -3,29 +3,94 @@ package controllers; import java.util.List; import apimodels.User; +import com.google.inject.Inject; +import com.typesafe.config.Config; +import play.mvc.Controller; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import play.mvc.Result; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import openapitools.OpenAPIUtils; +import static play.mvc.Results.ok; +import play.api.libs.Files.TemporaryFile; import javax.validation.constraints.*; @SuppressWarnings("RedundantThrows") -public interface UserApiControllerImpInterface { - void createUser(Http.Request request, User body) throws Exception; +public abstract class UserApiControllerImpInterface { + @Inject private Config configuration; + private ObjectMapper mapper = new ObjectMapper(); - void createUsersWithArrayInput(Http.Request request, List body) throws Exception; + public Result createUserHttp(Http.Request request, User body) throws Exception { + createUser(request, body); +return ok(); - void createUsersWithListInput(Http.Request request, List body) throws Exception; + } - void deleteUser(Http.Request request, String username) throws Exception; + public abstract void createUser(Http.Request request, User body) throws Exception; - User getUserByName(Http.Request request, String username) throws Exception; + public Result createUsersWithArrayInputHttp(Http.Request request, List body) throws Exception { + createUsersWithArrayInput(request, body); +return ok(); - String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + } - void logoutUser(Http.Request request) throws Exception; + public abstract void createUsersWithArrayInput(Http.Request request, List body) throws Exception; - void updateUser(Http.Request request, String username, User body) throws Exception; + public Result createUsersWithListInputHttp(Http.Request request, List body) throws Exception { + createUsersWithListInput(request, body); +return ok(); + + } + + public abstract void createUsersWithListInput(Http.Request request, List body) throws Exception; + + public Result deleteUserHttp(Http.Request request, String username) throws Exception { + deleteUser(request, username); +return ok(); + + } + + public abstract void deleteUser(Http.Request request, String username) throws Exception; + + public Result getUserByNameHttp(Http.Request request, String username) throws Exception { + User obj = getUserByName(request, username); + if (configuration.getBoolean("useOutputBeanValidation")) { + OpenAPIUtils.validate(obj); + } +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract User getUserByName(Http.Request request, String username) throws Exception; + + public Result loginUserHttp(Http.Request request, @NotNull String username, @NotNull String password) throws Exception { + String obj = loginUser(request, username, password); +JsonNode result = mapper.valueToTree(obj); +return ok(result); + + } + + public abstract String loginUser(Http.Request request, @NotNull String username, @NotNull String password) throws Exception; + + public Result logoutUserHttp(Http.Request request) throws Exception { + logoutUser(request); +return ok(); + + } + + public abstract void logoutUser(Http.Request request) throws Exception; + + public Result updateUserHttp(Http.Request request, String username, User body) throws Exception { + updateUser(request, username, body); +return ok(); + + } + + public abstract void updateUser(Http.Request request, String username, User body) throws Exception; } diff --git a/samples/server/petstore/java-play-framework/app/openapitools/ApiCall.java b/samples/server/petstore/java-play-framework/app/openapitools/ApiCall.java index 7f7d3f78484..7a74f4e6716 100644 --- a/samples/server/petstore/java-play-framework/app/openapitools/ApiCall.java +++ b/samples/server/petstore/java-play-framework/app/openapitools/ApiCall.java @@ -13,10 +13,10 @@ public class ApiCall extends Action { @Inject private ApiCall() {} - public CompletionStage call(Http.Context ctx) { + public CompletionStage call(Http.Request request) { try { //TODO: Do stuff you want to handle with each API call (metrics, logging, etc..) - return delegate.call(ctx); + return delegate.call(request); } catch (Throwable t) { //TODO: log the error in your metric diff --git a/samples/server/petstore/java-play-framework/project/plugins.sbt b/samples/server/petstore/java-play-framework/project/plugins.sbt index 23a36aef596..318672226e3 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.7.5") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3") \ No newline at end of file