loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

update scala default value (#402)

Browse Source
This commit is contained in:
William Cheng 2018-05-09 21:48:32 +08:00 committed by GitHub
parent 58f7a6f0c4
commit 286f2caa22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 90 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
View File

@ -17,28 +17,26 @@
package org.openapitools.codegen.languages;
import com.samskivert.mustache.Escapers;
import com.samskivert.mustache.Mustache;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.utils.ModelUtils;
import java.io.File;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.samskivert.mustache.Escapers;
import com.samskivert.mustache.Mustache;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.utils.ModelUtils;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import org.apache.commons.lang3.StringUtils;
public abstract class AbstractScalaCodegen extends DefaultCodegen {
protected String modelPropertyNaming = "camelCase";
protected String invokerPackage = "io.swagger.client";
protected String invokerPackage = "org.openapitools.client";
protected String sourceFolder = "src/main/scala";
protected boolean stripPackageName = true;
@ -123,14 +121,14 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
}
}
public void setSourceFolder(String sourceFolder) {
this.sourceFolder = sourceFolder;
}
public String getSourceFolder() {
return sourceFolder;
}
public void setSourceFolder(String sourceFolder) {
this.sourceFolder = sourceFolder;
}
@Override
public String escapeReservedWord(String name) {
if (this.reservedWordsMappings().containsKey(name)) {

17
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
View File

@ -18,12 +18,7 @@
package org.openapitools.codegen.languages;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.CodegenType;
import org.openapitools.codegen.SupportingFile;
import org.openapitools.codegen.*;
import java.io.File;
import java.util.Arrays;
@ -34,19 +29,19 @@ public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements Code
protected String gradleWrapperPackage = "gradle.wrapper";
protected boolean authPreemptive;
protected boolean asyncHttpClient = !authScheme.isEmpty();
protected String groupId = "io.swagger";
protected String groupId = "org.openapitools";
protected String artifactId = "openapi-scala-client";
protected String artifactVersion = "1.0.0";
protected String clientName = "AsyncClient";
public ScalaHttpClientCodegen() {
super();
outputFolder = "generated-code/scala";
outputFolder = "generated-code/scala-http-client";
modelTemplateFiles.put("model.mustache", ".scala");
apiTemplateFiles.put("api.mustache", ".scala");
embeddedTemplateDir = templateDir = "scala";
apiPackage = "io.swagger.client.api";
modelPackage = "io.swagger.client.model";
apiPackage = "org.openapitools.client.api";
modelPackage = "org.openapitools.client.model";
setReservedWordsLowerCase(
Arrays.asList(
@ -115,7 +110,7 @@ public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements Code
typeMapping.put("double", "Double");
typeMapping.put("object", "Any");
typeMapping.put("file", "File");
typeMapping.put("binary", "Array[Byte]");
typeMapping.put("binary", "File");
typeMapping.put("ByteArray", "Array[Byte]");
typeMapping.put("ArrayByte", "Array[Byte]");
typeMapping.put("date-time", "Date");

6
modules/openapi-generator/src/main/resources/scala/README.mustache
View File

@ -2,8 +2,10 @@
{{appName}}
{{#appDescription}}{{{appDescription}}}{{/appDescription}}
{{#appDescription}}
{{{appDescription}}}
{{/appDescription}}
# VERSION
Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
@ -115,7 +117,7 @@ Your library files will be built under `WWW::MyProjectName`.
$ cd openapi-generator
$ mvn package
$ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-i [URL or file path to JSON swagger API spec] \
-i [URL or file path to OpenAPI spec] \
-l akka-scala \
-c /path/to/config/file.json \
-o /path/to/output/folder

20
modules/openapi-generator/src/main/resources/scala/api.mustache
View File

@ -7,29 +7,23 @@ import java.text.SimpleDateFormat
{{/imports}}
import {{invokerPackage}}.{ApiInvoker, ApiException}
import collection.mutable
import com.sun.jersey.multipart.FormDataMultiPart
import com.sun.jersey.multipart.file.FileDataBodyPart
import com.wordnik.swagger.client._
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import java.net.URI
import java.io.File
import java.util.Date
import java.util.TimeZone
import scala.collection.mutable.HashMap
import com.wordnik.swagger.client._
import scala.concurrent.Future
import collection.mutable
import java.net.URI
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent._
import scala.concurrent.duration._
import scala.collection.mutable.HashMap
import scala.util.{Failure, Success, Try}
import org.json4s._

4
modules/openapi-generator/src/main/resources/scala/pom.mustache
View File

@ -231,7 +231,7 @@
<dependency>
<groupId>com.wordnik.swagger</groupId>
<artifactId>swagger-async-httpclient_2.11</artifactId>
<version>${swagger-async-httpclient-version}</version>
<version>${async-httpclient-version}</version>
</dependency>
</dependencies>
<properties>
@ -247,7 +247,7 @@
<junit-version>4.12</junit-version>
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
<scala-test-version>3.0.4</scala-test-version>
<swagger-async-httpclient-version>0.3.5</swagger-async-httpclient-version>
<async-httpclient-version>0.3.5</async-httpclient-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

2
samples/client/petstore/scala/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'idea'
apply plugin: 'eclipse'
group = 'io.swagger'
group = 'org.openapitools'
version = '1.0.0'
buildscript {

2
samples/client/petstore/scala/build.sbt
View File

@ -1,6 +1,6 @@
version := "1.0.0"
name := "openapi-scala-client"
organization := "io.swagger"
organization := "org.openapitools"
scalaVersion := "2.11.12"
libraryDependencies ++= Seq(

6
samples/client/petstore/scala/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId>
<groupId>org.openapitools</groupId>
<artifactId>openapi-scala-client</artifactId>
<packaging>jar</packaging>
<name>openapi-scala-client</name>
@ -231,7 +231,7 @@
<dependency>
<groupId>com.wordnik.swagger</groupId>
<artifactId>swagger-async-httpclient_2.11</artifactId>
<version>${swagger-async-httpclient-version}</version>
<version>${async-httpclient-version}</version>
</dependency>
</dependencies>
<properties>
@ -247,7 +247,7 @@
<junit-version>4.12</junit-version>
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
<scala-test-version>3.0.4</scala-test-version>
<swagger-async-httpclient-version>0.3.5</swagger-async-httpclient-version>
<async-httpclient-version>0.3.5</async-httpclient-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/ApiInvoker.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client
package org.openapitools.client
import com.sun.jersey.api.client.Client
import com.sun.jersey.api.client.ClientResponse

4
samples/client/petstore/scala/src/main/scala/io/swagger/client/AsyncClient.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/AsyncClient.scala
View File

@ -1,6 +1,6 @@
package io.swagger.client
package org.openapitools.client
import io.swagger.client.api._
import org.openapitools.client.api._
import com.wordnik.swagger.client._

28
samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/PetApi.scala
View File

@ -10,38 +10,32 @@
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
import java.text.SimpleDateFormat
import io.swagger.client.model.ApiResponse
import org.openapitools.client.model.ApiResponse
import java.io.File
import io.swagger.client.model.Pet
import io.swagger.client.{ApiInvoker, ApiException}
import org.openapitools.client.model.Pet
import org.openapitools.client.{ApiInvoker, ApiException}
import collection.mutable
import com.sun.jersey.multipart.FormDataMultiPart
import com.sun.jersey.multipart.file.FileDataBodyPart
import com.wordnik.swagger.client._
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import java.net.URI
import java.io.File
import java.util.Date
import java.util.TimeZone
import scala.collection.mutable.HashMap
import com.wordnik.swagger.client._
import scala.concurrent.Future
import collection.mutable
import java.net.URI
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent._
import scala.concurrent.duration._
import scala.collection.mutable.HashMap
import scala.util.{Failure, Success, Try}
import org.json4s._

26
samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/StoreApi.scala
View File

@ -10,36 +10,30 @@
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
import java.text.SimpleDateFormat
import io.swagger.client.model.Order
import io.swagger.client.{ApiInvoker, ApiException}
import org.openapitools.client.model.Order
import org.openapitools.client.{ApiInvoker, ApiException}
import collection.mutable
import com.sun.jersey.multipart.FormDataMultiPart
import com.sun.jersey.multipart.file.FileDataBodyPart
import com.wordnik.swagger.client._
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import java.net.URI
import java.io.File
import java.util.Date
import java.util.TimeZone
import scala.collection.mutable.HashMap
import com.wordnik.swagger.client._
import scala.concurrent.Future
import collection.mutable
import java.net.URI
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent._
import scala.concurrent.duration._
import scala.collection.mutable.HashMap
import scala.util.{Failure, Success, Try}
import org.json4s._

26
samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/UserApi.scala
View File

@ -10,36 +10,30 @@
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
import java.text.SimpleDateFormat
import io.swagger.client.model.User
import io.swagger.client.{ApiInvoker, ApiException}
import org.openapitools.client.model.User
import org.openapitools.client.{ApiInvoker, ApiException}
import collection.mutable
import com.sun.jersey.multipart.FormDataMultiPart
import com.sun.jersey.multipart.file.FileDataBodyPart
import com.wordnik.swagger.client._
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import java.net.URI
import java.io.File
import java.util.Date
import java.util.TimeZone
import scala.collection.mutable.HashMap
import com.wordnik.swagger.client._
import scala.concurrent.Future
import collection.mutable
import java.net.URI
import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
import javax.ws.rs.core.MediaType
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent._
import scala.concurrent.duration._
import scala.collection.mutable.HashMap
import scala.util.{Failure, Success, Try}
import org.json4s._

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
case class ApiResponse (

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Category.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
case class Category (

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Order.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import java.util.Date

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Pet.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
case class Pet (

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Tag.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
case class Tag (

2
samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala → samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/User.scala
View File

@ -10,7 +10,7 @@
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
case class User (

10
samples/client/petstore/scala/src/test/scala/PetApiTest.scala
View File

@ -1,6 +1,6 @@
import io.swagger.client._
import io.swagger.client.api._
import io.swagger.client.model._
import org.openapitools.client._
import org.openapitools.client.api._
import org.openapitools.client.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@ -21,7 +21,7 @@ class PetApiTest extends FlatSpec with Matchers {
Some(Category(Some(1), Some("sold"))),
"dragon",
(for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList,
Some((for (i <- (1 to 5)) yield io.swagger.client.model.Tag(Some(i), Some("tag-" + i))).toList),
Some((for (i <- (1 to 5)) yield org.openapitools.client.model.Tag(Some(i), Some("tag-" + i))).toList),
Some("lost")
)
@ -46,7 +46,7 @@ class PetApiTest extends FlatSpec with Matchers {
Some(Category(Some(1), Some("sold"))),
"programmer",
(for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList,
Some((for (i <- (1 to 5)) yield io.swagger.client.model.Tag(Some(i), Some("tag-" + i))).toList),
Some((for (i <- (1 to 5)) yield org.openapitools.client.model.Tag(Some(i), Some("tag-" + i))).toList),
Some("confused")
)

6
samples/client/petstore/scala/src/test/scala/StoreApiTest.scala
View File

@ -1,6 +1,6 @@
import io.swagger.client._
import io.swagger.client.api._
import io.swagger.client.model._
import org.openapitools.client._
import org.openapitools.client.api._
import org.openapitools.client.model._
import org.joda.time.DateTime
import org.junit.runner.RunWith

6
samples/client/petstore/scala/src/test/scala/UserApiTest.scala
View File

@ -1,6 +1,6 @@
import io.swagger.client._
import io.swagger.client.api._
import io.swagger.client.model._
import org.openapitools.client._
import org.openapitools.client.api._
import org.openapitools.client.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner