From 40799937fb69e66b5579c72b4291a0d1b2bd180f Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 25 Nov 2019 15:58:51 +0800 Subject: [PATCH] add go.mod as supporting files to go-server (#4592) --- .../openapitools/codegen/languages/GoServerCodegen.java | 1 + .../src/main/resources/go-server/go.mod.mustache | 5 +++++ .../src/main/resources/go-server/main.mustache | 9 +-------- samples/server/petstore/go-api-server/go.mod | 5 +++++ samples/server/petstore/go-api-server/main.go | 9 +-------- 5 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/go-server/go.mod.mustache create mode 100644 samples/server/petstore/go-api-server/go.mod diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java index db2f36d1f32..211dcdadb99 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java @@ -165,6 +165,7 @@ public class GoServerCodegen extends AbstractGoCodegen { supportingFiles.add(new SupportingFile("openapi.mustache", "api", "openapi.yaml")); supportingFiles.add(new SupportingFile("main.mustache", "", "main.go")); supportingFiles.add(new SupportingFile("Dockerfile.mustache", "", "Dockerfile")); + supportingFiles.add(new SupportingFile("go.mod.mustache", "", "go.mod")); supportingFiles.add(new SupportingFile("routers.mustache", sourceFolder, "routers.go")); supportingFiles.add(new SupportingFile("logger.mustache", sourceFolder, "logger.go")); supportingFiles.add(new SupportingFile("api.mustache", sourceFolder, "api.go")); diff --git a/modules/openapi-generator/src/main/resources/go-server/go.mod.mustache b/modules/openapi-generator/src/main/resources/go-server/go.mod.mustache new file mode 100644 index 00000000000..18f7e897253 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/go-server/go.mod.mustache @@ -0,0 +1,5 @@ +module {{gitHost}}/{{gitUserId}}/{{gitRepoId}} + +go 1.13 + +require github.com/gorilla/mux v1.7.3 diff --git a/modules/openapi-generator/src/main/resources/go-server/main.mustache b/modules/openapi-generator/src/main/resources/go-server/main.mustache index 377e7122e1b..ab7516375a8 100644 --- a/modules/openapi-generator/src/main/resources/go-server/main.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/main.mustache @@ -5,14 +5,7 @@ import ( "log" "net/http" - // WARNING! - // Change this to a fully-qualified import path - // once you place this file into your project. - // For example, - // - // sw "github.com/myname/myrepo/{{sourceFolder}}" - // - {{packageName}} "./{{sourceFolder}}" + {{packageName}} "{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/{{sourceFolder}}" ) func main() { diff --git a/samples/server/petstore/go-api-server/go.mod b/samples/server/petstore/go-api-server/go.mod new file mode 100644 index 00000000000..5b6a67c74e2 --- /dev/null +++ b/samples/server/petstore/go-api-server/go.mod @@ -0,0 +1,5 @@ +module github.com/GIT_USER_ID/GIT_REPO_ID + +go 1.13 + +require github.com/gorilla/mux v1.7.3 diff --git a/samples/server/petstore/go-api-server/main.go b/samples/server/petstore/go-api-server/main.go index f8b3e76d13c..ddc5258297c 100644 --- a/samples/server/petstore/go-api-server/main.go +++ b/samples/server/petstore/go-api-server/main.go @@ -13,14 +13,7 @@ import ( "log" "net/http" - // WARNING! - // Change this to a fully-qualified import path - // once you place this file into your project. - // For example, - // - // sw "github.com/myname/myrepo/go" - // - petstoreserver "./go" + petstoreserver "github.com/GIT_USER_ID/GIT_REPO_ID/go" ) func main() {