From 81a39990f45759067534f9a746cf52c518026f0a Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Sat, 16 Apr 2016 17:00:46 -0700 Subject: [PATCH 1/2] Removed "packageName" folder for easy installation --- .../io/swagger/codegen/languages/GoClientCodegen.java | 8 ++++---- samples/client/petstore/go/{swagger => }/api_client.go | 0 samples/client/petstore/go/{swagger => }/api_response.go | 0 samples/client/petstore/go/{swagger => }/category.go | 0 samples/client/petstore/go/{swagger => }/configuration.go | 0 samples/client/petstore/go/{swagger => }/order.go | 0 samples/client/petstore/go/{swagger => }/pet.go | 0 samples/client/petstore/go/{swagger => }/pet_api.go | 0 samples/client/petstore/go/{swagger => }/store_api.go | 0 samples/client/petstore/go/{swagger => }/tag.go | 0 samples/client/petstore/go/{swagger => }/user.go | 0 samples/client/petstore/go/{swagger => }/user_api.go | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename samples/client/petstore/go/{swagger => }/api_client.go (100%) rename samples/client/petstore/go/{swagger => }/api_response.go (100%) rename samples/client/petstore/go/{swagger => }/category.go (100%) rename samples/client/petstore/go/{swagger => }/configuration.go (100%) rename samples/client/petstore/go/{swagger => }/order.go (100%) rename samples/client/petstore/go/{swagger => }/pet.go (100%) rename samples/client/petstore/go/{swagger => }/pet_api.go (100%) rename samples/client/petstore/go/{swagger => }/store_api.go (100%) rename samples/client/petstore/go/{swagger => }/tag.go (100%) rename samples/client/petstore/go/{swagger => }/user.go (100%) rename samples/client/petstore/go/{swagger => }/user_api.go (100%) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java index 8b7c3d7252a..9525672f86e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java @@ -133,8 +133,8 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore")); - supportingFiles.add(new SupportingFile("configuration.mustache", packageName, "configuration.go")); - supportingFiles.add(new SupportingFile("api_client.mustache", packageName, "api_client.go")); + supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.go")); + supportingFiles.add(new SupportingFile("api_client.mustache", "", "api_client.go")); } @Override @@ -158,11 +158,11 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String apiFileFolder() { - return outputFolder + File.separator + packageName; + return outputFolder + File.separator; } public String modelFileFolder() { - return outputFolder + File.separator + packageName; + return outputFolder + File.separator; } @Override diff --git a/samples/client/petstore/go/swagger/api_client.go b/samples/client/petstore/go/api_client.go similarity index 100% rename from samples/client/petstore/go/swagger/api_client.go rename to samples/client/petstore/go/api_client.go diff --git a/samples/client/petstore/go/swagger/api_response.go b/samples/client/petstore/go/api_response.go similarity index 100% rename from samples/client/petstore/go/swagger/api_response.go rename to samples/client/petstore/go/api_response.go diff --git a/samples/client/petstore/go/swagger/category.go b/samples/client/petstore/go/category.go similarity index 100% rename from samples/client/petstore/go/swagger/category.go rename to samples/client/petstore/go/category.go diff --git a/samples/client/petstore/go/swagger/configuration.go b/samples/client/petstore/go/configuration.go similarity index 100% rename from samples/client/petstore/go/swagger/configuration.go rename to samples/client/petstore/go/configuration.go diff --git a/samples/client/petstore/go/swagger/order.go b/samples/client/petstore/go/order.go similarity index 100% rename from samples/client/petstore/go/swagger/order.go rename to samples/client/petstore/go/order.go diff --git a/samples/client/petstore/go/swagger/pet.go b/samples/client/petstore/go/pet.go similarity index 100% rename from samples/client/petstore/go/swagger/pet.go rename to samples/client/petstore/go/pet.go diff --git a/samples/client/petstore/go/swagger/pet_api.go b/samples/client/petstore/go/pet_api.go similarity index 100% rename from samples/client/petstore/go/swagger/pet_api.go rename to samples/client/petstore/go/pet_api.go diff --git a/samples/client/petstore/go/swagger/store_api.go b/samples/client/petstore/go/store_api.go similarity index 100% rename from samples/client/petstore/go/swagger/store_api.go rename to samples/client/petstore/go/store_api.go diff --git a/samples/client/petstore/go/swagger/tag.go b/samples/client/petstore/go/tag.go similarity index 100% rename from samples/client/petstore/go/swagger/tag.go rename to samples/client/petstore/go/tag.go diff --git a/samples/client/petstore/go/swagger/user.go b/samples/client/petstore/go/user.go similarity index 100% rename from samples/client/petstore/go/swagger/user.go rename to samples/client/petstore/go/user.go diff --git a/samples/client/petstore/go/swagger/user_api.go b/samples/client/petstore/go/user_api.go similarity index 100% rename from samples/client/petstore/go/swagger/user_api.go rename to samples/client/petstore/go/user_api.go From 85d30191dfae63699ab846445c3c9eb8844dbe24 Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Sat, 16 Apr 2016 22:22:23 -0700 Subject: [PATCH 2/2] fixed go build issue after removing swagger folder --- samples/client/petstore/go/api_client.go | 45 +++++++++++----------- samples/client/petstore/go/pet_api_test.go | 18 ++++----- samples/client/petstore/go/test.go | 7 ++-- 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/samples/client/petstore/go/api_client.go b/samples/client/petstore/go/api_client.go index 9806ccdf38d..2eb32bf446d 100644 --- a/samples/client/petstore/go/api_client.go +++ b/samples/client/petstore/go/api_client.go @@ -1,41 +1,40 @@ package swagger import ( - "strings" + "strings" ) type ApiClient struct { - } func (c *ApiClient) SelectHeaderContentType(contentTypes []string) string { - if (len(contentTypes) == 0){ - return "" - } - if contains(contentTypes,"application/json") { - return "application/json" - } + if len(contentTypes) == 0 { + return "" + } + if contains(contentTypes, "application/json") { + return "application/json" + } - return contentTypes[0] // use the first content type specified in 'consumes' + return contentTypes[0] // use the first content type specified in 'consumes' } func (c *ApiClient) SelectHeaderAccept(accepts []string) string { - if (len(accepts) == 0){ - return "" - } + if len(accepts) == 0 { + return "" + } - if contains(accepts,"application/json"){ - return "application/json" - } + if contains(accepts, "application/json") { + return "application/json" + } - return strings.Join(accepts,",") + return strings.Join(accepts, ",") } func contains(source []string, containvalue string) bool { - for _, a := range source { - if strings.ToLower(a) == strings.ToLower(containvalue) { - return true - } - } - return false -} \ No newline at end of file + for _, a := range source { + if strings.ToLower(a) == strings.ToLower(containvalue) { + return true + } + } + return false +} diff --git a/samples/client/petstore/go/pet_api_test.go b/samples/client/petstore/go/pet_api_test.go index e56468849cd..4255a81a119 100644 --- a/samples/client/petstore/go/pet_api_test.go +++ b/samples/client/petstore/go/pet_api_test.go @@ -1,15 +1,13 @@ -package main +package swagger import ( - "testing" - - sw "./swagger" "github.com/stretchr/testify/assert" + "testing" ) func TestAddPet(t *testing.T) { - s := sw.NewPetApi() - newPet := (sw.Pet{Id: 12830, Name: "gopher", + s := NewPetApi() + newPet := (Pet{Id: 12830, Name: "gopher", PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending"}) err := s.AddPet(newPet) @@ -23,22 +21,22 @@ func TestAddPet(t *testing.T) { func TestGetPetById(t *testing.T) { assert := assert.New(t) - s := sw.NewPetApi() + s := NewPetApi() resp, err := s.GetPetById(12830) if err != nil { t.Errorf("Error while getting pet by id") t.Log(err) } else { - assert.Equal(resp.Id, "12830", "Pet id should be equal") + assert.Equal(resp.Id, int64(12830), "Pet id should be equal") assert.Equal(resp.Name, "gopher", "Pet name should be gopher") assert.Equal(resp.Status, "pending", "Pet status should be pending") - t.Log(resp) + //t.Log(resp) } } func TestUpdatePetWithForm(t *testing.T) { - s := sw.NewPetApi() + s := NewPetApi() err := s.UpdatePetWithForm(12830, "golang", "available") if err != nil { diff --git a/samples/client/petstore/go/test.go b/samples/client/petstore/go/test.go index f742307196b..ab3dd175295 100644 --- a/samples/client/petstore/go/test.go +++ b/samples/client/petstore/go/test.go @@ -1,17 +1,16 @@ -package main +package swagger import ( - sw "./swagger" "encoding/json" "fmt" ) func main() { - s := sw.NewPetApi() + s := NewPetApi() // test POST(body) - newPet := (sw.Pet{Id: 12830, Name: "gopher", + newPet := (Pet{Id: 12830, Name: "gopher", PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending"}) jsonNewPet, _ := json.Marshal(newPet)