update scala default value (#402)

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

View File

@ -17,28 +17,26 @@
package org.openapitools.codegen.languages; 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.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; 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 { public abstract class AbstractScalaCodegen extends DefaultCodegen {
protected String modelPropertyNaming = "camelCase"; protected String modelPropertyNaming = "camelCase";
protected String invokerPackage = "io.swagger.client"; protected String invokerPackage = "org.openapitools.client";
protected String sourceFolder = "src/main/scala"; protected String sourceFolder = "src/main/scala";
protected boolean stripPackageName = true; 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() { public String getSourceFolder() {
return sourceFolder; return sourceFolder;
} }
public void setSourceFolder(String sourceFolder) {
this.sourceFolder = sourceFolder;
}
@Override @Override
public String escapeReservedWord(String name) { public String escapeReservedWord(String name) {
if (this.reservedWordsMappings().containsKey(name)) { if (this.reservedWordsMappings().containsKey(name)) {

View File

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

View File

@ -2,8 +2,10 @@
{{appName}} {{appName}}
{{#appDescription}}{{{appDescription}}}{{/appDescription}} {{#appDescription}}
{{{appDescription}}}
{{/appDescription}}
# VERSION # VERSION
Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: 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 $ cd openapi-generator
$ mvn package $ mvn package
$ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \ $ 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 \ -l akka-scala \
-c /path/to/config/file.json \ -c /path/to/config/file.json \
-o /path/to/output/folder -o /path/to/output/folder

View File

@ -7,29 +7,23 @@ import java.text.SimpleDateFormat
{{/imports}} {{/imports}}
import {{invokerPackage}}.{ApiInvoker, ApiException} import {{invokerPackage}}.{ApiInvoker, ApiException}
import collection.mutable
import com.sun.jersey.multipart.FormDataMultiPart import com.sun.jersey.multipart.FormDataMultiPart
import com.sun.jersey.multipart.file.FileDataBodyPart 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.io.File
import java.util.Date import java.util.Date
import java.util.TimeZone import java.util.TimeZone
import javax.ws.rs.core.MediaType
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 scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent._ import scala.concurrent._
import scala.concurrent.duration._ import scala.concurrent.duration._
import scala.collection.mutable.HashMap
import scala.util.{Failure, Success, Try} import scala.util.{Failure, Success, Try}
import org.json4s._ import org.json4s._

View File

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

View File

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

View File

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

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

View File

@ -10,7 +10,7 @@
* Do not edit the class manually. * 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.Client
import com.sun.jersey.api.client.ClientResponse import com.sun.jersey.api.client.ClientResponse

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._ import com.wordnik.swagger.client._

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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