Skip to content

Commit 4b1ea6a

Browse files
frantumafrantuma
authored
Merge pull request #9757 from swagger-api/default-interfaces
refs swagger-api/swagger-codegen-generators#490 - update samples
2 parents 0a96924 + 4d4ce0e commit 4b1ea6a

File tree

281 files changed

+8043
-1191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+8043
-1191
lines changed

‎bin/spring-all-pestore.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
#!/bin/sh
22

33
./bin/spring-cloud-feign-petstore.sh
4+
./bin/spring-cloud-feign-petstore-v2.sh
45
./bin/spring-delegate.sh
56
./bin/spring-delegate-j8.sh
6-
./bin/spring-stubs.sh
77
./bin/spring-mvc-petstore-j8-async-server.sh
88
./bin/springboot-petstore-server.sh
99
./bin/spring-mvc-petstore-server.sh
10+
./bin/spring-stubs.sh
11+
./bin/springboot-petstore-server.sh
12+
./bin/springboot-petstore-server-v2.sh
13+
./bin/springboot-petstore-server-v2-no-default.sh
1014
./bin/springboot-petstore-server-beanvalidation.sh
1115
./bin/springboot-petstore-server-implicitHeaders.sh
1216
./bin/springboot-petstore-server-useOptional.sh

‎bin/spring-cloud-feign-petstore-v2.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"library": "spring-cloud",
3+
"artifactId": "swagger-petstore-spring-cloud",
4+
"springBootVersion" : "2.1.7.RELEASE"
5+
}

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore-v2.json -o samples/client/petstore/spring-cloud-v2 -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
30+
31+
echo "Removing files and folders under samples/client/petstore/spring-cloud-v2/src/main"
32+
rm -rf samples/client/petstore/spring-cloud-v2/src/main
33+
find samples/client/petstore/spring-cloud-v2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34+
java $JAVA_OPTS -jar $executable $ags

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ fi
2626

2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29-
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore.json -o samples/client/petstore/spring-cloud -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -c bin/spring-cloud-feign-petstore.json -o samples/client/petstore/spring-cloud -DhideGenerationTimestamp=true,responseWrapper=HystrixCommand"
3030

3131
echo "Removing files and folders under samples/client/petstore/spring-cloud/src/main"
3232
rm -rf samples/client/petstore/spring-cloud/src/main
3333
find samples/client/petstore/spring-cloud -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34-
# java $JAVA_OPTS -jar $executable $ags
34+
java $JAVA_OPTS -jar $executable $ags

‎bin/spring-delegate-j8.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ fi
2626

2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29-
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"
29+
ags="$@ generate -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"
3030

3131
echo "Removing files and folders under samples/server/petstore/springboot-delegate-j8/src/main"
3232
rm -rf samples/server/petstore/springboot-delegate-j8/src/main
3333
find samples/server/petstore/springboot-delegate-j8/ -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34-
# java $JAVA_OPTS -jar $executable $ags
34+
java $JAVA_OPTS -jar $executable $ags

‎bin/spring-delegate.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ fi
2626

2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29-
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"
29+
ags="$@ generate -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"
3030

3131
echo "Removing files and folders under samples/server/petstore/springboot-delegate/src/main"
3232
rm -rf samples/server/petstore/springboot-delegate/src/main
3333
find samples/server/petstore/springboot-delegate/ -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34-
# java $JAVA_OPTS -jar $executable $ags
34+
java $JAVA_OPTS -jar $executable $ags

‎bin/spring-mvc-petstore-server.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@ fi
2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
2929
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc -DhideGenerationTimestamp=true"
30+
echo "Removing files and folders under samples/server/petstore/spring-mvc/src/main"
31+
rm -rf samples/server/petstore/spring-mvc/src/main
32+
find samples/server/petstore/spring-mvc -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
3033

3134
java $JAVA_OPTS -jar $executable $ags

‎bin/spring-stubs.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ fi
2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
2929
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"
30-
31-
# java $JAVA_OPTS -jar $executable $ags
30+
java $JAVA_OPTS -jar $executable $ags

‎bin/springboot-petstore-server-v2-no-default.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -o samples/server/petstore/springboot-v2-nodefault -DhideGenerationTimestamp=true --additional-properties springBootVersion=2.1.7.RELEASE,java8=true,defaultInterfaces=false"
30+
31+
echo "Removing files and folders under samples/server/petstore/springboot-v2-nodefault/src/main"
32+
rm -rf samples/server/petstore/springboot-v2-nodefault/src/main
33+
find samples/server/petstore/springboot-v2-nodefault -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34+
java $JAVA_OPTS -jar $executable $ags

‎bin/springboot-petstore-server-v2.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring -o samples/server/petstore/springboot-v2 -DhideGenerationTimestamp=true --additional-properties java8=true,springBootVersion=2.1.7.RELEASE"
30+
31+
echo "Removing files and folders under samples/server/petstore/springboot-v2/src/main"
32+
rm -rf samples/server/petstore/springboot-v2/src/main
33+
find samples/server/petstore/springboot-v2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34+
java $JAVA_OPTS -jar $executable $ags

0 commit comments

Comments
 (0)