Merge branch '3.0.0' into 3.0.0

Author: SlavchoArsovski

bin/csharp-dotnet2-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 -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l csharp-dotnet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l csharp-dotnet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore-netcore-project.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
 ags="generate $@ -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientNetCoreProject --additional-properties packageGuid={67035b31-f8e5-41a4-9673-954035084f7d},netCoreProjectFile=true -c ./bin/csharp-petstore-net-standard.json"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/dart-petstore.sh

@@ -27,11 +27,11 @@ fi
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
 
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/dart -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dart -o samples/client/petstore/dart/swagger -DhideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l dart -o samples/client/petstore/dart/swagger -DhideGenerationTimestamp=true --flatten-inline-schema"
 
 # then options to generate the library for vm would be:
 #ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dart -o samples/client/petstore/dart/swagger_vm -DbrowserClient=false -DpubName=swagger_vm"
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags
 
 # There is a proposal to allow importing different libraries depending on the environment:
 # https://github.com/munificent/dep-interface-libraries

bin/spring-cloud-feign-petstore-v2.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/client/petstore/spring-cloud-v2"
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore-v2.json -o samples/client/petstore/spring-cloud-v2 -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore-v2.json -o $output -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
 
 echo "Removing files and folders under samples/client/petstore/spring-cloud-v2/src/main"
 rm -rf samples/client/petstore/spring-cloud-v2/src/main
 rm -rf samples/client/petstore/spring-cloud-v2/src/gen
 find samples/client/petstore/spring-cloud-v2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package

bin/spring-cloud-feign-petstore.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/client/petstore/spring-cloud"
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore.json -o samples/client/petstore/spring-cloud -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore.json -o $output -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
 
 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/client/petstore/spring-cloud/src/gen
 find samples/client/petstore/spring-cloud -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package

bin/spring-delegate-j8.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/server/petstore/springboot-delegate-j8"
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_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 -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o $output -DdelegatePattern=true,hideGenerationTimestamp=true,java8=true"
 
 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/gen
 find samples/server/petstore/springboot-delegate-j8/ -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package

bin/spring-delegate.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/server/petstore/springboot-delegate "
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate -DdelegatePattern=true,hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o $output-DdelegatePattern=true,hideGenerationTimestamp=true"
 
 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/gen
 find samples/server/petstore/springboot-delegate/ -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package

bin/spring-mvc-petstore-j8-async-server.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/server/petstore/spring-mvc-j8-async"
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json -DhideGenerationTimestamp=true,java8=true,async=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -o $output -c bin/spring-mvc-petstore-j8-async.json -DhideGenerationTimestamp=true,java8=true,async=true"
 echo "Removing files and folders under samples/server/petstore/spring-mvc-j8-async/src/main"
 rm -rf samples/server/petstore/spring-mvc-j8-async/src/main
 rm -rf samples/server/petstore/spring-mvc-j8-async/src/gen
 find samples/server/petstore/spring-mvc-j8-async -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package

bin/spring-mvc-petstore-server.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/server/petstore/spring-mvc"
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc -DhideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l spring -c bin/spring-mvc-petstore-server.json -o $output -DhideGenerationTimestamp=true"
 echo "Removing files and folders under samples/server/petstore/spring-mvc/src/main"
 rm -rf samples/server/petstore/spring-mvc/src/main
 rm -rf samples/server/petstore/spring-mvc/src/gen
 find samples/server/petstore/spring-mvc -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package

bin/spring-stubs.sh

@@ -24,12 +24,16 @@ then
   mvn clean package
 fi
 
+output="samples/client/petstore/spring-stubs"
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_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/3_0_0/petstore.yaml -l spring -o $output -DinterfaceOnly=true,singleContentTypes=true,hideGenerationTimestamp=true"
 echo "Removing files and folders under samples/client/petstore/spring-stubs/src/main"
 rm -rf samples/client/petstore/spring-stubs/src/main
 rm -rf samples/client/petstore/spring-stubs/src/gen
 find samples/client/petstore/spring-stubs -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 
 java $JAVA_OPTS -jar $executable $ags
+
+#cd $output
+#mvn package