required description

This commit is contained in:
astaxie 2014-06-23 22:21:13 +08:00
parent b13c2068a9
commit 6181668e0a
1 changed files with 11 additions and 3 deletions

View File

@ -535,14 +535,22 @@ func getModel(str string) (pkgpath, objectname string, m swagger.Model, realType
// if the tag contains json tag, set the name to the left most json tag // if the tag contains json tag, set the name to the left most json tag
var name = field.Names[0].Name var name = field.Names[0].Name
if field.Tag != nil { if field.Tag != nil {
mp.Description = strings.Trim(field.Tag.Value, "`") stag := reflect.StructTag(strings.Trim(field.Tag.Value, "`"))
stag := reflect.StructTag(mp.Description)
if tag := stag.Get("json"); tag != "" { if tag := stag.Get("json"); tag != "" {
name = tag name = tag
} }
if beedoc := stag.Get("beedoc"); beedoc == "required" { if thrifttag := stag.Get("thrift"); thrifttag != "" {
ts := strings.Split(thrifttag, ",")
if ts[0] != "" {
name = ts[0]
}
}
if required := stag.Get("required"); required != "" {
m.Required = append(m.Required, name) m.Required = append(m.Required, name)
} }
if desc := stag.Get("description"); desc != "" {
mp.Description = desc
}
} }
m.Properties[name] = mp m.Properties[name] = mp
} }