loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-03 06:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Scala generators (#206)

Browse Source
This commit is contained in:
William Cheng 2018-04-23 22:15:40 +08:00 committed by Jérémie Bresson
parent e7410d4c8e
commit 1f64646dc3
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/akka-scala-petstore.sh
View File

@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/akka-scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l akka-scala -o samples/client/petstore/akka-scala $@" ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/akka-scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l scala-akka -o samples/client/petstore/akka-scala $@"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

2
bin/scala-petstore.sh
View File

@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l scala -o samples/client/petstore/scala" ags="$@ generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l scala-httpclient -o samples/client/petstore/scala"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

2
bin/windows/akka-scala-petstore.bat
View File

@ -5,6 +5,6 @@ If Not Exist %executable% (
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
set ags=generate --artifact-id "scala-akka-petstore-client" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l akka-scala -o samples\client\petstore\akka-scala set ags=generate --artifact-id "scala-akka-petstore-client" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l scala-akka -o samples\client\petstore\akka-scala
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

2
bin/windows/scala-petstore.bat
View File

@ -5,6 +5,6 @@ If Not Exist %executable% (
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l scala -o samples\client\petstore\scala set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l scala-httpclient -o samples\client\petstore\scala
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java
View File

@ -30,7 +30,7 @@ public class CodegenConfigLoader {
try { try {
return (CodegenConfig) Class.forName(name).newInstance(); return (CodegenConfig) Class.forName(name).newInstance();
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("Can't load config class with name ".concat(name) + " Available:\n" + availableConfigs.toString(), e); throw new RuntimeException("Can't load config class with name '".concat(name) + "'\nAvailable:\n" + availableConfigs.toString());
} }
} }

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

@ -35,7 +35,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements CodegenConfig { public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
protected String mainPackage = "io.swagger.client"; protected String mainPackage = "io.swagger.client";
protected String groupId = "io.swagger"; protected String groupId = "io.swagger";
protected String artifactId = "swagger-client"; protected String artifactId = "swagger-client";
@ -56,9 +56,9 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code
protected boolean onlyOneSuccess = true; protected boolean onlyOneSuccess = true;
@SuppressWarnings("hiding") @SuppressWarnings("hiding")
protected Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class); protected Logger LOGGER = LoggerFactory.getLogger(ScalaAkkaClientCodegen.class);
public AkkaScalaClientCodegen() { public ScalaAkkaClientCodegen() {
super(); super();
outputFolder = "generated-code/scala"; outputFolder = "generated-code/scala";
modelTemplateFiles.put("model.mustache", ".scala"); modelTemplateFiles.put("model.mustache", ".scala");
@ -140,7 +140,7 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code
@Override @Override
public String getName() { public String getName() {
return "akka-scala"; return "scala-akka";
} }
@Override @Override

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

@ -8,7 +8,7 @@ import java.util.HashMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenConfig { public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
protected String authScheme = ""; protected String authScheme = "";
protected String gradleWrapperPackage = "gradle.wrapper"; protected String gradleWrapperPackage = "gradle.wrapper";
protected boolean authPreemptive; protected boolean authPreemptive;
@ -18,7 +18,7 @@ public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenC
protected String artifactVersion = "1.0.0"; protected String artifactVersion = "1.0.0";
protected String clientName = "AsyncClient"; protected String clientName = "AsyncClient";
public ScalaClientCodegen() { public ScalaHttpClientCodegen() {
super(); super();
outputFolder = "generated-code/scala"; outputFolder = "generated-code/scala";
modelTemplateFiles.put("model.mustache", ".scala"); modelTemplateFiles.put("model.mustache", ".scala");
@ -184,12 +184,14 @@ public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenC
@Override @Override
public String getName() { public String getName() {
return "scala"; return "scala-httpclient";
} }
@Override @Override
public String getHelp() { public String getHelp() {
return "Generates a Scala client library (beta)."; return "Generates a Scala client library (beta). IMPORTANT: " +
"This generator is no longer actively maintained and will be deprecated. " +
"PLease use 'scala-akka' generator instead.";
} }
@Override @Override

4
modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
View File

@ -1,7 +1,6 @@
org.openapitools.codegen.languages.AdaCodegen org.openapitools.codegen.languages.AdaCodegen
org.openapitools.codegen.languages.AdaServerCodegen org.openapitools.codegen.languages.AdaServerCodegen
org.openapitools.codegen.languages.AndroidClientCodegen org.openapitools.codegen.languages.AndroidClientCodegen
org.openapitools.codegen.languages.AkkaScalaClientCodegen
org.openapitools.codegen.languages.Apache2ConfigCodegen org.openapitools.codegen.languages.Apache2ConfigCodegen
org.openapitools.codegen.languages.ApexClientCodegen org.openapitools.codegen.languages.ApexClientCodegen
org.openapitools.codegen.languages.AspNetCoreServerCodegen org.openapitools.codegen.languages.AspNetCoreServerCodegen
@ -70,7 +69,8 @@ org.openapitools.codegen.languages.RubySinatraServerCodegen
org.openapitools.codegen.languages.RustClientCodegen org.openapitools.codegen.languages.RustClientCodegen
org.openapitools.codegen.languages.RustServerCodegen org.openapitools.codegen.languages.RustServerCodegen
org.openapitools.codegen.languages.ScalatraServerCodegen org.openapitools.codegen.languages.ScalatraServerCodegen
org.openapitools.codegen.languages.ScalaClientCodegen org.openapitools.codegen.languages.ScalaAkkaClientCodegen
org.openapitools.codegen.languages.ScalaHttpClientCodegen
org.openapitools.codegen.languages.ScalaGatlingCodegen org.openapitools.codegen.languages.ScalaGatlingCodegen
org.openapitools.codegen.languages.ScalaLagomServerCodegen org.openapitools.codegen.languages.ScalaLagomServerCodegen
org.openapitools.codegen.languages.ScalazClientCodegen org.openapitools.codegen.languages.ScalazClientCodegen