From 0ece56209fe09266057f2ee556be0516cd163f9b Mon Sep 17 00:00:00 2001 From: Vincent Devos <46601673+karismann@users.noreply.github.com> Date: Tue, 30 Apr 2019 11:55:44 +0200 Subject: [PATCH] minor typo fix in samples : "pestore" -> petstore (#2763) * minor typo fix in samples : "pestore" -> petstore * add typescript-rxjs in samples auto-labeled bot * Changing file permissions --- .github/.test/samples.json | 26 ++++++++++++++++++- bin/java-petstore-resttemplate-withxml.sh | 2 +- ...-all-pestore.sh => spring-all-petstore.sh} | 0 bin/utils/ensure-up-to-date | 2 +- .../java-petstore-resttemplate-withxml.bat | 2 +- .../java/resttemplate-withXml/build.gradle | 2 +- .../java/resttemplate-withXml/pom.xml | 4 +-- .../java/resttemplate-withXml/settings.gradle | 2 +- 8 files changed, 32 insertions(+), 8 deletions(-) rename bin/{spring-all-pestore.sh => spring-all-petstore.sh} (100%) diff --git a/.github/.test/samples.json b/.github/.test/samples.json index 72e76eaa877..86f0d8d410e 100644 --- a/.github/.test/samples.json +++ b/.github/.test/samples.json @@ -927,7 +927,7 @@ ] }, { - "input": "spring-all-pestore.sh", + "input": "spring-all-petstore.sh", "matches": [ "Server: Spring" ] @@ -1261,6 +1261,30 @@ "matches": [ "Client: TypeScript" ] + }, + { + "input": "typescript-rxjs-petstore-interfaces.sh", + "matches": [ + "Client: TypeScript" + ] + }, + { + "input": "typescript-rxjs-petstore-target-es6.sh", + "matches": [ + "Client: TypeScript" + ] + }, + { + "input": "typescript-rxjs-petstore-with-npm-version.sh", + "matches": [ + "Client: TypeScript" + ] + }, + { + "input": "typescript-rxjs-petstore.sh", + "matches": [ + "Client: TypeScript" + ] } ], "text": [ diff --git a/bin/java-petstore-resttemplate-withxml.sh b/bin/java-petstore-resttemplate-withxml.sh index 978eb3e6e0f..fe44afde84d 100755 --- a/bin/java-petstore-resttemplate-withxml.sh +++ b/bin/java-petstore-resttemplate-withxml.sh @@ -27,7 +27,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml --artifact-id pestore-resttemplate-withxml -g java -c bin/java-petstore-resttemplate.json -o samples/client/petstore/java/resttemplate-withXml -DhideGenerationTimestamp=true,withXml=true $@" +ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml --artifact-id petstore-resttemplate-withxml -g java -c bin/java-petstore-resttemplate.json -o samples/client/petstore/java/resttemplate-withXml -DhideGenerationTimestamp=true,withXml=true $@" echo "Removing files and folders under samples/client/petstore/java/resttemplate/src/main" rm -rf samples/client/petstore/java/resttemplate-withXml/src/main diff --git a/bin/spring-all-pestore.sh b/bin/spring-all-petstore.sh similarity index 100% rename from bin/spring-all-pestore.sh rename to bin/spring-all-petstore.sh diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date index adedfa60843..261aa9407a2 100755 --- a/bin/utils/ensure-up-to-date +++ b/bin/utils/ensure-up-to-date @@ -18,7 +18,7 @@ declare -a scripts=( "./bin/java-jaxrs-petstore-server-all.sh" "./bin/java-msf4j-petstore-server.sh" "./bin/openapi3/jaxrs-jersey-petstore.sh" -"./bin/spring-all-pestore.sh" +"./bin/spring-all-petstore.sh" "./bin/javascript-petstore-all.sh" "./bin/kotlin-client-petstore.sh" "./bin/kotlin-client-string.sh" diff --git a/bin/windows/java-petstore-resttemplate-withxml.bat b/bin/windows/java-petstore-resttemplate-withxml.bat index a7a0e8c48db..c99182b1fff 100644 --- a/bin/windows/java-petstore-resttemplate-withxml.bat +++ b/bin/windows/java-petstore-resttemplate-withxml.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate --artifact-id pestore-resttemplate-withxml -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-resttemplate.json -o samples\client\petstore\java\resttemplate-withXml -DhideGenerationTimestamp=true,withXml=true +set ags=generate --artifact-id petstore-resttemplate-withxml -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-resttemplate.json -o samples\client\petstore\java\resttemplate-withXml -DhideGenerationTimestamp=true,withXml=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index aed1491ce70..d1b88779ab7 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -84,7 +84,7 @@ if(hasProperty('target') && target == 'android') { install { repositories.mavenInstaller { - pom.artifactId = 'pestore-resttemplate-withxml' + pom.artifactId = 'petstore-resttemplate-withxml' } } diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index e4eef556ac2..0e748a6d9c4 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.openapitools - pestore-resttemplate-withxml + petstore-resttemplate-withxml jar - pestore-resttemplate-withxml + petstore-resttemplate-withxml 1.0.0 https://github.com/openapitools/openapi-generator OpenAPI Java diff --git a/samples/client/petstore/java/resttemplate-withXml/settings.gradle b/samples/client/petstore/java/resttemplate-withXml/settings.gradle index c653f9d22b5..fc3bc6a4674 100644 --- a/samples/client/petstore/java/resttemplate-withXml/settings.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/settings.gradle @@ -1 +1 @@ -rootProject.name = "pestore-resttemplate-withxml" \ No newline at end of file +rootProject.name = "petstore-resttemplate-withxml" \ No newline at end of file