From eb7d3dfe15aa433cf111b7b91fba96123ba8854a Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Wed, 13 Apr 2016 15:40:11 -0700 Subject: [PATCH 1/2] issue#2582: change go api file name to snake case --- .../codegen/languages/GoClientCodegen.java | 20 +++++++++++++------ .../client/petstore/go/swagger/ModelReturn.go | 8 -------- samples/client/petstore/go/swagger/Name.go | 9 --------- .../go/swagger/{PetApi.go => pet_api.go} | 0 .../go/swagger/{StoreApi.go => store_api.go} | 0 .../go/swagger/{UserApi.go => user_api.go} | 0 6 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 samples/client/petstore/go/swagger/ModelReturn.go delete mode 100644 samples/client/petstore/go/swagger/Name.go rename samples/client/petstore/go/swagger/{PetApi.go => pet_api.go} (100%) rename samples/client/petstore/go/swagger/{StoreApi.go => store_api.go} (100%) rename samples/client/petstore/go/swagger/{UserApi.go => 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 b77239a5b4db..81b1294039d6 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 @@ -196,6 +196,13 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toModelName(String name) { + // camelize the model name + // phone_number => PhoneNumber + return camelize(toModelFilename(name)); + } + + @Override + public String toModelFilename(String name) { if (!StringUtils.isEmpty(modelNamePrefix)) { name = modelNamePrefix + "_" + name; } @@ -212,15 +219,16 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { name = "model_" + name; // e.g. return => ModelReturn (after camelize) } - // camelize the model name - // phone_number => PhoneNumber - return camelize(name); + return name; } @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); + public String toApiFilename(String name) { + // replace - with _ e.g. created-at => created_at + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. + + // e.g. PetApi.go => pet_api.go + return underscore(name) + "_api"; } @Override diff --git a/samples/client/petstore/go/swagger/ModelReturn.go b/samples/client/petstore/go/swagger/ModelReturn.go deleted file mode 100644 index 8195d536e302..000000000000 --- a/samples/client/petstore/go/swagger/ModelReturn.go +++ /dev/null @@ -1,8 +0,0 @@ -package swagger - -import ( -) - -type ModelReturn struct { - Return_ int32 `json:"return,omitempty"` -} diff --git a/samples/client/petstore/go/swagger/Name.go b/samples/client/petstore/go/swagger/Name.go deleted file mode 100644 index bf106c0681ad..000000000000 --- a/samples/client/petstore/go/swagger/Name.go +++ /dev/null @@ -1,9 +0,0 @@ -package swagger - -import ( -) - -type Name struct { - Name int32 `json:"name,omitempty"` - SnakeCase int32 `json:"snake_case,omitempty"` -} diff --git a/samples/client/petstore/go/swagger/PetApi.go b/samples/client/petstore/go/swagger/pet_api.go similarity index 100% rename from samples/client/petstore/go/swagger/PetApi.go rename to samples/client/petstore/go/swagger/pet_api.go diff --git a/samples/client/petstore/go/swagger/StoreApi.go b/samples/client/petstore/go/swagger/store_api.go similarity index 100% rename from samples/client/petstore/go/swagger/StoreApi.go rename to samples/client/petstore/go/swagger/store_api.go diff --git a/samples/client/petstore/go/swagger/UserApi.go b/samples/client/petstore/go/swagger/user_api.go similarity index 100% rename from samples/client/petstore/go/swagger/UserApi.go rename to samples/client/petstore/go/swagger/user_api.go From ad1bb22661b4f88417c9cb7361085116780c9719 Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Wed, 13 Apr 2016 22:26:03 -0700 Subject: [PATCH 2/2] fixed model file name to be snake case --- .../main/java/io/swagger/codegen/languages/GoClientCodegen.java | 2 +- .../petstore/go/swagger/{ApiResponse.go => api_response.go} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename samples/client/petstore/go/swagger/{ApiResponse.go => api_response.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 81b1294039d6..b9355bd04594 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 @@ -219,7 +219,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { name = "model_" + name; // e.g. return => ModelReturn (after camelize) } - return name; + return underscore(name); } @Override diff --git a/samples/client/petstore/go/swagger/ApiResponse.go b/samples/client/petstore/go/swagger/api_response.go similarity index 100% rename from samples/client/petstore/go/swagger/ApiResponse.go rename to samples/client/petstore/go/swagger/api_response.go