Update Scalatra's default value (#403)

* update scalatra default value

* minor rupdate to template

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");

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 {

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}}}""",

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}}")

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"

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"

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 {

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.""",

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
 

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
 

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
 

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],

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],

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(

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],

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],

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],