Merge pull request #2209 from thedadams/generic-map-marshal-pointer

thedadams · web-flow · commit d28fbb8b0a77 · 2023-10-03T13:47:57.000-04:00
Make the MarshalJSON method on GenericMap a pointer receiver
diff --git a/pkg/apis/internal.acorn.io/v1/map.go b/pkg/apis/internal.acorn.io/v1/map.go
@@ -78,7 +78,7 @@ func (g *GenericMap) Merge(from *GenericMap) *GenericMap {
 }
 
 // MarshalJSON may get called on pointers or values, so implement MarshalJSON on value.
-func (g GenericMap) MarshalJSON() ([]byte, error) {
+func (g *GenericMap) MarshalJSON() ([]byte, error) {
 	return json.Marshal(g.GetData())
 }
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (g GenericMap) Merge(from GenericMap) *GenericMap {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// MarshalJSON may get called on pointers or values, so implement MarshalJSON on value.`
`81`		`-func (g GenericMap) MarshalJSON() ([]byte, error) {`
	`81`	`+func (g *GenericMap) MarshalJSON() ([]byte, error) {`
`82`	`82`	`return json.Marshal(g.GetData())`
`83`	`83`	`}`
`84`	`84`