From d8963d0a85b0a2ba43b981311723b10e21da88e5 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Apr 2016 23:44:06 +0800 Subject: [PATCH] udpate type mapping for go, fix indention in go model --- .../swagger/codegen/languages/GoClientCodegen.java | 4 +++- .../src/main/resources/go/model.mustache | 3 ++- .../src/test/resources/2_0/petstore.json | 2 +- samples/client/petstore/go/swagger/ApiResponse.go | 4 ++-- samples/client/petstore/go/swagger/Category.go | 2 +- samples/client/petstore/go/swagger/ModelReturn.go | 1 - samples/client/petstore/go/swagger/Name.go | 2 +- samples/client/petstore/go/swagger/Order.go | 10 +++++----- samples/client/petstore/go/swagger/Pet.go | 10 +++++----- samples/client/petstore/go/swagger/Tag.go | 2 +- samples/client/petstore/go/swagger/User.go | 14 +++++++------- 11 files changed, 28 insertions(+), 26 deletions(-) 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 234bda9adb7..a497aafec98 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 @@ -79,11 +79,12 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.clear(); typeMapping.put("integer", "int32"); typeMapping.put("long", "int64"); + typeMapping.put("number", "float32"); typeMapping.put("float", "float32"); typeMapping.put("double", "float64"); typeMapping.put("boolean", "bool"); typeMapping.put("string", "string"); - typeMapping.put("Date", "time.Time"); + typeMapping.put("date", "time.Time"); typeMapping.put("DateTime", "time.Time"); typeMapping.put("password", "string"); typeMapping.put("File", "*os.File"); @@ -91,6 +92,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { // map binary to string as a workaround // the correct solution is to use []byte typeMapping.put("binary", "string"); + typeMapping.put("ByteArray", "string"); importMapping = new HashMap(); importMapping.put("time.Time", "time"); diff --git a/modules/swagger-codegen/src/main/resources/go/model.mustache b/modules/swagger-codegen/src/main/resources/go/model.mustache index 83ba416883d..9045bea1ed2 100644 --- a/modules/swagger-codegen/src/main/resources/go/model.mustache +++ b/modules/swagger-codegen/src/main/resources/go/model.mustache @@ -8,7 +8,8 @@ import ( {{#model}} type {{classname}} struct { - {{#vars}}{{name}} {{{datatype}}} `json:"{{baseName}},omitempty"` + {{#vars}} + {{name}} {{{datatype}}} `json:"{{baseName}},omitempty"` {{/vars}} } {{/model}} diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json index 64b56377393..7f707ce315e 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json +++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json @@ -1427,7 +1427,7 @@ "type": "string", "format": "date-time" }, - "dateTime" : { + "password" : { "type": "string", "format": "password" } diff --git a/samples/client/petstore/go/swagger/ApiResponse.go b/samples/client/petstore/go/swagger/ApiResponse.go index c9d3ac40834..196af29c15d 100644 --- a/samples/client/petstore/go/swagger/ApiResponse.go +++ b/samples/client/petstore/go/swagger/ApiResponse.go @@ -5,6 +5,6 @@ import ( type ApiResponse struct { Code int32 `json:"code,omitempty"` -Type_ string `json:"type,omitempty"` -Message string `json:"message,omitempty"` + Type_ string `json:"type,omitempty"` + Message string `json:"message,omitempty"` } diff --git a/samples/client/petstore/go/swagger/Category.go b/samples/client/petstore/go/swagger/Category.go index c150c0d2599..1739a41f1eb 100644 --- a/samples/client/petstore/go/swagger/Category.go +++ b/samples/client/petstore/go/swagger/Category.go @@ -5,5 +5,5 @@ import ( type Category struct { Id int64 `json:"id,omitempty"` -Name string `json:"name,omitempty"` + Name string `json:"name,omitempty"` } diff --git a/samples/client/petstore/go/swagger/ModelReturn.go b/samples/client/petstore/go/swagger/ModelReturn.go index daac97e1763..8195d536e30 100644 --- a/samples/client/petstore/go/swagger/ModelReturn.go +++ b/samples/client/petstore/go/swagger/ModelReturn.go @@ -5,5 +5,4 @@ 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 index 5c0d7bc6d44..bf106c0681a 100644 --- a/samples/client/petstore/go/swagger/Name.go +++ b/samples/client/petstore/go/swagger/Name.go @@ -5,5 +5,5 @@ import ( type Name struct { Name int32 `json:"name,omitempty"` - + SnakeCase int32 `json:"snake_case,omitempty"` } diff --git a/samples/client/petstore/go/swagger/Order.go b/samples/client/petstore/go/swagger/Order.go index a5a4852d1dd..8b9ddfeb212 100644 --- a/samples/client/petstore/go/swagger/Order.go +++ b/samples/client/petstore/go/swagger/Order.go @@ -6,9 +6,9 @@ import ( type Order struct { Id int64 `json:"id,omitempty"` -PetId int64 `json:"petId,omitempty"` -Quantity int32 `json:"quantity,omitempty"` -ShipDate time.Time `json:"shipDate,omitempty"` -Status string `json:"status,omitempty"` -Complete bool `json:"complete,omitempty"` + PetId int64 `json:"petId,omitempty"` + Quantity int32 `json:"quantity,omitempty"` + ShipDate time.Time `json:"shipDate,omitempty"` + Status string `json:"status,omitempty"` + Complete bool `json:"complete,omitempty"` } diff --git a/samples/client/petstore/go/swagger/Pet.go b/samples/client/petstore/go/swagger/Pet.go index 5f1f3c06d51..d9faa1cb90f 100644 --- a/samples/client/petstore/go/swagger/Pet.go +++ b/samples/client/petstore/go/swagger/Pet.go @@ -5,9 +5,9 @@ import ( type Pet struct { Id int64 `json:"id,omitempty"` -Category Category `json:"category,omitempty"` -Name string `json:"name,omitempty"` -PhotoUrls []string `json:"photoUrls,omitempty"` -Tags []Tag `json:"tags,omitempty"` -Status string `json:"status,omitempty"` + Category Category `json:"category,omitempty"` + Name string `json:"name,omitempty"` + PhotoUrls []string `json:"photoUrls,omitempty"` + Tags []Tag `json:"tags,omitempty"` + Status string `json:"status,omitempty"` } diff --git a/samples/client/petstore/go/swagger/Tag.go b/samples/client/petstore/go/swagger/Tag.go index bb27c61b39c..77b55099c4a 100644 --- a/samples/client/petstore/go/swagger/Tag.go +++ b/samples/client/petstore/go/swagger/Tag.go @@ -5,5 +5,5 @@ import ( type Tag struct { Id int64 `json:"id,omitempty"` -Name string `json:"name,omitempty"` + Name string `json:"name,omitempty"` } diff --git a/samples/client/petstore/go/swagger/User.go b/samples/client/petstore/go/swagger/User.go index e34ad81ec8c..03f0821252b 100644 --- a/samples/client/petstore/go/swagger/User.go +++ b/samples/client/petstore/go/swagger/User.go @@ -5,11 +5,11 @@ import ( type User struct { Id int64 `json:"id,omitempty"` -Username string `json:"username,omitempty"` -FirstName string `json:"firstName,omitempty"` -LastName string `json:"lastName,omitempty"` -Email string `json:"email,omitempty"` -Password string `json:"password,omitempty"` -Phone string `json:"phone,omitempty"` -UserStatus int32 `json:"userStatus,omitempty"` + Username string `json:"username,omitempty"` + FirstName string `json:"firstName,omitempty"` + LastName string `json:"lastName,omitempty"` + Email string `json:"email,omitempty"` + Password string `json:"password,omitempty"` + Phone string `json:"phone,omitempty"` + UserStatus int32 `json:"userStatus,omitempty"` }