Skip to content

Commit e23b2f6

Browse files
ackintoshwing328
ackintosh
authored and
wing328
committed
[Scala][client] Rename script, sample folder, template dir (#334)
* Rename scripts akka-scala-petstore.sh -> scala-akka-petstore.sh * Rename sample folder: akka-scala -> scala-akka * Rename templateDir: akka-scala -> scala-akka-client * Rename scripts: scala-petstore.sh -> scala-httpclient-petstore.sh * Rename sample folder: scala -> scala-httpclient * Rename templateDir: scala -> scala-httpclient * update circle pom.xml for new scala path * remove duplicated scala test
1 parent 5b5fe3c commit e23b2f6

111 files changed

Lines changed: 15 additions & 17 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CI/pom.xml.circleci‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,8 +836,8 @@
836836
<!-- test non-java projects -->
837837
<module>samples/client/petstore/go</module>
838838
<!-- test java-related projects -->
839-
<module>samples/client/petstore/akka-scala</module>
840-
<module>samples/client/petstore/scala</module>
839+
<module>samples/client/petstore/scala-akka</module>
840+
<module>samples/client/petstore/scala-httpclient</module>
841841
<module>samples/client/petstore/scalaz</module>
842842
<module>samples/client/petstore/clojure</module>
843843
<module>samples/client/petstore/java/feign</module>

‎CI/pom.xml.circleci.java7‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,8 @@
834834
<modules>
835835
<!-- clients -->
836836
<!-- test java-related projects -->
837-
<module>samples/client/petstore/akka-scala</module>
838-
<module>samples/client/petstore/scala</module>
837+
<module>samples/client/petstore/scala-akka</module>
838+
<module>samples/client/petstore/scala-httpclient</module>
839839
<module>samples/client/petstore/scalaz</module>
840840
<module>samples/client/petstore/clojure</module>
841841
<module>samples/client/petstore/java/feign</module>

bin/openapi3/akka-scala-petstore.sh renamed to bin/openapi3/scala-akka-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/akka-scala -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g akka-scala -o samples/client/petstore/akka-scala $@"
30+
ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/scala-akka-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g akka-scala -o samples/client/petstore/scala-akka $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

bin/openapi3/scala-petstore.sh renamed to bin/openapi3/scala-httpclient-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
ags="generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala -o samples/client/petstore/scala $@"
30+
ags="generate -t modules/openapi-generator/src/main/resources/scala-httpclient -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala -o samples/client/petstore/scala-httpclient $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

bin/akka-scala-petstore.sh renamed to bin/scala-akka-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
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 -g scala-akka -o samples/client/petstore/akka-scala $@"
30+
ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/scala-akka-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-akka -o samples/client/petstore/scala-akka $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

bin/scala-petstore.sh renamed to bin/scala-httpclient-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

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

3232
java $JAVA_OPTS -jar $executable $ags

bin/security/scala-petstore.sh renamed to bin/security/scala-httpclient-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

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

3232
java $JAVA_OPTS -jar $executable $ags

bin/windows/akka-scala-petstore.bat renamed to bin/windows/scala-akka-petstore.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ If Not Exist %executable% (
55
)
66

77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
8-
set ags=generate --artifact-id "scala-akka-petstore-client" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g scala-akka -o samples\client\petstore\akka-scala
8+
set ags=generate --artifact-id "scala-akka-petstore-client" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g scala-akka -o samples\client\petstore\scala-akka
99

1010
java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/scala-petstore.bat renamed to bin/windows/scala-httpclient-petstore.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ If Not Exist %executable% (
55
)
66

77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8-
set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g scala-httpclient -o samples\client\petstore\scala
8+
set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g scala-httpclient -o samples\client\petstore\scala-httpclient
99

1010
java %JAVA_OPTS% -jar %executable% %ags%

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public ScalaAkkaClientCodegen() {
6363
outputFolder = "generated-code/scala-akka";
6464
modelTemplateFiles.put("model.mustache", ".scala");
6565
apiTemplateFiles.put("api.mustache", ".scala");
66-
embeddedTemplateDir = templateDir = "akka-scala";
66+
embeddedTemplateDir = templateDir = "scala-akka-client";
6767
apiPackage = mainPackage + ".api";
6868
modelPackage = mainPackage + ".model";
6969
invokerPackage = mainPackage + ".core";

0 commit comments

Comments
 (0)