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

Update akka scala default value (#401)

Browse Source 
* update akka scala default value

* fix akka-scala test option
This commit is contained in:
William Cheng 2018-05-10 10:55:44 +08:00 committed by GitHub
parent f615d823f9
commit 27c372ff56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 100 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
View File

@ -20,20 +20,11 @@ package org.openapitools.codegen.languages;
import com.google.common.base.CaseFormat;
import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Template;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.CodegenResponse;
import org.openapitools.codegen.CodegenSecurity;
import org.openapitools.codegen.CodegenType;
import org.openapitools.codegen.SupportingFile;
import org.openapitools.codegen.*;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -42,17 +33,11 @@ import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
protected String mainPackage = "io.swagger.client";
protected String groupId = "io.swagger";
protected String mainPackage = "org.openapitools.client";
protected String groupId = "org.openapitools";
protected String artifactId = "openapi-client";
protected String artifactVersion = "1.0.0";
protected String resourcesFolder = "src/main/resources";
@ -75,7 +60,7 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
public ScalaAkkaClientCodegen() {
super();
outputFolder = "generated-code/scala";
outputFolder = "generated-code/scala-akka";
modelTemplateFiles.put("model.mustache", ".scala");
apiTemplateFiles.put("api.mustache", ".scala");
embeddedTemplateDir = templateDir = "akka-scala";
@ -106,18 +91,7 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
additionalProperties.put("fnCamelize", new CamelizeLambda(false));
additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
additionalProperties.put("onlyOneSuccess", onlyOneSuccess);
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf"));
final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala"));
supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
additionalProperties.put("mainPackage", mainPackage);
importMapping.remove("Seq");
importMapping.remove("List");
@ -142,10 +116,39 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
typeMapping.put("double", "Double");
typeMapping.put("object", "Any");
typeMapping.put("file", "File");
typeMapping.put("binary", "File");
typeMapping.put("number", "Double");
instantiationTypes.put("array", "ListBuffer");
instantiationTypes.put("map", "Map");
cliOptions.add(new CliOption("mainPackage", "Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'").defaultValue("org.openapitools.client"));
}
@Override
public void processOpts() {
super.processOpts();
if (additionalProperties.containsKey("mainPackage")) {
setMainPackage((String) additionalProperties.get("mainPackage"));
apiPackage = mainPackage + ".api";
modelPackage = mainPackage + ".model";
invokerPackage = mainPackage + ".core";
additionalProperties.put("apiPackage", apiPackage);
additionalProperties.put("modelPackage", apiPackage);
additionalProperties.put("invokerPackage", apiPackage);
}
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf"));
final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala"));
supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
}
@Override
@ -348,4 +351,8 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
// remove " to avoid code injection
return input.replace("\"", "");
}
public void setMainPackage(String mainPackage) {
this.mainPackage = mainPackage;
}
}

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

@ -4,9 +4,9 @@ package {{package}}
{{#imports}}
import {{import}}
{{/imports}}
import {{invokerPackage}}._
import {{invokerPackage}}.CollectionFormats._
import {{invokerPackage}}.ApiKeyLocations._
import {{mainPackage}}.core._
import {{mainPackage}}.core.CollectionFormats._
import {{mainPackage}}.core.ApiKeyLocations._
{{#operations}}
object {{classname}} {

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

@ -1,5 +1,5 @@
{{>licenseInfo}}
package {{invokerPackage}}
package {{{mainPackage}}}.core
import java.io.File
import java.security.cert.X509Certificate
@ -89,8 +89,8 @@ object ApiInvoker {
class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends UntrustedSslContext with CustomContentTypes {
import io.swagger.client.core.ApiInvoker._
import io.swagger.client.core.ParametersMap._
import {{mainPackage}}.core.ApiInvoker._
import {{mainPackage}}.core.ParametersMap._
implicit val ec: ExecutionContextExecutor = system.dispatcher
implicit val jsonFormats: Formats = formats

2
modules/openapi-generator/src/main/resources/akka-scala/apiRequest.mustache
View File

@ -1,5 +1,5 @@
{{>licenseInfo}}
package {{invokerPackage}}
package {{{mainPackage}}}.core
sealed trait ResponseState

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

@ -1,11 +1,11 @@
{{>licenseInfo}}
package {{invokerPackage}}
package {{{mainPackage}}}.core
import java.util.concurrent.TimeUnit
import akka.actor.{ExtendedActorSystem, Extension, ExtensionKey}
import com.typesafe.config.Config
import io.swagger.client.core.ApiInvoker.CustomStatusCode
import {{mainPackage}}.core.ApiInvoker.CustomStatusCode
import spray.http.HttpHeaders.RawHeader
import scala.collection.JavaConversions._
@ -14,7 +14,7 @@ import scala.concurrent.duration.FiniteDuration
class ApiSettings(config: Config) extends Extension {
def this(system: ExtendedActorSystem) = this(system.settings.config)
private def cfg = config.getConfig("io.swagger.client.apiRequest")
private def cfg = config.getConfig("{{mainPackage}}.apiRequest")
val alwaysTrustCertificates: Boolean = cfg.getBoolean("trust-certificates")
val defaultHeaders: List[RawHeader] = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))

2
modules/openapi-generator/src/main/resources/akka-scala/model.mustache
View File

@ -1,7 +1,7 @@
{{>licenseInfo}}
package {{package}}
import {{invokerPackage}}.ApiModel
import {{mainPackage}}.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID

2
modules/openapi-generator/src/main/resources/akka-scala/requests.mustache
View File

@ -1,5 +1,5 @@
{{>licenseInfo}}
package {{invokerPackage}}
package {{mainPackage}}.core
import java.io.File
import java.net.URLEncoder

3
modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ScalaAkkaClientOptionsProvider.java
View File

@ -32,6 +32,8 @@ public class ScalaAkkaClientOptionsProvider implements OptionsProvider {
public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false";
public static final String PREPEND_FORM_OR_BODY_PARAMETERS_VALUE = "true";
public static final String MAIN_PACKAGE_VALUE = "net.test";
@Override
public String getLanguage() {
@ -48,6 +50,7 @@ public class ScalaAkkaClientOptionsProvider implements OptionsProvider {
.put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
.put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
.put(CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, PREPEND_FORM_OR_BODY_PARAMETERS_VALUE)
.put("mainPackage", MAIN_PACKAGE_VALUE)
.build();
}

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientOptionsTest.java
View File

@ -53,6 +53,8 @@ public class ScalaAkkaClientOptionsTest extends AbstractOptionsTest {
times = 1;
clientCodegen.setPrependFormOrBodyParameters(Boolean.valueOf(ScalaAkkaClientOptionsProvider.PREPEND_FORM_OR_BODY_PARAMETERS_VALUE));
times = 1;
clientCodegen.setMainPackage(ScalaAkkaClientOptionsProvider.MAIN_PACKAGE_VALUE);
times = 1;
}};
}
}

6
samples/client/petstore/akka-scala/README.md
View File

@ -36,7 +36,7 @@ Add this dependency to your project's POM:
```xml
<dependency>
<groupId>io.swagger</groupId>
<groupId>org.openapitools</groupId>
<artifactId>scala-akka-petstore-client</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
@ -48,13 +48,13 @@ Add this dependency to your project's POM:
Add this dependency to your project's build file:
```groovy
compile "io.swagger:scala-akka-petstore-client:1.0.0"
compile "org.openapitools:scala-akka-petstore-client:1.0.0"
```
### SBT users
```scala
libraryDependencies += "io.swagger" % "scala-akka-petstore-client" % "1.0.0"
libraryDependencies += "org.openapitools" % "scala-akka-petstore-client" % "1.0.0"
```
## Getting Started

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

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

2
samples/client/petstore/akka-scala/pom.xml
View File

@ -4,7 +4,7 @@
<name>scala-akka-petstore-client</name>
<groupId>io.swagger</groupId>
<groupId>org.openapitools</groupId>
<artifactId>scala-akka-petstore-client</artifactId>
<version>1.0.0</version>

2
samples/client/petstore/akka-scala/src/main/resources/reference.conf
View File

@ -1,4 +1,4 @@
io.swagger.client {
org.openapitools.client {
apiRequest {

4
samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala → samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
View File

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
import io.swagger.client.model._
import org.openapitools.client.model._
import org.json4s._
import scala.reflect.ClassTag

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

@ -9,14 +9,14 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
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.core._
import io.swagger.client.core.CollectionFormats._
import io.swagger.client.core.ApiKeyLocations._
import org.openapitools.client.model.Pet
import org.openapitools.client.core._
import org.openapitools.client.core.CollectionFormats._
import org.openapitools.client.core.ApiKeyLocations._
object PetApi {

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

@ -9,12 +9,12 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
import io.swagger.client.model.Order
import io.swagger.client.core._
import io.swagger.client.core.CollectionFormats._
import io.swagger.client.core.ApiKeyLocations._
import org.openapitools.client.model.Order
import org.openapitools.client.core._
import org.openapitools.client.core.CollectionFormats._
import org.openapitools.client.core.ApiKeyLocations._
object StoreApi {

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

@ -9,12 +9,12 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.api
package org.openapitools.client.api
import io.swagger.client.model.User
import io.swagger.client.core._
import io.swagger.client.core.CollectionFormats._
import io.swagger.client.core.ApiKeyLocations._
import org.openapitools.client.model.User
import org.openapitools.client.core._
import org.openapitools.client.core.CollectionFormats._
import org.openapitools.client.core.ApiKeyLocations._
object UserApi {

6
samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala → samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
View File

@ -9,7 +9,7 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.core
package org.openapitools.client.core
import java.io.File
import java.security.cert.X509Certificate
@ -99,8 +99,8 @@ object ApiInvoker {
class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends UntrustedSslContext with CustomContentTypes {
import io.swagger.client.core.ApiInvoker._
import io.swagger.client.core.ParametersMap._
import org.openapitools.client.core.ApiInvoker._
import org.openapitools.client.core.ParametersMap._
implicit val ec: ExecutionContextExecutor = system.dispatcher
implicit val jsonFormats: Formats = formats

2
samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala → samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiRequest.scala
View File

@ -9,7 +9,7 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.core
package org.openapitools.client.core
sealed trait ResponseState

6
samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala → samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiSettings.scala
View File

@ -9,13 +9,13 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.core
package org.openapitools.client.core
import java.util.concurrent.TimeUnit
import akka.actor.{ExtendedActorSystem, Extension, ExtensionKey}
import com.typesafe.config.Config
import io.swagger.client.core.ApiInvoker.CustomStatusCode
import org.openapitools.client.core.ApiInvoker.CustomStatusCode
import spray.http.HttpHeaders.RawHeader
import scala.collection.JavaConversions._
@ -24,7 +24,7 @@ import scala.concurrent.duration.FiniteDuration
class ApiSettings(config: Config) extends Extension {
def this(system: ExtendedActorSystem) = this(system.settings.config)
private def cfg = config.getConfig("io.swagger.client.apiRequest")
private def cfg = config.getConfig("org.openapitools.client.apiRequest")
val alwaysTrustCertificates: Boolean = cfg.getBoolean("trust-certificates")
val defaultHeaders: List[RawHeader] = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))

2
samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala → samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/requests.scala
View File

@ -9,7 +9,7 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.core
package org.openapitools.client.core
import java.io.File
import java.net.URLEncoder

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

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import io.swagger.client.core.ApiModel
import org.openapitools.client.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID

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

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import io.swagger.client.core.ApiModel
import org.openapitools.client.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID

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

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import io.swagger.client.core.ApiModel
import org.openapitools.client.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID

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

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import io.swagger.client.core.ApiModel
import org.openapitools.client.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID

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

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import io.swagger.client.core.ApiModel
import org.openapitools.client.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID

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

@ -9,9 +9,9 @@
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package io.swagger.client.model
package org.openapitools.client.model
import io.swagger.client.core.ApiModel
import org.openapitools.client.core.ApiModel
import org.joda.time.DateTime
import java.util.UUID