Merge pull request #2558 from wing328/master

[Go] update type mapping, fix indention in go model

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");

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}}

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"
         }

samples/client/petstore/go/swagger/ModelReturn.go

@@ -5,5 +5,4 @@ import (
 
 type ModelReturn struct {
     Return_  int32  `json:"return,omitempty"`
-    
 }

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"`
 }