Skip to content

Commit 4e0e4f9

Browse files
authored
Merge pull request #10016 from szank/go-generator-fix
Fix the go generation scripts and docker runner script
2 parents f1d2240 + 1efe289 commit 4e0e4f9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bin/go-petstore-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ 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

30-
ags="$@ generate -t modules/swagger-codegen/src/main/resources/go-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go-server -o samples/server/petstore/go-api-server -DpackageName=petstoreserver --additional-properties hideGenerationTimestamp=true -Dservice"
30+
ags="$@ generate -t modules/swagger-codegen/target/classes/go-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go-server -o samples/server/petstore/go-api-server -DpackageName=petstoreserver --additional-properties hideGenerationTimestamp=true -Dservice"
3131

3232
# java $JAVA_OPTS -jar $executable $ags

bin/go-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ 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/go -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l go -o samples/client/petstore/go/go-petstore -DpackageName=petstore "
29+
ags="$@ generate -t modules/swagger-codegen/target/classes/go -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l go -o samples/client/petstore/go/go-petstore -DpackageName=petstore "
3030

3131
# java $JAVA_OPTS -jar $executable $ags

docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ JAVA_OPTS=${JAVA_OPTS:-"-Xmx1024M -Dlogback.configurationFile=conf/logback.xml"}
88

99
cli="${GEN_DIR}/modules/swagger-codegen-cli"
1010
codegen="${cli}/target/swagger-codegen-cli.jar"
11-
cmdsrc="${cli}/src/main/java/io/swagger/codegen/cmd"
11+
cmdsrc="${cli}/src/main/java/io/swagger/codegen/v3/cli/cmd"
1212

1313
pattern="${1^} implements Runnable"
1414
if expr "x$1" : 'x[a-z][a-z-]*$' > /dev/null && fgrep -qe "$pattern" "$cmdsrc"/*.java || expr "$1" = 'help' > /dev/null; then

0 commit comments

Comments
 (0)