Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default protoencoding resolver to an empty resolver #3345

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/json_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ type jsonMarshaler struct {
}

func newJSONMarshaler(resolver Resolver, options ...JSONMarshalerOption) Marshaler {
if resolver == nil {
resolver = EmptyResolver
}
jsonMarshaler := &jsonMarshaler{
resolver: resolver,
}
Expand Down
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/json_unmarshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ type jsonUnmarshaler struct {
}

func newJSONUnmarshaler(resolver Resolver, options ...JSONUnmarshalerOption) Unmarshaler {
if resolver == nil {
resolver = EmptyResolver
}
jsonUnmarshaler := &jsonUnmarshaler{
resolver: resolver,
}
Expand Down
14 changes: 7 additions & 7 deletions private/pkg/protoencoding/protoencoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func NewWireMarshaler() Marshaler {
// NewJSONMarshaler returns a new Marshaler for JSON.
//
// This has the potential to be unstable over time.
// resolver can be nil if unknown and is only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewJSONMarshaler(resolver Resolver, options ...JSONMarshalerOption) Marshaler {
return newJSONMarshaler(resolver, options...)
}
Expand Down Expand Up @@ -115,14 +115,14 @@ func JSONMarshalerWithEmitUnpopulated() JSONMarshalerOption {

// NewTxtpbMarshaler returns a new Marshaler for txtpb.
//
// resolver can be nil if unknown and is only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewTxtpbMarshaler(resolver Resolver) Marshaler {
return newTxtpbMarshaler(resolver)
}

// NewYAMLMarshaler returns a new Marshaler for YAML.
//
// resolver can be nil if unknown and is only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewYAMLMarshaler(resolver Resolver, options ...YAMLMarshalerOption) Marshaler {
return newYAMLMarshaler(resolver, options...)
}
Expand Down Expand Up @@ -165,14 +165,14 @@ type Unmarshaler interface {

// NewWireUnmarshaler returns a new Unmarshaler for wire.
//
// resolver can be nil if unknown and are only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewWireUnmarshaler(resolver Resolver) Unmarshaler {
return newWireUnmarshaler(resolver)
}

// NewJSONUnmarshaler returns a new Unmarshaler for json.
//
// resolver can be nil if unknown and are only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewJSONUnmarshaler(resolver Resolver, options ...JSONUnmarshalerOption) Unmarshaler {
return newJSONUnmarshaler(resolver, options...)
}
Expand All @@ -189,7 +189,7 @@ func JSONUnmarshalerWithDisallowUnknown() JSONUnmarshalerOption {

// NewTxtpbUnmarshaler returns a new Unmarshaler for txtpb.
//
// resolver can be nil if unknown and are only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewTxtpbUnmarshaler(resolver Resolver) Unmarshaler {
return newTxtpbUnmarshaler(resolver)
}
Expand All @@ -212,7 +212,7 @@ func YAMLUnmarshalerWithValidator(validator protoyaml.Validator) YAMLUnmarshaler

// NewYAMLUnmarshaler returns a new Unmarshaler for yaml.
//
// resolver can be nil if unknown and are only needed for extensions.
// If the resolver is nil, EmptyResolver will be used.
func NewYAMLUnmarshaler(resolver Resolver, options ...YAMLUnmarshalerOption) Unmarshaler {
return newYAMLUnmarshaler(resolver, options...)
}
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/txtpb_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ type txtpbMarshaler struct {
}

func newTxtpbMarshaler(resolver Resolver) Marshaler {
if resolver == nil {
resolver = EmptyResolver
}
return &txtpbMarshaler{
resolver: resolver,
}
Expand Down
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/txtpb_unmarshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ type txtpbUnmarshaler struct {
}

func newTxtpbUnmarshaler(resolver Resolver) Unmarshaler {
if resolver == nil {
resolver = EmptyResolver
}
return &txtpbUnmarshaler{
resolver: resolver,
}
Expand Down
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/wire_unmarshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ type wireUnmarshaler struct {
}

func newWireUnmarshaler(resolver Resolver) Unmarshaler {
if resolver == nil {
resolver = EmptyResolver
}
return &wireUnmarshaler{
resolver: resolver,
}
Expand Down
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/yaml_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ type yamlMarshaler struct {
}

func newYAMLMarshaler(resolver Resolver, options ...YAMLMarshalerOption) Marshaler {
if resolver == nil {
resolver = EmptyResolver
}
yamlMarshaler := &yamlMarshaler{
resolver: resolver,
}
Expand Down
3 changes: 3 additions & 0 deletions private/pkg/protoencoding/yaml_unmarshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ type yamlUnmarshaler struct {
}

func newYAMLUnmarshaler(resolver Resolver, options ...YAMLUnmarshalerOption) Unmarshaler {
if resolver == nil {
resolver = EmptyResolver
}
result := &yamlUnmarshaler{
resolver: resolver,
}
Expand Down