From 98c0200335ee2e9ab4b9b243a78d0de27e969a09 Mon Sep 17 00:00:00 2001 From: Ryoga Kitagawa Date: Thu, 2 Aug 2018 19:17:36 +0900 Subject: [PATCH] Skip definitions for well know types. --- genswagger/template.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/genswagger/template.go b/genswagger/template.go index e9be219..cb09aa5 100644 --- a/genswagger/template.go +++ b/genswagger/template.go @@ -177,18 +177,20 @@ func findNestedMessagesAndEnumerations(message *descriptor.Message, reg *descrip fieldType := t.GetTypeName() // If the type is an empty string then it is a proto primitive if fieldType != "" { - if _, ok := m[fieldType]; !ok { - msg, err := reg.LookupMsg("", fieldType) - if err != nil { - enum, err := reg.LookupEnum("", fieldType) + if _, ok := wktSchemas[fieldType]; !ok { + if _, ok := m[fieldType]; !ok { + msg, err := reg.LookupMsg("", fieldType) if err != nil { - panic(err) + enum, err := reg.LookupEnum("", fieldType) + if err != nil { + panic(err) + } + e[fieldType] = enum + continue } - e[fieldType] = enum - continue + m[fieldType] = msg + findNestedMessagesAndEnumerations(msg, reg, m, e) } - m[fieldType] = msg - findNestedMessagesAndEnumerations(msg, reg, m, e) } } }