From 09d27e82e77916b79ec9574b4c5188d859ecc0ef Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 27 Mar 2019 09:47:47 +0800 Subject: [PATCH] Minor enhancements to Scala Play server generator (#2512) * minor enhancements to openapi-generator * update doc * remove oudated doc --- README.md | 3 +- bin/scala-play-framework-petstore.sh | 2 +- bin/windows/scala-play-framework-petstore.bat | 2 +- docs/generators.md | 1 + docs/generators/scala-play-server.md | 22 +++++++ .../ScalaPlayFrameworkServerCodegen.java | 62 ++++++++++++------- .../README.md.mustache | 0 .../app/apiController.scala.mustache | 0 .../app/apiDocController.scala.mustache | 0 .../app/apiImplStubs.scala.mustache | 0 .../app/apiTrait.scala.mustache | 0 .../app/defOperationSignature.mustache | 0 .../app/errorHandler.scala.mustache | 0 .../app/exceptions.scala.mustache | 0 .../app/module.scala.mustache | 0 .../app/transformParamValues.mustache | 0 .../arrayCaseClass.mustache | 0 .../build.sbt.mustache | 0 .../caseClass.mustache | 0 .../conf/application.conf.mustache | 0 .../conf/logback.xml.mustache | 0 .../conf/routes.mustache | 0 .../convertParam.mustache | 0 .../dataTypeOption.mustache | 0 .../extensibleObjectJsonFormat.mustache | 0 .../generatedAnnotation.mustache | 0 .../model.mustache | 0 .../project/build.properties.mustache | 0 .../project/plugins.sbt.mustache | 0 .../public/openapi.json.mustache | 0 .../returnTypeOrUnit.mustache | 0 .../simpleParentJsonFormat.mustache | 0 pom.xml | 1 + .../petstore/scala-play-framework/README.md | 55 ---------------- .../.openapi-generator-ignore | 0 .../.openapi-generator/VERSION | 0 .../petstore/scala-play-server/README.md | 55 ++++++++++++++++ .../app/api/ApiDocController.scala | 0 .../app/api/PetApi.scala | 2 +- .../app/api/PetApiController.scala | 18 +++--- .../app/api/PetApiImpl.scala | 2 +- .../app/api/StoreApi.scala | 2 +- .../app/api/StoreApiController.scala | 10 +-- .../app/api/StoreApiImpl.scala | 2 +- .../app/api/UserApi.scala | 2 +- .../app/api/UserApiController.scala | 18 +++--- .../app/api/UserApiImpl.scala | 2 +- .../app/model/ApiResponse.scala | 2 +- .../app/model/Category.scala | 2 +- .../app/model/Order.scala | 2 +- .../app/model/Pet.scala | 2 +- .../app/model/Tag.scala | 2 +- .../app/model/User.scala | 2 +- .../app/org/openapitools/ErrorHandler.scala | 0 .../app/org/openapitools/Module.scala | 2 +- .../org/openapitools/OpenApiExceptions.scala | 0 .../build.sbt | 0 .../conf/application.conf | 0 .../conf/logback.xml | 0 .../conf/routes | 0 .../server/petstore/scala-play-server/pom.xml | 32 ++++++++++ .../project/build.properties | 0 .../project/plugins.sbt | 0 .../public/openapi.json | 4 +- 64 files changed, 192 insertions(+), 119 deletions(-) create mode 100644 docs/generators/scala-play-server.md rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/README.md.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/apiController.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/apiDocController.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/apiImplStubs.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/apiTrait.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/defOperationSignature.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/errorHandler.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/exceptions.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/module.scala.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/app/transformParamValues.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/arrayCaseClass.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/build.sbt.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/caseClass.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/conf/application.conf.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/conf/logback.xml.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/conf/routes.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/convertParam.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/dataTypeOption.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/extensibleObjectJsonFormat.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/generatedAnnotation.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/model.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/project/build.properties.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/project/plugins.sbt.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/public/openapi.json.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/returnTypeOrUnit.mustache (100%) rename modules/openapi-generator/src/main/resources/{scala-play-framework => scala-play-server}/simpleParentJsonFormat.mustache (100%) delete mode 100644 samples/server/petstore/scala-play-framework/README.md rename samples/server/petstore/{scala-play-framework => scala-play-server}/.openapi-generator-ignore (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/.openapi-generator/VERSION (100%) create mode 100644 samples/server/petstore/scala-play-server/README.md rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/ApiDocController.scala (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/PetApi.scala (97%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/PetApiController.scala (93%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/PetApiImpl.scala (97%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/StoreApi.scala (96%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/StoreApiController.scala (91%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/StoreApiImpl.scala (95%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/UserApi.scala (97%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/UserApiController.scala (91%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/api/UserApiImpl.scala (97%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/model/ApiResponse.scala (91%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/model/Category.scala (90%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/model/Order.scala (95%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/model/Pet.scala (95%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/model/Tag.scala (89%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/model/User.scala (93%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/org/openapitools/ErrorHandler.scala (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/org/openapitools/Module.scala (92%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/app/org/openapitools/OpenApiExceptions.scala (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/build.sbt (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/conf/application.conf (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/conf/logback.xml (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/conf/routes (100%) create mode 100644 samples/server/petstore/scala-play-server/pom.xml rename samples/server/petstore/{scala-play-framework => scala-play-server}/project/build.properties (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/project/plugins.sbt (100%) rename samples/server/petstore/{scala-play-framework => scala-play-server}/public/openapi.json (99%) diff --git a/README.md b/README.md index 4dda4e057dc..1c0df324b0b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se | | Languages/Frameworks | |-|-| **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client), **Kotlin**, **Lua**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (AngularJS, Angular (2.x - 7.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs) -**Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples)), **Kotlin** (Spring Boot, Ktor), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), Scalatra) +**Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples)), **Kotlin** (Spring Boot, Ktor), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) **API documentation generators** | **HTML**, **Confluence Wiki** **Configuration files** | [**Apache2**](https://httpd.apache.org/) **Others** | **GraphQL**, **JMeter**, **MySQL Schema** @@ -664,6 +664,7 @@ Here is a list of template creators: * Rust (rust-server): @metaswitch * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert) * Scala Lagom: @gmkumar2005 + * Scala Play: @adigerber * Documentation * HTML Doc 2: @jhitchcock * Confluence Wiki: @jhitchcock diff --git a/bin/scala-play-framework-petstore.sh b/bin/scala-play-framework-petstore.sh index bbdad2fcc59..f401340cf34 100755 --- a/bin/scala-play-framework-petstore.sh +++ b/bin/scala-play-framework-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/scala-play-framework -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-play-framework -o samples/server/petstore/scala-play-framework $@" +ags="generate -t modules/openapi-generator/src/main/resources/scala-play-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-play-server -o samples/server/petstore/scala-play-server $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/scala-play-framework-petstore.bat b/bin/windows/scala-play-framework-petstore.bat index 2f10aa0d69d..11e49896373 100755 --- a/bin/windows/scala-play-framework-petstore.bat +++ b/bin/windows/scala-play-framework-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g scala-play-framework -o samples\server\petstore\scala-play-framework +set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g scala-play-server -o samples\server\petstore\scala-play-server java %JAVA_OPTS% -jar %executable% %ags% diff --git a/docs/generators.md b/docs/generators.md index 6fe91f19ce2..aae6c610bb0 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -105,6 +105,7 @@ The following generators are available: - [rust-server](generators/rust-server.md) - [scala-finch](generators/scala-finch.md) - [scala-lagom-server](generators/scala-lagom-server.md) + - [scala-play-server](generators/scala-play-server.md) - [scalatra](generators/scalatra.md) - [spring](generators/spring.md) diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md new file mode 100644 index 00000000000..6aaa4d10176 --- /dev/null +++ b/docs/generators/scala-play-server.md @@ -0,0 +1,22 @@ + +--- +id: generator-opts-server-scala-play-server +title: Config Options for scala-play-server +sidebar_label: scala-play-server +--- + +| Option | Description | Values | Default | +| ------ | ----------- | ------ | ------- | +|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| +|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| +|modelPackage|package for generated models| |null| +|apiPackage|package for generated api classes| |null| +|sourceFolder|source folder for generated code| |null| +|routesFileName|Name of the routes file to generate.| |routes| +|routesFileName|Base package in which supporting classes are generated.| |org.openapitools| +|skipStubs|If set, skips generation of stub classes.| |false| +|supportAsync|If set, wraps API return types with Futures and generates async actions.| |false| +|generateCustomExceptions|If set, generates custom exception types.| |true| +|useSwaggerUI|Add a route to /api which show your documentation in swagger-ui. Will also import needed dependencies| |true| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java index b034b0c6f44..e8c8346db3e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java @@ -1,3 +1,19 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.openapitools.codegen.languages; import com.google.common.collect.ImmutableMap; @@ -42,10 +58,10 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem public ScalaPlayFrameworkServerCodegen() { super(); - outputFolder = "generated-code" + File.separator + "scala-play-framework"; + outputFolder = "generated-code" + File.separator + "scala-play-server"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - embeddedTemplateDir = templateDir = "scala-play-framework"; + embeddedTemplateDir = templateDir = "scala-play-server"; hideGenerationTimestamp = false; sourceFolder = "app"; apiPackage = "api"; @@ -81,11 +97,11 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem } public String getName() { - return "scala-play-framework"; + return "scala-play-server"; } public String getHelp() { - return "Generates a Scala server application with Play Framework."; + return "Generates a Scala server application (beta) with Play Framework."; } public void setSupportAsync(boolean supportAsync) { @@ -137,13 +153,13 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem writePropertyBack(USE_SWAGGER_UI, useSwaggerUI); if (additionalProperties.containsKey(ROUTES_FILE_NAME)) { - this.setRoutesFileName((String)additionalProperties.get(ROUTES_FILE_NAME)); + this.setRoutesFileName((String) additionalProperties.get(ROUTES_FILE_NAME)); } else { additionalProperties.put(ROUTES_FILE_NAME, routesFileName); } if (additionalProperties.containsKey(BASE_PACKAGE)) { - this.setBasePackage((String)additionalProperties.get(BASE_PACKAGE)); + this.setBasePackage((String) additionalProperties.get(BASE_PACKAGE)); } else { additionalProperties.put(BASE_PACKAGE, basePackage); } @@ -181,9 +197,9 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem private void addMustacheLambdas(Map objs) { Map lambdas = new ImmutableMap.Builder() - .put("indented_4", new IndentedLambda(4, " ")) - .put("indented_8", new IndentedLambda(8, " ")) - .build(); + .put("indented_4", new IndentedLambda(4, " ")) + .put("indented_8", new IndentedLambda(8, " ")) + .build(); objs.put("lambda", lambdas); } @@ -193,13 +209,13 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem Map models = new HashMap<>(); for (Object _mo : allModels) { - CodegenModel model = (CodegenModel)((Map)_mo).get("model"); + CodegenModel model = (CodegenModel) ((Map) _mo).get("model"); models.put(model.classname, model); } - Map operations = (Map)objs.get("operations"); + Map operations = (Map) objs.get("operations"); if (operations != null) { - List ops = (List)operations.get("operation"); + List ops = (List) operations.get("operation"); for (CodegenOperation operation : ops) { Pattern pathVariableMatcher = Pattern.compile("\\{([^}]+)}"); Matcher match = pathVariableMatcher.matcher(operation.path); @@ -225,11 +241,11 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem Map modelsByClassName = new HashMap<>(); for (Object _outer : objs.values()) { - Map outer = (Map)_outer; - List> models = (List>)outer.get("models"); + Map outer = (Map) _outer; + List> models = (List>) outer.get("models"); for (Map mo : models) { - CodegenModel cm = (CodegenModel)mo.get("model"); + CodegenModel cm = (CodegenModel) mo.get("model"); postProcessModelsEnum(outer); cm.classVarName = camelize(cm.classVarName, true); modelsByClassName.put(cm.classname, cm); @@ -252,15 +268,15 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem generateJSONSpecFile(objs); // Prettify routes file - Map apiInfo = (Map)objs.get("apiInfo"); - List> apis = (List>)apiInfo.get("apis"); + Map apiInfo = (Map) objs.get("apiInfo"); + List> apis = (List>) apiInfo.get("apis"); List ops = apis.stream() - .map(api -> (Map)api.get("operations")) - .flatMap(operations -> ((List)operations.get("operation")).stream()) - .collect(Collectors.toList()); + .map(api -> (Map) api.get("operations")) + .flatMap(operations -> ((List) operations.get("operation")).stream()) + .collect(Collectors.toList()); int maxPathLength = ops.stream() - .mapToInt(op -> op.httpMethod.length() + op.path.length()) - .reduce(0, Integer::max); + .mapToInt(op -> op.httpMethod.length() + op.path.length()) + .reduce(0, Integer::max); ops.forEach(op -> op.vendorExtensions.put("paddedPath", rightPad(op.path, maxPathLength - op.httpMethod.length()))); ops.forEach(op -> op.vendorExtensions.put("hasPathParams", op.getHasPathParams())); @@ -332,7 +348,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem } if (ModelUtils.isArraySchema(p)) { - Schema items = ((ArraySchema)p).getItems(); + Schema items = ((ArraySchema) p).getItems(); String inner = getSchemaType(items); return "List.empty[" + inner + "]"; } diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/README.md.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/README.md.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/README.md.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/README.md.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/apiController.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiController.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/apiController.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/apiController.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/apiDocController.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiDocController.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/apiDocController.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/apiDocController.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/apiImplStubs.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiImplStubs.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/apiImplStubs.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/apiImplStubs.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/apiTrait.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiTrait.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/apiTrait.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/apiTrait.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/defOperationSignature.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/defOperationSignature.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/defOperationSignature.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/defOperationSignature.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/errorHandler.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/errorHandler.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/errorHandler.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/errorHandler.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/exceptions.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/exceptions.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/exceptions.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/exceptions.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/module.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/module.scala.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/module.scala.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/module.scala.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/app/transformParamValues.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/transformParamValues.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/app/transformParamValues.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/app/transformParamValues.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/arrayCaseClass.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/arrayCaseClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/arrayCaseClass.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/arrayCaseClass.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/build.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/build.sbt.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/caseClass.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/caseClass.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/conf/application.conf.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/conf/application.conf.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/conf/application.conf.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/conf/application.conf.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/conf/logback.xml.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/conf/logback.xml.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/conf/logback.xml.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/conf/logback.xml.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/conf/routes.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/conf/routes.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/conf/routes.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/conf/routes.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/convertParam.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/convertParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/convertParam.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/convertParam.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/dataTypeOption.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/dataTypeOption.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/dataTypeOption.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/dataTypeOption.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/extensibleObjectJsonFormat.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/extensibleObjectJsonFormat.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/extensibleObjectJsonFormat.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/extensibleObjectJsonFormat.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/generatedAnnotation.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/generatedAnnotation.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/model.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/model.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/model.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/project/build.properties.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/project/build.properties.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/project/build.properties.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/project/build.properties.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/project/plugins.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/project/plugins.sbt.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/project/plugins.sbt.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/project/plugins.sbt.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/public/openapi.json.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/public/openapi.json.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/public/openapi.json.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/public/openapi.json.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/returnTypeOrUnit.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/returnTypeOrUnit.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/returnTypeOrUnit.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/returnTypeOrUnit.mustache diff --git a/modules/openapi-generator/src/main/resources/scala-play-framework/simpleParentJsonFormat.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/simpleParentJsonFormat.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/scala-play-framework/simpleParentJsonFormat.mustache rename to modules/openapi-generator/src/main/resources/scala-play-server/simpleParentJsonFormat.mustache diff --git a/pom.xml b/pom.xml index 4f89c273126..9c8d85911f2 100644 --- a/pom.xml +++ b/pom.xml @@ -1152,6 +1152,7 @@ samples/server/petstore/jaxrs-cxf-non-spring-app samples/server/petstore/java-msf4j samples/server/petstore/scala-lagom-server + samples/server/petstore/scala-play-server samples/server/petstore/scalatra samples/server/petstore/finch samples/server/petstore/kotlin-springboot diff --git a/samples/server/petstore/scala-play-framework/README.md b/samples/server/petstore/scala-play-framework/README.md deleted file mode 100644 index 9950d875db7..00000000000 --- a/samples/server/petstore/scala-play-framework/README.md +++ /dev/null @@ -1,55 +0,0 @@ -# OpenAPI Petstore - -This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - -This Scala Play Framework project was generated by the OpenAPI generator tool at 2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]. - -## API - -### Pet - -|Name|Role| -|----|----| -|`api.PetController`|Play Framework API controller| -|`api.PetApi`|Representing trait| -|`api.PetApiImpl`|Default implementation| - -* `POST /pet` - Add a new pet to the store -* `DELETE /pet/:petId` - Deletes a pet -* `GET /pet/findByStatus?status=[value]` - Finds Pets by status -* `GET /pet/findByTags?tags=[value]` - Finds Pets by tags -* `GET /pet/:petId` - Find pet by ID -* `PUT /pet` - Update an existing pet -* `POST /pet/:petId` - Updates a pet in the store with form data -* `POST /pet/:petId/uploadImage` - uploads an image - -### Store - -|Name|Role| -|----|----| -|`api.StoreController`|Play Framework API controller| -|`api.StoreApi`|Representing trait| -|`api.StoreApiImpl`|Default implementation| - -* `DELETE /store/order/:orderId` - Delete purchase order by ID -* `GET /store/inventory` - Returns pet inventories by status -* `GET /store/order/:orderId` - Find purchase order by ID -* `POST /store/order` - Place an order for a pet - -### User - -|Name|Role| -|----|----| -|`api.UserController`|Play Framework API controller| -|`api.UserApi`|Representing trait| -|`api.UserApiImpl`|Default implementation| - -* `POST /user` - Create user -* `POST /user/createWithArray` - Creates list of users with given input array -* `POST /user/createWithList` - Creates list of users with given input array -* `DELETE /user/:username` - Delete user -* `GET /user/:username` - Get user by user name -* `GET /user/login?username=[value]&password=[value]` - Logs user into the system -* `GET /user/logout` - Logs out current logged in user session -* `PUT /user/:username` - Updated user - diff --git a/samples/server/petstore/scala-play-framework/.openapi-generator-ignore b/samples/server/petstore/scala-play-server/.openapi-generator-ignore similarity index 100% rename from samples/server/petstore/scala-play-framework/.openapi-generator-ignore rename to samples/server/petstore/scala-play-server/.openapi-generator-ignore diff --git a/samples/server/petstore/scala-play-framework/.openapi-generator/VERSION b/samples/server/petstore/scala-play-server/.openapi-generator/VERSION similarity index 100% rename from samples/server/petstore/scala-play-framework/.openapi-generator/VERSION rename to samples/server/petstore/scala-play-server/.openapi-generator/VERSION diff --git a/samples/server/petstore/scala-play-server/README.md b/samples/server/petstore/scala-play-server/README.md new file mode 100644 index 00000000000..7f342575759 --- /dev/null +++ b/samples/server/petstore/scala-play-server/README.md @@ -0,0 +1,55 @@ +# OpenAPI Petstore + +This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + +This Scala Play Framework project was generated by the OpenAPI generator tool at 2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]. + +## API + +### Pet + +|Name|Role| +|----|----| +|`api.PetController`|Play Framework API controller| +|`api.PetApi`|Representing trait| +|`api.PetApiImpl`|Default implementation| + +* `POST /v2/pet` - Add a new pet to the store +* `DELETE /v2/pet/:petId` - Deletes a pet +* `GET /v2/pet/findByStatus?status=[value]` - Finds Pets by status +* `GET /v2/pet/findByTags?tags=[value]` - Finds Pets by tags +* `GET /v2/pet/:petId` - Find pet by ID +* `PUT /v2/pet` - Update an existing pet +* `POST /v2/pet/:petId` - Updates a pet in the store with form data +* `POST /v2/pet/:petId/uploadImage` - uploads an image + +### Store + +|Name|Role| +|----|----| +|`api.StoreController`|Play Framework API controller| +|`api.StoreApi`|Representing trait| +|`api.StoreApiImpl`|Default implementation| + +* `DELETE /v2/store/order/:orderId` - Delete purchase order by ID +* `GET /v2/store/inventory` - Returns pet inventories by status +* `GET /v2/store/order/:orderId` - Find purchase order by ID +* `POST /v2/store/order` - Place an order for a pet + +### User + +|Name|Role| +|----|----| +|`api.UserController`|Play Framework API controller| +|`api.UserApi`|Representing trait| +|`api.UserApiImpl`|Default implementation| + +* `POST /v2/user` - Create user +* `POST /v2/user/createWithArray` - Creates list of users with given input array +* `POST /v2/user/createWithList` - Creates list of users with given input array +* `DELETE /v2/user/:username` - Delete user +* `GET /v2/user/:username` - Get user by user name +* `GET /v2/user/login?username=[value]&password=[value]` - Logs user into the system +* `GET /v2/user/logout` - Logs out current logged in user session +* `PUT /v2/user/:username` - Updated user + diff --git a/samples/server/petstore/scala-play-framework/app/api/ApiDocController.scala b/samples/server/petstore/scala-play-server/app/api/ApiDocController.scala similarity index 100% rename from samples/server/petstore/scala-play-framework/app/api/ApiDocController.scala rename to samples/server/petstore/scala-play-server/app/api/ApiDocController.scala diff --git a/samples/server/petstore/scala-play-framework/app/api/PetApi.scala b/samples/server/petstore/scala-play-server/app/api/PetApi.scala similarity index 97% rename from samples/server/petstore/scala-play-framework/app/api/PetApi.scala rename to samples/server/petstore/scala-play-server/app/api/PetApi.scala index 4a9dc26ac20..1f7eaed70b4 100644 --- a/samples/server/petstore/scala-play-framework/app/api/PetApi.scala +++ b/samples/server/petstore/scala-play-server/app/api/PetApi.scala @@ -4,7 +4,7 @@ import model.ApiResponse import model.Pet import play.api.libs.Files.TemporaryFile -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") trait PetApi { /** * Add a new pet to the store diff --git a/samples/server/petstore/scala-play-framework/app/api/PetApiController.scala b/samples/server/petstore/scala-play-server/app/api/PetApiController.scala similarity index 93% rename from samples/server/petstore/scala-play-framework/app/api/PetApiController.scala rename to samples/server/petstore/scala-play-server/app/api/PetApiController.scala index 16765acc4a0..33f07975634 100644 --- a/samples/server/petstore/scala-play-framework/app/api/PetApiController.scala +++ b/samples/server/petstore/scala-play-server/app/api/PetApiController.scala @@ -8,11 +8,11 @@ import model.ApiResponse import model.Pet import play.api.libs.Files.TemporaryFile -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") @Singleton class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends AbstractController(cc) { /** - * POST /pet + * POST /v2/pet */ def addPet(): Action[AnyContent] = Action { request => def executeApi(): Unit = { @@ -27,7 +27,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * DELETE /pet/:petId + * DELETE /v2/pet/:petId * @param petId Pet id to delete */ def deletePet(petId: Long): Action[AnyContent] = Action { request => @@ -42,7 +42,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * GET /pet/findByStatus?status=[value] + * GET /v2/pet/findByStatus?status=[value] */ def findPetsByStatus(): Action[AnyContent] = Action { request => def executeApi(): List[Pet] = { @@ -60,7 +60,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * GET /pet/findByTags?tags=[value] + * GET /v2/pet/findByTags?tags=[value] */ def findPetsByTags(): Action[AnyContent] = Action { request => def executeApi(): List[Pet] = { @@ -78,7 +78,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * GET /pet/:petId + * GET /v2/pet/:petId * @param petId ID of pet to return */ def getPetById(petId: Long): Action[AnyContent] = Action { request => @@ -92,7 +92,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * PUT /pet + * PUT /v2/pet */ def updatePet(): Action[AnyContent] = Action { request => def executeApi(): Unit = { @@ -107,7 +107,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * POST /pet/:petId + * POST /v2/pet/:petId * @param petId ID of pet that needs to be updated */ def updatePetWithForm(petId: Long): Action[AnyContent] = Action { request => @@ -128,7 +128,7 @@ class PetApiController @Inject()(cc: ControllerComponents, api: PetApi) extends } /** - * POST /pet/:petId/uploadImage + * POST /v2/pet/:petId/uploadImage * @param petId ID of pet to update */ def uploadFile(petId: Long): Action[AnyContent] = Action { request => diff --git a/samples/server/petstore/scala-play-framework/app/api/PetApiImpl.scala b/samples/server/petstore/scala-play-server/app/api/PetApiImpl.scala similarity index 97% rename from samples/server/petstore/scala-play-framework/app/api/PetApiImpl.scala rename to samples/server/petstore/scala-play-server/app/api/PetApiImpl.scala index 0852695805d..d3a8ea67b1b 100644 --- a/samples/server/petstore/scala-play-framework/app/api/PetApiImpl.scala +++ b/samples/server/petstore/scala-play-server/app/api/PetApiImpl.scala @@ -7,7 +7,7 @@ import play.api.libs.Files.TemporaryFile /** * Provides a default implementation for [[PetApi]]. */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") class PetApiImpl extends PetApi { /** * @inheritdoc diff --git a/samples/server/petstore/scala-play-framework/app/api/StoreApi.scala b/samples/server/petstore/scala-play-server/app/api/StoreApi.scala similarity index 96% rename from samples/server/petstore/scala-play-framework/app/api/StoreApi.scala rename to samples/server/petstore/scala-play-server/app/api/StoreApi.scala index a71dfb6f327..11ee2011268 100644 --- a/samples/server/petstore/scala-play-framework/app/api/StoreApi.scala +++ b/samples/server/petstore/scala-play-server/app/api/StoreApi.scala @@ -2,7 +2,7 @@ package api import model.Order -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") trait StoreApi { /** * Delete purchase order by ID diff --git a/samples/server/petstore/scala-play-framework/app/api/StoreApiController.scala b/samples/server/petstore/scala-play-server/app/api/StoreApiController.scala similarity index 91% rename from samples/server/petstore/scala-play-framework/app/api/StoreApiController.scala rename to samples/server/petstore/scala-play-server/app/api/StoreApiController.scala index b20c32a447c..161cf5805c6 100644 --- a/samples/server/petstore/scala-play-framework/app/api/StoreApiController.scala +++ b/samples/server/petstore/scala-play-server/app/api/StoreApiController.scala @@ -6,11 +6,11 @@ import play.api.libs.json._ import play.api.mvc._ import model.Order -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") @Singleton class StoreApiController @Inject()(cc: ControllerComponents, api: StoreApi) extends AbstractController(cc) { /** - * DELETE /store/order/:orderId + * DELETE /v2/store/order/:orderId * @param orderId ID of the order that needs to be deleted */ def deleteOrder(orderId: String): Action[AnyContent] = Action { request => @@ -23,7 +23,7 @@ class StoreApiController @Inject()(cc: ControllerComponents, api: StoreApi) exte } /** - * GET /store/inventory + * GET /v2/store/inventory */ def getInventory(): Action[AnyContent] = Action { request => def executeApi(): Map[String, Int] = { @@ -36,7 +36,7 @@ class StoreApiController @Inject()(cc: ControllerComponents, api: StoreApi) exte } /** - * GET /store/order/:orderId + * GET /v2/store/order/:orderId * @param orderId ID of pet that needs to be fetched */ def getOrderById(orderId: Long): Action[AnyContent] = Action { request => @@ -50,7 +50,7 @@ class StoreApiController @Inject()(cc: ControllerComponents, api: StoreApi) exte } /** - * POST /store/order + * POST /v2/store/order */ def placeOrder(): Action[AnyContent] = Action { request => def executeApi(): Order = { diff --git a/samples/server/petstore/scala-play-framework/app/api/StoreApiImpl.scala b/samples/server/petstore/scala-play-server/app/api/StoreApiImpl.scala similarity index 95% rename from samples/server/petstore/scala-play-framework/app/api/StoreApiImpl.scala rename to samples/server/petstore/scala-play-server/app/api/StoreApiImpl.scala index 60b6b8362b9..8a996a93e46 100644 --- a/samples/server/petstore/scala-play-framework/app/api/StoreApiImpl.scala +++ b/samples/server/petstore/scala-play-server/app/api/StoreApiImpl.scala @@ -5,7 +5,7 @@ import model.Order /** * Provides a default implementation for [[StoreApi]]. */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") class StoreApiImpl extends StoreApi { /** * @inheritdoc diff --git a/samples/server/petstore/scala-play-framework/app/api/UserApi.scala b/samples/server/petstore/scala-play-server/app/api/UserApi.scala similarity index 97% rename from samples/server/petstore/scala-play-framework/app/api/UserApi.scala rename to samples/server/petstore/scala-play-server/app/api/UserApi.scala index 1a1718cd923..41b24e87562 100644 --- a/samples/server/petstore/scala-play-framework/app/api/UserApi.scala +++ b/samples/server/petstore/scala-play-server/app/api/UserApi.scala @@ -2,7 +2,7 @@ package api import model.User -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") trait UserApi { /** * Create user diff --git a/samples/server/petstore/scala-play-framework/app/api/UserApiController.scala b/samples/server/petstore/scala-play-server/app/api/UserApiController.scala similarity index 91% rename from samples/server/petstore/scala-play-framework/app/api/UserApiController.scala rename to samples/server/petstore/scala-play-server/app/api/UserApiController.scala index 8c943f7b3cb..05550df7c66 100644 --- a/samples/server/petstore/scala-play-framework/app/api/UserApiController.scala +++ b/samples/server/petstore/scala-play-server/app/api/UserApiController.scala @@ -6,11 +6,11 @@ import play.api.libs.json._ import play.api.mvc._ import model.User -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") @Singleton class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extends AbstractController(cc) { /** - * POST /user + * POST /v2/user */ def createUser(): Action[AnyContent] = Action { request => def executeApi(): Unit = { @@ -25,7 +25,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * POST /user/createWithArray + * POST /v2/user/createWithArray */ def createUsersWithArrayInput(): Action[AnyContent] = Action { request => def executeApi(): Unit = { @@ -40,7 +40,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * POST /user/createWithList + * POST /v2/user/createWithList */ def createUsersWithListInput(): Action[AnyContent] = Action { request => def executeApi(): Unit = { @@ -55,7 +55,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * DELETE /user/:username + * DELETE /v2/user/:username * @param username The name that needs to be deleted */ def deleteUser(username: String): Action[AnyContent] = Action { request => @@ -68,7 +68,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * GET /user/:username + * GET /v2/user/:username * @param username The name that needs to be fetched. Use user1 for testing. */ def getUserByName(username: String): Action[AnyContent] = Action { request => @@ -82,7 +82,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * GET /user/login?username=[value]&password=[value] + * GET /v2/user/login?username=[value]&password=[value] */ def loginUser(): Action[AnyContent] = Action { request => def executeApi(): String = { @@ -103,7 +103,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * GET /user/logout + * GET /v2/user/logout */ def logoutUser(): Action[AnyContent] = Action { request => def executeApi(): Unit = { @@ -115,7 +115,7 @@ class UserApiController @Inject()(cc: ControllerComponents, api: UserApi) extend } /** - * PUT /user/:username + * PUT /v2/user/:username * @param username name that need to be deleted */ def updateUser(username: String): Action[AnyContent] = Action { request => diff --git a/samples/server/petstore/scala-play-framework/app/api/UserApiImpl.scala b/samples/server/petstore/scala-play-server/app/api/UserApiImpl.scala similarity index 97% rename from samples/server/petstore/scala-play-framework/app/api/UserApiImpl.scala rename to samples/server/petstore/scala-play-server/app/api/UserApiImpl.scala index a65243f1df3..01ce46e98e5 100644 --- a/samples/server/petstore/scala-play-framework/app/api/UserApiImpl.scala +++ b/samples/server/petstore/scala-play-server/app/api/UserApiImpl.scala @@ -5,7 +5,7 @@ import model.User /** * Provides a default implementation for [[UserApi]]. */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") class UserApiImpl extends UserApi { /** * @inheritdoc diff --git a/samples/server/petstore/scala-play-framework/app/model/ApiResponse.scala b/samples/server/petstore/scala-play-server/app/model/ApiResponse.scala similarity index 91% rename from samples/server/petstore/scala-play-framework/app/model/ApiResponse.scala rename to samples/server/petstore/scala-play-server/app/model/ApiResponse.scala index 8e9079158b6..529462aa086 100644 --- a/samples/server/petstore/scala-play-framework/app/model/ApiResponse.scala +++ b/samples/server/petstore/scala-play-server/app/model/ApiResponse.scala @@ -5,7 +5,7 @@ import play.api.libs.json._ /** * Describes the result of uploading an image resource */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") case class ApiResponse( code: Option[Int], `type`: Option[String], diff --git a/samples/server/petstore/scala-play-framework/app/model/Category.scala b/samples/server/petstore/scala-play-server/app/model/Category.scala similarity index 90% rename from samples/server/petstore/scala-play-framework/app/model/Category.scala rename to samples/server/petstore/scala-play-server/app/model/Category.scala index a4273d39bf1..006c0e561de 100644 --- a/samples/server/petstore/scala-play-framework/app/model/Category.scala +++ b/samples/server/petstore/scala-play-server/app/model/Category.scala @@ -5,7 +5,7 @@ import play.api.libs.json._ /** * A category for a pet */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") case class Category( id: Option[Long], name: Option[String] diff --git a/samples/server/petstore/scala-play-framework/app/model/Order.scala b/samples/server/petstore/scala-play-server/app/model/Order.scala similarity index 95% rename from samples/server/petstore/scala-play-framework/app/model/Order.scala rename to samples/server/petstore/scala-play-server/app/model/Order.scala index 7088d37f5bb..b82378a3791 100644 --- a/samples/server/petstore/scala-play-framework/app/model/Order.scala +++ b/samples/server/petstore/scala-play-server/app/model/Order.scala @@ -7,7 +7,7 @@ import java.time.OffsetDateTime * An order for a pets from the pet store * @param status Order Status */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") case class Order( id: Option[Long], petId: Option[Long], diff --git a/samples/server/petstore/scala-play-framework/app/model/Pet.scala b/samples/server/petstore/scala-play-server/app/model/Pet.scala similarity index 95% rename from samples/server/petstore/scala-play-framework/app/model/Pet.scala rename to samples/server/petstore/scala-play-server/app/model/Pet.scala index 39f2d010ea0..20792980928 100644 --- a/samples/server/petstore/scala-play-framework/app/model/Pet.scala +++ b/samples/server/petstore/scala-play-server/app/model/Pet.scala @@ -6,7 +6,7 @@ import play.api.libs.json._ * A pet for sale in the pet store * @param status pet status in the store */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") case class Pet( id: Option[Long], category: Option[Category], diff --git a/samples/server/petstore/scala-play-framework/app/model/Tag.scala b/samples/server/petstore/scala-play-server/app/model/Tag.scala similarity index 89% rename from samples/server/petstore/scala-play-framework/app/model/Tag.scala rename to samples/server/petstore/scala-play-server/app/model/Tag.scala index ae2ad81d6aa..2d8a1f21fcb 100644 --- a/samples/server/petstore/scala-play-framework/app/model/Tag.scala +++ b/samples/server/petstore/scala-play-server/app/model/Tag.scala @@ -5,7 +5,7 @@ import play.api.libs.json._ /** * A tag for a pet */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") case class Tag( id: Option[Long], name: Option[String] diff --git a/samples/server/petstore/scala-play-framework/app/model/User.scala b/samples/server/petstore/scala-play-server/app/model/User.scala similarity index 93% rename from samples/server/petstore/scala-play-framework/app/model/User.scala rename to samples/server/petstore/scala-play-server/app/model/User.scala index 2fb57e273a2..4d92a101a9e 100644 --- a/samples/server/petstore/scala-play-framework/app/model/User.scala +++ b/samples/server/petstore/scala-play-server/app/model/User.scala @@ -6,7 +6,7 @@ import play.api.libs.json._ * A User who is purchasing from the pet store * @param userStatus User Status */ -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") case class User( id: Option[Long], username: Option[String], diff --git a/samples/server/petstore/scala-play-framework/app/org/openapitools/ErrorHandler.scala b/samples/server/petstore/scala-play-server/app/org/openapitools/ErrorHandler.scala similarity index 100% rename from samples/server/petstore/scala-play-framework/app/org/openapitools/ErrorHandler.scala rename to samples/server/petstore/scala-play-server/app/org/openapitools/ErrorHandler.scala diff --git a/samples/server/petstore/scala-play-framework/app/org/openapitools/Module.scala b/samples/server/petstore/scala-play-server/app/org/openapitools/Module.scala similarity index 92% rename from samples/server/petstore/scala-play-framework/app/org/openapitools/Module.scala rename to samples/server/petstore/scala-play-server/app/org/openapitools/Module.scala index d7b95b71fa2..f135171d48d 100644 --- a/samples/server/petstore/scala-play-framework/app/org/openapitools/Module.scala +++ b/samples/server/petstore/scala-play-server/app/org/openapitools/Module.scala @@ -4,7 +4,7 @@ import api._ import play.api.inject.{Binding, Module => PlayModule} import play.api.{Configuration, Environment} -@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T02:45:22.426+02:00[Asia/Jerusalem]") +@javax.annotation.Generated(value = Array("org.openapitools.codegen.languages.ScalaPlayFrameworkServerCodegen"), date = "2019-03-26T16:21:58.590+08:00[Asia/Hong_Kong]") class Module extends PlayModule { override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = Seq( bind[PetApi].to[PetApiImpl], diff --git a/samples/server/petstore/scala-play-framework/app/org/openapitools/OpenApiExceptions.scala b/samples/server/petstore/scala-play-server/app/org/openapitools/OpenApiExceptions.scala similarity index 100% rename from samples/server/petstore/scala-play-framework/app/org/openapitools/OpenApiExceptions.scala rename to samples/server/petstore/scala-play-server/app/org/openapitools/OpenApiExceptions.scala diff --git a/samples/server/petstore/scala-play-framework/build.sbt b/samples/server/petstore/scala-play-server/build.sbt similarity index 100% rename from samples/server/petstore/scala-play-framework/build.sbt rename to samples/server/petstore/scala-play-server/build.sbt diff --git a/samples/server/petstore/scala-play-framework/conf/application.conf b/samples/server/petstore/scala-play-server/conf/application.conf similarity index 100% rename from samples/server/petstore/scala-play-framework/conf/application.conf rename to samples/server/petstore/scala-play-server/conf/application.conf diff --git a/samples/server/petstore/scala-play-framework/conf/logback.xml b/samples/server/petstore/scala-play-server/conf/logback.xml similarity index 100% rename from samples/server/petstore/scala-play-framework/conf/logback.xml rename to samples/server/petstore/scala-play-server/conf/logback.xml diff --git a/samples/server/petstore/scala-play-framework/conf/routes b/samples/server/petstore/scala-play-server/conf/routes similarity index 100% rename from samples/server/petstore/scala-play-framework/conf/routes rename to samples/server/petstore/scala-play-server/conf/routes diff --git a/samples/server/petstore/scala-play-server/pom.xml b/samples/server/petstore/scala-play-server/pom.xml new file mode 100644 index 00000000000..9147d619bd9 --- /dev/null +++ b/samples/server/petstore/scala-play-server/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + org.openapitools + scala-play-server + pom + 1.0-SNAPSHOT + Scala Play server + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + sbt-test + integration-test + + exec + + + sbt + + test + + + + + + + + diff --git a/samples/server/petstore/scala-play-framework/project/build.properties b/samples/server/petstore/scala-play-server/project/build.properties similarity index 100% rename from samples/server/petstore/scala-play-framework/project/build.properties rename to samples/server/petstore/scala-play-server/project/build.properties diff --git a/samples/server/petstore/scala-play-framework/project/plugins.sbt b/samples/server/petstore/scala-play-server/project/plugins.sbt similarity index 100% rename from samples/server/petstore/scala-play-framework/project/plugins.sbt rename to samples/server/petstore/scala-play-server/project/plugins.sbt diff --git a/samples/server/petstore/scala-play-framework/public/openapi.json b/samples/server/petstore/scala-play-server/public/openapi.json similarity index 99% rename from samples/server/petstore/scala-play-framework/public/openapi.json rename to samples/server/petstore/scala-play-server/public/openapi.json index c683401cf0e..5781506eb92 100644 --- a/samples/server/petstore/scala-play-framework/public/openapi.json +++ b/samples/server/petstore/scala-play-server/public/openapi.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] } } } ],