update spring samples

swagger-api · Nov 20, 2018 · 73d6ed9 · 73d6ed9
1 parent 2c42642
commit 73d6ed9
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 890 deletions.
diff --git a/bin/spring-cloud-feign-petstore.sh b/bin/spring-cloud-feign-petstore.sh
@@ -30,5 +30,6 @@ ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring/librar
 
 echo "Removing files and folders under samples/client/petstore/spring-cloud/src/main"
 rm -rf samples/client/petstore/spring-cloud/src/main
+rm -rf samples/server/petstore/spring-cloud/src/test/java/io
 find samples/client/petstore/spring-cloud -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-delegate-j8.sh b/bin/spring-delegate-j8.sh
@@ -26,9 +26,10 @@ 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/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate-j8 -DdelegatePattern=true,hideGenerationTimestamp=true,java8=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate-j8 -DdelegatePattern=true,hideGenerationTimestamp=true,java8=true -DapiTests=false"
 
 echo "Removing files and folders under samples/server/petstore/springboot-delegate-j8/src/main"
 rm -rf samples/server/petstore/springboot-delegate-j8/src/main
+rm -rf samples/server/petstore/springboot-delegate-j8/src/test/java/io
 find samples/server/petstore/springboot-delegate-j8/ -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-delegate.sh b/bin/spring-delegate.sh
@@ -26,9 +26,10 @@ 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/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate -DdelegatePattern=true,hideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate -DdelegatePattern=true,hideGenerationTimestamp=true -DapiTests=false"
 
 echo "Removing files and folders under samples/server/petstore/springboot-delegate/src/main"
 rm -rf samples/server/petstore/springboot-delegate/src/main
+rm -rf samples/server/petstore/springboot-delegate/src/test/java/io
 find samples/server/petstore/springboot-delegate/ -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-mvc-petstore-server.sh b/bin/spring-mvc-petstore-server.sh
@@ -29,6 +29,6 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc -DhideGenerationTimestamp=true"
 
 rm -rf samples/server/petstore/spring-mvc/src/main
-rm -rf samples/server/petstore/spring-mvc-j8-localdatetime/src/test/java/io
+rm -rf samples/server/petstore/spring-mvc/src/test/java/io
 find samples/server/petstore/spring-mvc -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-stubs.sh b/bin/spring-stubs.sh
@@ -26,6 +26,7 @@ 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.yaml -l spring -o samples/client/petstore/spring-stubs -DinterfaceOnly=true,singleContentTypes=true,hideGenerationTimestamp=true"
-
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -o samples/client/petstore/spring-stubs -DinterfaceOnly=true,singleContentTypes=true,hideGenerationTimestamp=true -DapiTests=false"
+rm -rf samples/client/petstore/spring-stubs/src/main
+rm -rf samples/client/petstore/spring-stubs/src/test/java/io
 java $JAVA_OPTS -jar $executable $ags
diff --git a/...t/petstore/spring-stubs/src/test/java/io/swagger/api/PetApiControllerIntegrationTest.java b/...t/petstore/spring-stubs/src/test/java/io/swagger/api/PetApiControllerIntegrationTest.java
diff --git a/...petstore/spring-stubs/src/test/java/io/swagger/api/StoreApiControllerIntegrationTest.java b/...petstore/spring-stubs/src/test/java/io/swagger/api/StoreApiControllerIntegrationTest.java
diff --git a/.../petstore/spring-stubs/src/test/java/io/swagger/api/UserApiControllerIntegrationTest.java b/.../petstore/spring-stubs/src/test/java/io/swagger/api/UserApiControllerIntegrationTest.java
diff --git a/...oot-delegate-j8/src/test/java/io/swagger/api/AnotherFakeApiControllerIntegrationTest.java b/...oot-delegate-j8/src/test/java/io/swagger/api/AnotherFakeApiControllerIntegrationTest.java
diff --git a/...springboot-delegate-j8/src/test/java/io/swagger/api/FakeApiControllerIntegrationTest.java b/...springboot-delegate-j8/src/test/java/io/swagger/api/FakeApiControllerIntegrationTest.java