From 0c29a9922fb2e88da000e87c361c78dd8353c610 Mon Sep 17 00:00:00 2001 From: Thomas KERAMBLOCH Date: Tue, 13 Feb 2018 15:57:07 +0100 Subject: [PATCH] add helper like httpPath for get path in additional bindings options --- helpers/helpers.go | 95 +++++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/helpers/helpers.go b/helpers/helpers.go index 2484e56..119365b 100644 --- a/helpers/helpers.go +++ b/helpers/helpers.go @@ -101,36 +101,37 @@ var ProtoHelpersFuncMap = template.FuncMap{ } return slice.Index(int(i)).Interface() }, - "snakeCase": xstrings.ToSnakeCase, - "getProtoFile": getProtoFile, - "getMessageType": getMessageType, - "getEnumValue": getEnumValue, - "isFieldMessage": isFieldMessage, - "isFieldMessageTimeStamp": isFieldMessageTimeStamp, - "isFieldRepeated": isFieldRepeated, - "haskellType": haskellType, - "goType": goType, - "goZeroValue": goZeroValue, - "goTypeWithPackage": goTypeWithPackage, - "jsType": jsType, - "jsSuffixReserved": jsSuffixReservedKeyword, - "namespacedFlowType": namespacedFlowType, - "httpVerb": httpVerb, - "httpPath": httpPath, - "httpBody": httpBody, - "shortType": shortType, - "urlHasVarsFromMessage": urlHasVarsFromMessage, - "lowerGoNormalize": lowerGoNormalize, - "goNormalize": goNormalize, - "leadingComment": leadingComment, - "trailingComment": trailingComment, - "leadingDetachedComments": leadingDetachedComments, - "stringFieldExtension": stringFieldExtension, - "boolFieldExtension": boolFieldExtension, - "isFieldMap": isFieldMap, - "fieldMapKeyType": fieldMapKeyType, - "fieldMapValueType": fieldMapValueType, - "replaceDict": replaceDict, + "snakeCase": xstrings.ToSnakeCase, + "getProtoFile": getProtoFile, + "getMessageType": getMessageType, + "getEnumValue": getEnumValue, + "isFieldMessage": isFieldMessage, + "isFieldMessageTimeStamp": isFieldMessageTimeStamp, + "isFieldRepeated": isFieldRepeated, + "haskellType": haskellType, + "goType": goType, + "goZeroValue": goZeroValue, + "goTypeWithPackage": goTypeWithPackage, + "jsType": jsType, + "jsSuffixReserved": jsSuffixReservedKeyword, + "namespacedFlowType": namespacedFlowType, + "httpVerb": httpVerb, + "httpPath": httpPath, + "httpPathsAdditionalBindings": httpPathsAdditionalBindings, + "httpBody": httpBody, + "shortType": shortType, + "urlHasVarsFromMessage": urlHasVarsFromMessage, + "lowerGoNormalize": lowerGoNormalize, + "goNormalize": goNormalize, + "leadingComment": leadingComment, + "trailingComment": trailingComment, + "leadingDetachedComments": leadingDetachedComments, + "stringFieldExtension": stringFieldExtension, + "boolFieldExtension": boolFieldExtension, + "isFieldMap": isFieldMap, + "fieldMapKeyType": fieldMapKeyType, + "fieldMapValueType": fieldMapValueType, + "replaceDict": replaceDict, } var pathMap map[interface{}]*descriptor.SourceCodeInfo_Location @@ -726,6 +727,40 @@ func httpPath(m *descriptor.MethodDescriptorProto) string { } } +func httpPathsAdditionalBindings(m *descriptor.MethodDescriptorProto) []string { + ext, err := proto.GetExtension(m.Options, options.E_Http) + if err != nil { + panic(err.Error()) + } + opts, ok := ext.(*options.HttpRule) + if !ok { + panic(fmt.Sprintf("extension is %T; want an HttpRule", ext)) + } + + var httpPaths []string + var optsAdditionalBindings = opts.GetAdditionalBindings() + for _, optAdditionalBindings := range optsAdditionalBindings { + switch t := optAdditionalBindings.Pattern.(type) { + case *options.HttpRule_Get: + httpPaths = append(httpPaths, t.Get) + case *options.HttpRule_Post: + httpPaths = append(httpPaths, t.Post) + case *options.HttpRule_Put: + httpPaths = append(httpPaths, t.Put) + case *options.HttpRule_Delete: + httpPaths = append(httpPaths, t.Delete) + case *options.HttpRule_Patch: + httpPaths = append(httpPaths, t.Patch) + case *options.HttpRule_Custom: + httpPaths = append(httpPaths, t.Custom.Path) + default: + // nothing + } + } + + return httpPaths +} + func httpVerb(m *descriptor.MethodDescriptorProto) string { ext, err := proto.GetExtension(m.Options, options.E_Http)