diff --git a/third_party/github.com/grpc-ecosystem/grpc-gateway-v2/grpc/option.gateway.go b/third_party/github.com/grpc-ecosystem/grpc-gateway-v2/grpc/option.gateway.go index 7df62865..ab189898 100644 --- a/third_party/github.com/grpc-ecosystem/grpc-gateway-v2/grpc/option.gateway.go +++ b/third_party/github.com/grpc-ecosystem/grpc-gateway-v2/grpc/option.gateway.go @@ -133,7 +133,7 @@ func WithMarshalerOption(mime string, marshaler runtime.Marshaler) GatewayOption }) } -func WithDefaultMarsherOption() []GatewayOption { +func WithDefaultMarshalerOption() []GatewayOption { return []GatewayOption{ WithMarshalerOption(runtime.MIMEWildcard, runtime_.NewHTTPBodyJsonMarshaler()), WithMarshalerOption(binding.MIMEJSON, runtime_.NewHTTPBodyJsonMarshaler()), @@ -143,9 +143,14 @@ func WithDefaultMarsherOption() []GatewayOption { } } +// Deprecated: Use WithDefaultMarshalerOption instead. +func WithDefaultMarsherOption() []GatewayOption { + return WithDefaultMarshalerOption() +} + func WithDefault() []GatewayOption { var opts []GatewayOption - opts = append(opts, WithDefaultMarsherOption()...) + opts = append(opts, WithDefaultMarshalerOption()...) opts = append(opts, WithGrpcReflectionService(true)) return opts } diff --git a/third_party/github.com/grpc-ecosystem/grpc-gateway/grpc/option.gateway.go b/third_party/github.com/grpc-ecosystem/grpc-gateway/grpc/option.gateway.go index 30ee6d7d..db73ce14 100644 --- a/third_party/github.com/grpc-ecosystem/grpc-gateway/grpc/option.gateway.go +++ b/third_party/github.com/grpc-ecosystem/grpc-gateway/grpc/option.gateway.go @@ -139,14 +139,18 @@ func WithMarshalerOption(mime string, marshaler runtime.Marshaler) GatewayOption }) } -func WithDefaultMarsherOption() []GatewayOption { +func WithDefaultMarshalerOption() []GatewayOption { return []GatewayOption{ WithMarshalerOption(runtime.MIMEWildcard, runtime_.NewHTTPBodyJsonMarshaler()), WithMarshalerOption(binding.MIMEJSON, runtime_.NewHTTPBodyJsonMarshaler()), WithMarshalerOption(binding.MIMEPROTOBUF, runtime_.NewHTTPBodyProtoMarshaler()), WithMarshalerOption(binding.MIMEYAML, runtime_.NewHTTPBodyYamlMarshaler()), } +} +// Deprecated: Use WithDefaultMarshalerOption instead. +func WithDefaultMarsherOption() []GatewayOption { + return WithDefaultMarshalerOption() } func WithFastMode(fastMode bool) GatewayOption {