Merge pull request #358 from sergeylanzman/patch-2

Swagger: add support time.Time and int16
This commit is contained in:
astaxie 2017-03-05 21:44:18 +08:00 committed by GitHub
commit 38f8d6fc56
1 changed files with 32 additions and 22 deletions

View File

@ -54,25 +54,31 @@ var astPkgs map[string]*ast.Package
// refer to builtin.go // refer to builtin.go
var basicTypes = map[string]string{ var basicTypes = map[string]string{
"bool": "boolean:", "bool": "boolean:",
"uint": "integer:int32", "uint": "integer:int32",
"uint8": "integer:int32", "uint8": "integer:int32",
"uint16": "integer:int32", "uint16": "integer:int32",
"uint32": "integer:int32", "uint32": "integer:int32",
"uint64": "integer:int64", "uint64": "integer:int64",
"int": "integer:int64", "int": "integer:int64",
"int8": "integer:int32", "int8": "integer:int32",
"int16:int32": "integer:int32", "int16": "integer:int32",
"int32": "integer:int32", "int32": "integer:int32",
"int64": "integer:int64", "int64": "integer:int64",
"uintptr": "integer:int64", "uintptr": "integer:int64",
"float32": "number:float", "float32": "number:float",
"float64": "number:double", "float64": "number:double",
"string": "string:", "string": "string:",
"complex64": "number:float", "complex64": "number:float",
"complex128": "number:double", "complex128": "number:double",
"byte": "string:byte", "byte": "string:byte",
"rune": "string:byte", "rune": "string:byte",
// builtin golang objects
"time.Time": "string:string",
}
var stdlibObject = map[string]string{
"&{time Time}": "time.Time",
} }
func init() { func init() {
@ -876,10 +882,14 @@ func typeAnalyser(f *ast.Field) (isSlice bool, realType, swaggerType string) {
} }
return false, val, "object" return false, val, "object"
} }
if k, ok := basicTypes[fmt.Sprint(f.Type)]; ok { basicType := fmt.Sprint(f.Type)
return false, fmt.Sprint(f.Type), k if object, isStdLibObject := stdlibObject[basicType]; isStdLibObject {
basicType = object
} }
return false, fmt.Sprint(f.Type), "object" if k, ok := basicTypes[basicType]; ok {
return false, basicType, k
}
return false, basicType, "object"
} }
func isBasicType(Type string) bool { func isBasicType(Type string) bool {