From 8dc91dc0f7555b8c73574d790f6bd626fdb75384 Mon Sep 17 00:00:00 2001 From: mbohlool Date: Fri, 24 Feb 2017 10:50:16 -0800 Subject: [PATCH] Sort types before processing for openapi-gen --- cmd/libs/go2idl/openapi-gen/generators/openapi.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/libs/go2idl/openapi-gen/generators/openapi.go b/cmd/libs/go2idl/openapi-gen/generators/openapi.go index 47ab5481899..095427f52a3 100644 --- a/cmd/libs/go2idl/openapi-gen/generators/openapi.go +++ b/cmd/libs/go2idl/openapi-gen/generators/openapi.go @@ -69,17 +69,26 @@ func hasOptionalTag(m *types.Member) bool { return hasOptionalCommentTag || hasOptionalJsonTag } +type identityNamer struct{} + +func (_ identityNamer) Name(t *types.Type) string { + return t.Name.String() +} + +var _ namer.Namer = identityNamer{} + // NameSystems returns the name system used by the generators in this package. func NameSystems() namer.NameSystems { return namer.NameSystems{ - "raw": namer.NewRawNamer("", nil), + "raw": namer.NewRawNamer("", nil), + "sorting_namer": identityNamer{}, } } // DefaultNameSystem returns the default name system for ordering the types to be // processed by the generators in this package. func DefaultNameSystem() string { - return "raw" + return "sorting_namer" } func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages {