From 58db6a5e14a1fdddcc322d3216d560c7b755417f Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 26 Apr 2017 17:53:36 +0800 Subject: [PATCH 1/3] Revert "Issue#5376- changes to include swagger version in generated api files (#5449)" (#5489) This reverts commit 702f193f6191a8f6d0b59f2d34292c616e7bcc4d. --- .gitignore | 2 +- modules/swagger-codegen-cli/pom.xml | 12 ++++++++++++ .../main/java/io/swagger/codegen/cmd/ConfigHelp.java | 0 .../main/java/io/swagger/codegen/cmd/Generate.java | 0 .../src/main/java/io/swagger/codegen/cmd/Langs.java | 0 .../src/main/java/io/swagger/codegen/cmd/Meta.java | 0 .../main/java/io/swagger/codegen/cmd/Version.java | 0 .../src/main/resources/version.properties | 1 + modules/swagger-codegen/pom.xml | 11 ----------- .../java/io/swagger/codegen/DefaultGenerator.java | 6 +++--- .../src/main/resources/JavaSpring/api.mustache | 6 ------ .../src/main/resources/version.properties | 1 - .../src/main/java/io/swagger/api/FakeApi.java | 6 ------ .../src/main/java/io/swagger/api/PetApi.java | 6 ------ .../src/main/java/io/swagger/api/StoreApi.java | 6 ------ .../src/main/java/io/swagger/api/UserApi.java | 6 ------ 16 files changed, 17 insertions(+), 46 deletions(-) rename modules/{swagger-codegen => swagger-codegen-cli}/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java (100%) rename modules/{swagger-codegen => swagger-codegen-cli}/src/main/java/io/swagger/codegen/cmd/Generate.java (100%) rename modules/{swagger-codegen => swagger-codegen-cli}/src/main/java/io/swagger/codegen/cmd/Langs.java (100%) rename modules/{swagger-codegen => swagger-codegen-cli}/src/main/java/io/swagger/codegen/cmd/Meta.java (100%) rename modules/{swagger-codegen => swagger-codegen-cli}/src/main/java/io/swagger/codegen/cmd/Version.java (100%) create mode 100644 modules/swagger-codegen-cli/src/main/resources/version.properties delete mode 100644 modules/swagger-codegen/src/main/resources/version.properties diff --git a/.gitignore b/.gitignore index 40b435db240..370da9c3256 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ out/ *.iws classpath.txt version.properties -!modules/swagger-codegen/src/main/resources/version.properties +!modules/swagger-codegen-cli/src/main/resources/version.properties .project .classpath lib/* diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml index 2843f3ffc40..e175b2c4585 100644 --- a/modules/swagger-codegen-cli/pom.xml +++ b/modules/swagger-codegen-cli/pom.xml @@ -18,6 +18,7 @@ src/main/resources + true logback.xml @@ -78,6 +79,17 @@ swagger-codegen ${project.version} + + + io.airlift + airline + 0.7 + + + com.googlecode.lambdaj + lambdaj + 2.3.3 + org.slf4j slf4j-simple diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java similarity index 100% rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java similarity index 100% rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Generate.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Langs.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java similarity index 100% rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Langs.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java similarity index 100% rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Meta.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Version.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Version.java similarity index 100% rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Version.java rename to modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Version.java diff --git a/modules/swagger-codegen-cli/src/main/resources/version.properties b/modules/swagger-codegen-cli/src/main/resources/version.properties new file mode 100644 index 00000000000..410af8cc687 --- /dev/null +++ b/modules/swagger-codegen-cli/src/main/resources/version.properties @@ -0,0 +1 @@ +version = ${project.version} diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml index 7d4320cf086..05206eb2f9b 100644 --- a/modules/swagger-codegen/pom.xml +++ b/modules/swagger-codegen/pom.xml @@ -16,7 +16,6 @@ src/main/resources - true logback.xml @@ -250,16 +249,6 @@ commons-cli ${commons-cli-version} - - io.airlift - airline - 0.7 - - - com.googlecode.lambdaj - lambdaj - 2.3.3 - org.testng testng diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 209960cbcff..665b6dfd5dd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -2,7 +2,6 @@ package io.swagger.codegen; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import io.swagger.codegen.cmd.Version; import io.swagger.codegen.ignore.CodegenIgnoreProcessor; import io.swagger.models.*; import io.swagger.models.auth.OAuth2Definition; @@ -11,7 +10,6 @@ import io.swagger.models.parameters.Parameter; import io.swagger.util.Json; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,6 +17,8 @@ import org.slf4j.LoggerFactory; import java.io.*; import java.util.*; +import org.apache.commons.lang3.StringUtils; + public class DefaultGenerator extends AbstractGenerator implements Generator { protected final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class); protected CodegenConfig config; @@ -127,8 +127,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.processOpts(); config.preprocessSwagger(swagger); // TODO need to obtain version from a file instead of hardcoding it + config.additionalProperties().put("generatorVersion", "2.2.3-SNAPSHOT"); config.additionalProperties().put("generatedDate", DateTime.now().toString()); - config.additionalProperties().put("generatorVersion", Version.readVersionFromResources()); config.additionalProperties().put("generatorClass", config.getClass().getName()); config.additionalProperties().put("inputSpec", config.getInputSpec()); if (swagger.getVendorExtensions() != null) { diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache index 961ccbb5806..0e23cd4f59b 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache @@ -1,9 +1,3 @@ -/** - * NOTE: This class is auto generated by the swagger code generator program ({{{generatorVersion}}}). - * https://github.com/swagger-api/swagger-codegen - * Do not edit the class manually. - */ - package {{package}}; {{#imports}}import {{import}}; diff --git a/modules/swagger-codegen/src/main/resources/version.properties b/modules/swagger-codegen/src/main/resources/version.properties deleted file mode 100644 index 713c915800a..00000000000 --- a/modules/swagger-codegen/src/main/resources/version.properties +++ /dev/null @@ -1 +0,0 @@ -version = ${project.version} \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java index b785ec808b1..d8b307a1f23 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java @@ -1,9 +1,3 @@ -/** - * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT). - * https://github.com/swagger-api/swagger-codegen - * Do not edit the class manually. - */ - package io.swagger.api; import java.math.BigDecimal; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java index a21a1d70a45..5816fb5b92e 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java @@ -1,9 +1,3 @@ -/** - * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT). - * https://github.com/swagger-api/swagger-codegen - * Do not edit the class manually. - */ - package io.swagger.api; import io.swagger.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java index 7077532a3e5..fb8f3d706f5 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java @@ -1,9 +1,3 @@ -/** - * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT). - * https://github.com/swagger-api/swagger-codegen - * Do not edit the class manually. - */ - package io.swagger.api; import java.util.Map; diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java index a4535afce65..53899d1eddd 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java @@ -1,9 +1,3 @@ -/** - * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT). - * https://github.com/swagger-api/swagger-codegen - * Do not edit the class manually. - */ - package io.swagger.api; import java.util.List; From 89464cbe5fcf89a3c862a4f44c1ee754582f00ce Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 27 Apr 2017 00:49:03 +0800 Subject: [PATCH 2/3] Update pom.xml for CircleCI to test java-related projects only (#5477) Update pom.xml for CircleCI to test java-related projects only --- circle.yml | 6 +- .../JavaPlayFrameworkOptionsTest.java | 9 +- pom.xml | 14 +- pom.xml.circleci | 234 ++++++++++++++++-- samples/server/petstore/scalatra/pom.xml | 2 +- 5 files changed, 236 insertions(+), 29 deletions(-) diff --git a/circle.yml b/circle.yml index a202b2986ce..03731d82c6c 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,4 @@ -# Java client, server tests +# Java-related client, server tests machine: java: version: openjdk8 @@ -10,7 +10,9 @@ machine: dependencies: cache_directories: - - ~/.m2 + - "~/.m2" + - "~/.sbt" + pre: # to run petstore server locally via docker - docker pull swaggerapi/petstore diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java index fba16839e24..89e24a360f6 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java @@ -1,13 +1,14 @@ package io.swagger.codegen.javaPlayFramework; +import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.JavaPlayFrameworkCodegen; import io.swagger.codegen.options.JavaPlayFrameworkOptionsProvider; +import io.swagger.codegen.options.OptionsProvider; import mockit.Expectations; import mockit.Tested; -public class JavaPlayFrameworkOptionsTest extends JavaClientOptionsTest { +public class JavaPlayFrameworkOptionsTest extends AbstractOptionsTest { @Tested private JavaPlayFrameworkCodegen clientCodegen; @@ -16,6 +17,10 @@ public class JavaPlayFrameworkOptionsTest extends JavaClientOptionsTest { super(new JavaPlayFrameworkOptionsProvider()); } + protected JavaPlayFrameworkOptionsTest(OptionsProvider optionsProvider) { + super(optionsProvider); + } + @Override protected CodegenConfig getCodegenConfig() { return clientCodegen; diff --git a/pom.xml b/pom.xml index 7f1438b9fe8..31be9ea8de4 100644 --- a/pom.xml +++ b/pom.xml @@ -792,12 +792,7 @@ - samples/client/petstore/akka-scala - samples/client/petstore/ruby - samples/client/petstore/android/volley - samples/client/petstore/bash samples/client/petstore/clojure - samples/client/petstore/go samples/client/petstore/java/feign samples/client/petstore/java/jersey1 samples/client/petstore/java/jersey2 @@ -807,9 +802,15 @@ samples/client/petstore/java/retrofit2rx samples/client/petstore/jaxrs-cxf-client samples/client/petstore/java/resttemplate + samples/client/petstore/scala + diff --git a/pom.xml.circleci b/pom.xml.circleci index 56e51dd57ea..31be9ea8de4 100644 --- a/pom.xml.circleci +++ b/pom.xml.circleci @@ -1,5 +1,4 @@ - + org.sonatype.oss oss-parent @@ -10,7 +9,7 @@ swagger-codegen-project pom swagger-codegen-project - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT https://github.com/swagger-api/swagger-codegen scm:git:git@github.com:swagger-api/swagger-codegen.git @@ -68,6 +67,56 @@ target ${project.artifactId}-${project.version} + + net.revelc.code + formatter-maven-plugin + + + + 1.7 + 1.7 + 1.7 + LF + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + validate + validate + + google_checkstyle.xml + + ${project.build.sourceDirectory} + UTF-8 + true + true + false + + + check + + + + + + com.puppycrawl.tools + checkstyle + 6.19 + + + org.apache.maven.plugins maven-surefire-plugin @@ -106,7 +155,7 @@ maven-compiler-plugin - 3.5.1 + 3.6.1 1.7 1.7 @@ -174,6 +223,15 @@ + + + + net.revelc.code + formatter-maven-plugin + 0.5.2 + + + @@ -256,6 +314,18 @@ samples/client/petstore/android/volley + + bash-client + + + env + java + + + + samples/client/petstore/bash + + clojure-client @@ -292,6 +362,18 @@ samples/client/petstore/java/jersey2 + + java-client-jersey2-java6 + + + env + java + + + + samples/client/petstore/java/jersey2-java6 + + java-client-okhttp-gson @@ -304,6 +386,18 @@ samples/client/petstore/java/okhttp-gson + + java-client-okhttp-gson-parcelable + + + env + java + + + + samples/client/petstore/java/okhttp-gson/parcelableModel + + java-client-retrofit @@ -400,6 +494,30 @@ samples/client/petstore/swift/default/SwaggerClientTests + + java-msf4j-server + + + env + java + + + + samples/server/petstore/java-msf4/ + + + + jaxrs-cxf-server + + + env + java + + + + samples/server/petstore/jaxrs-cxf + + jaxrs-resteasy-server @@ -424,6 +542,30 @@ samples/server/petstore/jaxrs-resteasy/joda + + jaxrs-resteasy-eap-server + + + env + java + + + + samples/server/petstore/jaxrs-resteasy/eap + + + + jaxrs-resteasy-eap-server-joda + + + env + java + + + + samples/server/petstore/jaxrs-resteasy/eap-joda + + jaxrs-server @@ -568,6 +710,18 @@ samples/server/petstore/spring-mvc + + springboot-beanvalidation + + + env + java + + + + samples/server/petstore/springboot-beanvalidation + + springboot @@ -604,6 +758,30 @@ samples/server/petstore/scalatra + + java-inflector + + + env + java + + + + samples/server/petstore/java-inflector + + + + java-undertowr + + + env + java + + + + samples/server/petstore/undertow + + samples @@ -613,12 +791,8 @@ - - samples/client/petstore/android/volley - samples/client/petstore/java/feign samples/client/petstore/java/jersey1 samples/client/petstore/java/jersey2 @@ -626,26 +800,49 @@ samples/client/petstore/java/retrofit samples/client/petstore/java/retrofit2 samples/client/petstore/java/retrofit2rx - + samples/client/petstore/typescript-node/npm + samples/client/petstore/typescript-jquery/npm + --> + + + samples/server/petstore/java-inflector + samples/server/petstore/java-play-framework + samples/server/petstore/undertow samples/server/petstore/jaxrs/jersey1 samples/server/petstore/jaxrs/jersey2 samples/server/petstore/jaxrs-resteasy/default + samples/server/petstore/jaxrs-resteasy/eap + samples/server/petstore/jaxrs-resteasy/eap-joda samples/server/petstore/jaxrs-resteasy/joda + samples/server/petstore/scalatra samples/server/petstore/spring-mvc - samples/client/petstore/spring-cloud + samples/server/petstore/springboot - - - + samples/server/petstore/springboot-beanvalidation + samples/server/petstore/jaxrs-cxf + samples/server/petstore/jaxrs-cxf-annotated-base-path + samples/server/petstore/jaxrs-cxf-cdi + samples/server/petstore/jaxrs-cxf-non-spring-app + + @@ -717,13 +914,14 @@ - 1.0.22 + 1.0.28 2.11.1 - 2.3.4 - 1.5.9 + 3.3.0 + 1.5.12 2.4 1.2 4.8.1 + 2.8.5 1.0.0 3.4 1.7.12 diff --git a/samples/server/petstore/scalatra/pom.xml b/samples/server/petstore/scalatra/pom.xml index bc1a6f92cdf..72d6629895c 100644 --- a/samples/server/petstore/scalatra/pom.xml +++ b/samples/server/petstore/scalatra/pom.xml @@ -19,7 +19,7 @@ exec - /usr/local/bin/sbt + sbt test From 5eefbc2195ac309e033f5dce719ab11d5b2e1faa Mon Sep 17 00:00:00 2001 From: Benjamin Douglas Date: Wed, 26 Apr 2017 09:51:49 -0700 Subject: [PATCH 3/3] Remove unused generation script (#5491) The old android-petstore.sh script is writing output to the android volley directory. There is a new script called android-petstore-volley.sh that also writes to that same directory. They overwrite each other, which makes the run-all-petstore script output dependent on which one gets run last. This change removes the old script. --- bin/android-petstore.sh | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100755 bin/android-petstore.sh diff --git a/bin/android-petstore.sh b/bin/android-petstore.sh deleted file mode 100755 index 67256debeb0..00000000000 --- a/bin/android-petstore.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -SCRIPT="$0" - -while [ -h "$SCRIPT" ] ; do - ls=`ls -ld "$SCRIPT"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - SCRIPT="$link" - else - SCRIPT=`dirname "$SCRIPT"`/"$link" - fi -done - -if [ ! -d "${APP_DIR}" ]; then - APP_DIR=`dirname "$SCRIPT"`/.. - APP_DIR=`cd "${APP_DIR}"; pwd` -fi - -executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" - -if [ ! -f "$executable" ] -then - mvn clean package -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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android/volley" - -java $JAVA_OPTS -jar $executable $ags