diff --git a/bin/lagomScalaApi-petstore.sh b/bin/scala-lagom-petstore.sh old mode 100644 new mode 100755 similarity index 76% rename from bin/lagomScalaApi-petstore.sh rename to bin/scala-lagom-petstore.sh index 0094856885b..d2e89f26e8c --- a/bin/lagomScalaApi-petstore.sh +++ b/bin/scala-lagom-petstore.sh @@ -26,6 +26,6 @@ fi # 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" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/lagomScalaApi -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagomApi -o samples/server/petstore/lagomScalaApi" +ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala-lagom -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagom -o samples/server/petstore/scala-lagom" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/lagomScalaApi-petstore.bat b/bin/windows/scala-lagom-petstore.sh similarity index 78% rename from bin/windows/lagomScalaApi-petstore.bat rename to bin/windows/scala-lagom-petstore.sh index 7bf73c9746b..367f53eb824 100644 --- a/bin/windows/lagomScalaApi-petstore.bat +++ b/bin/windows/scala-lagom-petstore.sh @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagomApi -o samples\server\petstore\scala-lagomApi +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagom -o samples\server\petstore\scala-lagom java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java index c0feb924155..f9b509e95e2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java @@ -10,15 +10,15 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod private String authScheme = ""; private boolean authPreemptive=false; protected String groupId = "io.swagger"; - protected String artifactId = "scala-lagomApi"; + protected String artifactId = "scala-lagom"; protected String artifactVersion = "1.0.0"; public ScalaLagomServerCodegen() { super(); - outputFolder = "generated-code/scala-lagomApi"; + outputFolder = "generated-code/scala-lagom"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - embeddedTemplateDir = templateDir = "lagomScalaApi"; + embeddedTemplateDir = templateDir = "scala-lagom"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; @@ -166,12 +166,12 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod @Override public String getName() { - return "scala-lagomApi"; + return "scala-lagom"; } @Override public String getHelp() { - return "Generates a Lagom API in scala"; + return "Generates a Lagom API (Beta) in scala"; } @Override diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/README.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/README.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/README.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/README.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/api.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/api.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/api.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/api.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/build.properties.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/build.properties.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/build.properties.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/build.properties.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/build.sbt.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/build.sbt.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/build.sbt.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/gitignore.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/gitignore.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/gitignore.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/gitignore.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/licenseInfo.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/licenseInfo.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/licenseInfo.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/model.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/model.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/model.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/model.mustache diff --git a/modules/swagger-codegen/src/main/resources/lagomScalaApi/plugins.sbt.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom/plugins.sbt.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lagomScalaApi/plugins.sbt.mustache rename to modules/swagger-codegen/src/main/resources/scala-lagom/plugins.sbt.mustache diff --git a/pom.xml.circleci b/pom.xml.circleci index 9de37dea1a7..62925071146 100644 --- a/pom.xml.circleci +++ b/pom.xml.circleci @@ -866,6 +866,7 @@ samples/server/petstore/jaxrs-cxf-non-spring-app samples/server/petstore/java-msf4j samples/server/petstore/jaxrs-spec-interface + samples/server/petstore/scala-lagom diff --git a/samples/server/petstore/lagomScalaApi/.gitignore b/samples/server/petstore/scala-lagom/.gitignore similarity index 100% rename from samples/server/petstore/lagomScalaApi/.gitignore rename to samples/server/petstore/scala-lagom/.gitignore diff --git a/samples/server/petstore/lagomScalaApi/.swagger-codegen-ignore b/samples/server/petstore/scala-lagom/.swagger-codegen-ignore similarity index 100% rename from samples/server/petstore/lagomScalaApi/.swagger-codegen-ignore rename to samples/server/petstore/scala-lagom/.swagger-codegen-ignore diff --git a/samples/server/petstore/lagomScalaApi/.swagger-codegen/VERSION b/samples/server/petstore/scala-lagom/.swagger-codegen/VERSION similarity index 100% rename from samples/server/petstore/lagomScalaApi/.swagger-codegen/VERSION rename to samples/server/petstore/scala-lagom/.swagger-codegen/VERSION diff --git a/samples/server/petstore/lagomScalaApi/README.md b/samples/server/petstore/scala-lagom/README.md similarity index 100% rename from samples/server/petstore/lagomScalaApi/README.md rename to samples/server/petstore/scala-lagom/README.md diff --git a/samples/server/petstore/lagomScalaApi/build.sbt b/samples/server/petstore/scala-lagom/build.sbt similarity index 87% rename from samples/server/petstore/lagomScalaApi/build.sbt rename to samples/server/petstore/scala-lagom/build.sbt index 728fb23096d..16019172ef7 100644 --- a/samples/server/petstore/lagomScalaApi/build.sbt +++ b/samples/server/petstore/scala-lagom/build.sbt @@ -1,6 +1,6 @@ version := "1.0.0" -name := "scala-lagomApi" +name := "scala-lagom" organization := "io.swagger" diff --git a/samples/server/petstore/scala-lagom/pom.xml b/samples/server/petstore/scala-lagom/pom.xml new file mode 100644 index 00000000000..3ea25563d18 --- /dev/null +++ b/samples/server/petstore/scala-lagom/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + io.swagger + scala-lagom + pom + 1.0-SNAPSHOT + Scala Lagom server + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + sbt-test + integration-test + + exec + + + ./sbt_test_jdk8_only.sh + + + + + + + diff --git a/samples/server/petstore/lagomScalaApi/project/build.properties b/samples/server/petstore/scala-lagom/project/build.properties similarity index 100% rename from samples/server/petstore/lagomScalaApi/project/build.properties rename to samples/server/petstore/scala-lagom/project/build.properties diff --git a/samples/server/petstore/lagomScalaApi/project/plugins.sbt b/samples/server/petstore/scala-lagom/project/plugins.sbt similarity index 100% rename from samples/server/petstore/lagomScalaApi/project/plugins.sbt rename to samples/server/petstore/scala-lagom/project/plugins.sbt diff --git a/samples/server/petstore/scala-lagom/sbt_test_jdk8_only.sh b/samples/server/petstore/scala-lagom/sbt_test_jdk8_only.sh new file mode 100755 index 00000000000..31ad9761486 --- /dev/null +++ b/samples/server/petstore/scala-lagom/sbt_test_jdk8_only.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +java -version 2>&1 | grep "java version \"1.8" + +if [ $? -eq 0 ] +then + echo "Running JDK8" + sbt test +else + echo "Not running JDK8" +fi diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/PetApi.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/api/PetApi.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/PetApi.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/StoreApi.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/api/StoreApi.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/StoreApi.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/UserApi.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/api/UserApi.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/UserApi.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/ApiResponse.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/ApiResponse.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/ApiResponse.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Category.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Category.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Category.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Category.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Order.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Order.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Order.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Order.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Pet.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Pet.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Pet.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Pet.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Tag.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Tag.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/Tag.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Tag.scala diff --git a/samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/User.scala b/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/User.scala similarity index 100% rename from samples/server/petstore/lagomScalaApi/src/main/scala/io/swagger/client/model/User.scala rename to samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/User.scala diff --git a/samples/server/petstore/scalatra/pom.xml b/samples/server/petstore/scalatra/pom.xml index 72d6629895c..e00877441a3 100644 --- a/samples/server/petstore/scalatra/pom.xml +++ b/samples/server/petstore/scalatra/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.wordnik + io.swagger scalatra-server pom 1.0-SNAPSHOT