From 868ede53f90274f6dc27e13ae6cc7a19a87ee964 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 10 May 2018 10:56:11 +0800 Subject: [PATCH] Update Scalatra's default value (#403) * update scalatra default value * minor rupdate to template --- .../codegen/languages/ScalatraServerCodegen.java | 9 ++++----- .../src/main/resources/scalatra/Bootstrap.mustache | 4 ++-- .../src/main/resources/scalatra/ServletApp.mustache | 8 ++++---- .../src/main/resources/scalatra/api.mustache | 4 ++-- .../src/main/resources/scalatra/build.sbt | 2 +- samples/server/petstore/scalatra/build.sbt | 2 +- .../scalatra/src/main/scala/ScalatraBootstrap.scala | 6 +++--- .../petstore/scalatra/src/main/scala/ServletApp.scala | 8 ++++---- .../swagger => org/openapitools}/server/api/PetApi.scala | 6 +++--- .../openapitools}/server/api/StoreApi.scala | 4 ++-- .../openapitools}/server/api/UserApi.scala | 4 ++-- .../openapitools}/server/model/ApiResponse.scala | 2 +- .../openapitools}/server/model/Category.scala | 2 +- .../openapitools}/server/model/Order.scala | 2 +- .../swagger => org/openapitools}/server/model/Pet.scala | 2 +- .../swagger => org/openapitools}/server/model/Tag.scala | 2 +- .../swagger => org/openapitools}/server/model/User.scala | 2 +- 17 files changed, 34 insertions(+), 35 deletions(-) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/api/PetApi.scala (97%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/api/StoreApi.scala (96%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/api/UserApi.scala (97%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/model/ApiResponse.scala (92%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/model/Category.scala (91%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/model/Order.scala (93%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/model/Pet.scala (93%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/model/Tag.scala (91%) rename samples/server/petstore/scalatra/src/main/scala/{io/swagger => org/openapitools}/server/model/User.scala (94%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java index c88905831e6..fa6b00575b0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java @@ -44,8 +44,9 @@ public class ScalatraServerCodegen extends AbstractScalaCodegen implements Codeg modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); embeddedTemplateDir = templateDir = "scalatra"; - apiPackage = "io.swagger.server.api"; - modelPackage = "io.swagger.server.model"; + invokerPackage = "org.openapitools"; + apiPackage = "org.openapitools.server.api"; + modelPackage = "org.openapitools.server.model"; setReservedWordsLowerCase( Arrays.asList( @@ -80,9 +81,7 @@ public class ScalatraServerCodegen extends AbstractScalaCodegen implements Codeg typeMapping.put("integer", "Int"); typeMapping.put("long", "Long"); - //TODO binary should be mapped to byte array - // mapped to String as a workaround - typeMapping.put("binary", "String"); + typeMapping.put("binary", "File"); additionalProperties.put("appName", "OpenAPI Sample"); additionalProperties.put("appDescription", "A sample openapi server"); diff --git a/modules/openapi-generator/src/main/resources/scalatra/Bootstrap.mustache b/modules/openapi-generator/src/main/resources/scalatra/Bootstrap.mustache index 75496c249e8..b2397887179 100644 --- a/modules/openapi-generator/src/main/resources/scalatra/Bootstrap.mustache +++ b/modules/openapi-generator/src/main/resources/scalatra/Bootstrap.mustache @@ -1,12 +1,12 @@ {{>licenseInfo}} import {{apiPackage}}._ -import io.swagger.app.{ ResourcesApp, SwaggerApp } +import {{invokerPackage}}.app.{ ResourcesApp, OpenAPIApp } import javax.servlet.ServletContext import org.scalatra.LifeCycle class ScalatraBootstrap extends LifeCycle { - implicit val swagger = new SwaggerApp + implicit val openapi = new OpenAPIApp override def init(context: ServletContext) { try { diff --git a/modules/openapi-generator/src/main/resources/scalatra/ServletApp.mustache b/modules/openapi-generator/src/main/resources/scalatra/ServletApp.mustache index 93d0cfd1380..cdb87d65810 100644 --- a/modules/openapi-generator/src/main/resources/scalatra/ServletApp.mustache +++ b/modules/openapi-generator/src/main/resources/scalatra/ServletApp.mustache @@ -1,22 +1,22 @@ {{>licenseInfo}} -package io.swagger.app +package {{invokerPackage}}.app import org.scalatra.swagger.{ ApiInfo, SwaggerWithAuth, Swagger } import org.scalatra.swagger.{ JacksonSwaggerBase, Swagger } import org.scalatra.ScalatraServlet import org.json4s.{ DefaultFormats, Formats } -class ResourcesApp(implicit protected val swagger: SwaggerApp) +class ResourcesApp(implicit protected val swagger: OpenAPIApp) extends ScalatraServlet with JacksonSwaggerBase { before() { response.headers += ("Access-Control-Allow-Origin" -> "*") } } -class SwaggerApp extends Swagger(apiInfo = ApiSwagger.apiInfo, apiVersion = "1.0", swaggerVersion = Swagger.SpecVersion) +class OpenAPIApp extends Swagger(apiInfo = OpenAPIInfo.apiInfo, apiVersion = "1.0", swaggerVersion = Swagger.SpecVersion) -object ApiSwagger { +object OpenAPIInfo { val apiInfo = ApiInfo( """{{{appName}}}""", """{{{appDescription}}}""", diff --git a/modules/openapi-generator/src/main/resources/scalatra/api.mustache b/modules/openapi-generator/src/main/resources/scalatra/api.mustache index 92c96b8bf5e..d85f17ffca5 100644 --- a/modules/openapi-generator/src/main/resources/scalatra/api.mustache +++ b/modules/openapi-generator/src/main/resources/scalatra/api.mustache @@ -32,12 +32,12 @@ class {{classname}}(implicit val swagger: Swagger) extends ScalatraServlet {{#operation}} {{newline}} - val {{nickname}}Operation = (apiOperation[{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]("{{nickname}}") + val {{operationId}}Operation = (apiOperation[{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]("{{operationId}}") summary "{{{summary}}}" parameters({{#allParams}}{{>queryParam}}{{>pathParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ) - {{httpMethod}}("{{{vendorExtensions.x-scalatra-path}}}", operation({{nickname}}Operation)) { + {{httpMethod}}("{{{vendorExtensions.x-scalatra-path}}}", operation({{operationId}}Operation)) { {{#allParams}} {{#isFile}} val {{paramName}} = fileParams("{{paramName}}") diff --git a/modules/openapi-generator/src/main/resources/scalatra/build.sbt b/modules/openapi-generator/src/main/resources/scalatra/build.sbt index aecfef97d5b..4e374208144 100644 --- a/modules/openapi-generator/src/main/resources/scalatra/build.sbt +++ b/modules/openapi-generator/src/main/resources/scalatra/build.sbt @@ -1,4 +1,4 @@ -organization := "io.swagger" +organization := "org.openapitools" name := "scalatra-sample" version := "0.1.0-SNAPSHOT" scalaVersion := "2.12.4" diff --git a/samples/server/petstore/scalatra/build.sbt b/samples/server/petstore/scalatra/build.sbt index aecfef97d5b..4e374208144 100644 --- a/samples/server/petstore/scalatra/build.sbt +++ b/samples/server/petstore/scalatra/build.sbt @@ -1,4 +1,4 @@ -organization := "io.swagger" +organization := "org.openapitools" name := "scalatra-sample" version := "0.1.0-SNAPSHOT" scalaVersion := "2.12.4" diff --git a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala index 375cc973afd..bdab3861475 100644 --- a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala +++ b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala @@ -10,13 +10,13 @@ */ -import io.swagger.server.api._ -import io.swagger.app.{ ResourcesApp, SwaggerApp } +import org.openapitools.server.api._ +import org.openapitools.app.{ ResourcesApp, OpenAPIApp } import javax.servlet.ServletContext import org.scalatra.LifeCycle class ScalatraBootstrap extends LifeCycle { - implicit val swagger = new SwaggerApp + implicit val openapi = new OpenAPIApp override def init(context: ServletContext) { try { diff --git a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala index f2a4006ad5e..82268ea76e9 100644 --- a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala +++ b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala @@ -10,23 +10,23 @@ */ -package io.swagger.app +package org.openapitools.app import org.scalatra.swagger.{ ApiInfo, SwaggerWithAuth, Swagger } import org.scalatra.swagger.{ JacksonSwaggerBase, Swagger } import org.scalatra.ScalatraServlet import org.json4s.{ DefaultFormats, Formats } -class ResourcesApp(implicit protected val swagger: SwaggerApp) +class ResourcesApp(implicit protected val swagger: OpenAPIApp) extends ScalatraServlet with JacksonSwaggerBase { before() { response.headers += ("Access-Control-Allow-Origin" -> "*") } } -class SwaggerApp extends Swagger(apiInfo = ApiSwagger.apiInfo, apiVersion = "1.0", swaggerVersion = Swagger.SpecVersion) +class OpenAPIApp extends Swagger(apiInfo = OpenAPIInfo.apiInfo, apiVersion = "1.0", swaggerVersion = Swagger.SpecVersion) -object ApiSwagger { +object OpenAPIInfo { val apiInfo = ApiInfo( """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.""", diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/PetApi.scala similarity index 97% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/PetApi.scala index 7508b02de18..8ecf1d6283a 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/PetApi.scala @@ -10,11 +10,11 @@ */ -package io.swagger.server.api +package org.openapitools.server.api -import io.swagger.server.model.ApiResponse +import org.openapitools.server.model.ApiResponse import java.io.File -import io.swagger.server.model.Pet +import org.openapitools.server.model.Pet import java.io.File diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/StoreApi.scala similarity index 96% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/StoreApi.scala index f8cedb0ac39..3419f02abfb 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/StoreApi.scala @@ -10,9 +10,9 @@ */ -package io.swagger.server.api +package org.openapitools.server.api -import io.swagger.server.model.Order +import org.openapitools.server.model.Order import java.io.File diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/UserApi.scala similarity index 97% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/UserApi.scala index 8604d885ab2..90ee1e201d5 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/api/UserApi.scala @@ -10,9 +10,9 @@ */ -package io.swagger.server.api +package org.openapitools.server.api -import io.swagger.server.model.User +import org.openapitools.server.model.User import java.io.File diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/ApiResponse.scala similarity index 92% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/ApiResponse.scala index 40e522866e4..e14b6bbaaf5 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/ApiResponse.scala @@ -9,7 +9,7 @@ * https://openapi-generator.tech */ -package io.swagger.server.model +package org.openapitools.server.model case class ApiResponse( code: Option[Int], diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Category.scala similarity index 91% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Category.scala index 146800eba60..148704eeb08 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Category.scala @@ -9,7 +9,7 @@ * https://openapi-generator.tech */ -package io.swagger.server.model +package org.openapitools.server.model case class Category( id: Option[Long], diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Order.scala similarity index 93% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Order.scala index 1356a50c517..9394dc1b8eb 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Order.scala @@ -9,7 +9,7 @@ * https://openapi-generator.tech */ -package io.swagger.server.model +package org.openapitools.server.model import java.util.Date case class Order( diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Pet.scala similarity index 93% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Pet.scala index 0673e7061c5..7296720147c 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Pet.scala @@ -9,7 +9,7 @@ * https://openapi-generator.tech */ -package io.swagger.server.model +package org.openapitools.server.model case class Pet( id: Option[Long], diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Tag.scala similarity index 91% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Tag.scala index 632c071ae33..4002f962d08 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/Tag.scala @@ -9,7 +9,7 @@ * https://openapi-generator.tech */ -package io.swagger.server.model +package org.openapitools.server.model case class Tag( id: Option[Long], diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/User.scala similarity index 94% rename from samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala rename to samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/User.scala index c27280cf5a6..ef69c5ffed2 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala +++ b/samples/server/petstore/scalatra/src/main/scala/org/openapitools/server/model/User.scala @@ -9,7 +9,7 @@ * https://openapi-generator.tech */ -package io.swagger.server.model +package org.openapitools.server.model case class User( id: Option[Long],