deps: removed (indirect) dependency to mailru/easyjson

fredbi · fredbi · commit ea421064bbd1 · 2025-08-30T12:42:26.000+02:00
fixes #53 Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
diff --git a/go.mod b/go.mod
@@ -1,15 +1,13 @@
 module github.com/go-openapi/jsonpointer
 
 require (
-	github.com/go-openapi/swag v0.23.1
+	github.com/go-openapi/swag/jsonname v0.24.0
 	github.com/stretchr/testify v1.11.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,16 +1,12 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
-github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/go-openapi/swag/jsonname v0.24.0 h1:2wKS9bgRV/xB8c62Qg16w4AUiIrqqiniJFtZGi3dg5k=
+github.com/go-openapi/swag/jsonname v0.24.0/go.mod h1:GXqrPzGJe611P7LG4QB9JKPtUZ7flE4DOVechNaDd7Q=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/pointer.go b/pointer.go
@@ -33,7 +33,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonname"
 )
 
 const (
@@ -72,12 +72,12 @@ func New(jsonPointerString string) (Pointer, error) {
 
 // Get uses the pointer to retrieve a value from a JSON document
 func (p *Pointer) Get(document any) (any, reflect.Kind, error) {
-	return p.get(document, swag.DefaultJSONNameProvider)
+	return p.get(document, jsonname.DefaultJSONNameProvider)
 }
 
 // Set uses the pointer to set a value from a JSON document
 func (p *Pointer) Set(document any, value any) (any, error) {
-	return document, p.set(document, value, swag.DefaultJSONNameProvider)
+	return document, p.set(document, value, jsonname.DefaultJSONNameProvider)
 }
 
 // DecodedTokens returns the decoded tokens
@@ -154,9 +154,9 @@ func (p *Pointer) parse(jsonPointerString string) error {
 	return err
 }
 
-func (p *Pointer) get(node any, nameProvider *swag.NameProvider) (any, reflect.Kind, error) {
+func (p *Pointer) get(node any, nameProvider *jsonname.NameProvider) (any, reflect.Kind, error) {
 	if nameProvider == nil {
-		nameProvider = swag.DefaultJSONNameProvider
+		nameProvider = jsonname.DefaultJSONNameProvider
 	}
 
 	kind := reflect.Invalid
@@ -182,7 +182,7 @@ func (p *Pointer) get(node any, nameProvider *swag.NameProvider) (any, reflect.K
 	return node, kind, nil
 }
 
-func (p *Pointer) set(node, data any, nameProvider *swag.NameProvider) error {
+func (p *Pointer) set(node, data any, nameProvider *jsonname.NameProvider) error {
 	knd := reflect.ValueOf(node).Kind()
 
 	if knd != reflect.Ptr && knd != reflect.Struct && knd != reflect.Map && knd != reflect.Slice && knd != reflect.Array {
@@ -193,7 +193,7 @@ func (p *Pointer) set(node, data any, nameProvider *swag.NameProvider) error {
 	}
 
 	if nameProvider == nil {
-		nameProvider = swag.DefaultJSONNameProvider
+		nameProvider = jsonname.DefaultJSONNameProvider
 	}
 
 	// Full document when empty
@@ -300,15 +300,15 @@ func isNil(input any) bool {
 
 // GetForToken gets a value for a json pointer token 1 level deep
 func GetForToken(document any, decodedToken string) (any, reflect.Kind, error) {
-	return getSingleImpl(document, decodedToken, swag.DefaultJSONNameProvider)
+	return getSingleImpl(document, decodedToken, jsonname.DefaultJSONNameProvider)
 }
 
 // SetForToken gets a value for a json pointer token 1 level deep
 func SetForToken(document any, decodedToken string, value any) (any, error) {
-	return document, setSingleImpl(document, value, decodedToken, swag.DefaultJSONNameProvider)
+	return document, setSingleImpl(document, value, decodedToken, jsonname.DefaultJSONNameProvider)
 }
 
-func getSingleImpl(node any, decodedToken string, nameProvider *swag.NameProvider) (any, reflect.Kind, error) {
+func getSingleImpl(node any, decodedToken string, nameProvider *jsonname.NameProvider) (any, reflect.Kind, error) {
 	rValue := reflect.Indirect(reflect.ValueOf(node))
 	kind := rValue.Kind()
 	if isNil(node) {
@@ -362,7 +362,7 @@ func getSingleImpl(node any, decodedToken string, nameProvider *swag.NameProvide
 	}
 }
 
-func setSingleImpl(node, data any, decodedToken string, nameProvider *swag.NameProvider) error {
+func setSingleImpl(node, data any, decodedToken string, nameProvider *jsonname.NameProvider) error {
 	rValue := reflect.Indirect(reflect.ValueOf(node))
 
 	// Check for nil to prevent panic when calling rValue.Type()

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`	`"strconv"`
`34`	`34`	`"strings"`
`35`	`35`
`36`		`- "github.com/go-openapi/swag"`
	`36`	`+ "github.com/go-openapi/swag/jsonname"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`const (`
`@@ -72,12 +72,12 @@ func New(jsonPointerString string) (Pointer, error) {`
`72`	`72`
`73`	`73`	`// Get uses the pointer to retrieve a value from a JSON document`
`74`	`74`	`func (p *Pointer) Get(document any) (any, reflect.Kind, error) {`
`75`		`- return p.get(document, swag.DefaultJSONNameProvider)`
	`75`	`+ return p.get(document, jsonname.DefaultJSONNameProvider)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// Set uses the pointer to set a value from a JSON document`
`79`	`79`	`func (p *Pointer) Set(document any, value any) (any, error) {`
`80`		`- return document, p.set(document, value, swag.DefaultJSONNameProvider)`
	`80`	`+ return document, p.set(document, value, jsonname.DefaultJSONNameProvider)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// DecodedTokens returns the decoded tokens`
`@@ -154,9 +154,9 @@ func (p *Pointer) parse(jsonPointerString string) error {`
`154`	`154`	`return err`
`155`	`155`	`}`
`156`	`156`
`157`		`-func (p Pointer) get(node any, nameProvider swag.NameProvider) (any, reflect.Kind, error) {`
	`157`	`+func (p Pointer) get(node any, nameProvider jsonname.NameProvider) (any, reflect.Kind, error) {`
`158`	`158`	`if nameProvider == nil {`
`159`		`- nameProvider = swag.DefaultJSONNameProvider`
	`159`	`+ nameProvider = jsonname.DefaultJSONNameProvider`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`kind := reflect.Invalid`
`@@ -182,7 +182,7 @@ func (p Pointer) get(node any, nameProvider swag.NameProvider) (any, reflect.K`
`182`	`182`	`return node, kind, nil`
`183`	`183`	`}`
`184`	`184`
`185`		`-func (p Pointer) set(node, data any, nameProvider swag.NameProvider) error {`
	`185`	`+func (p Pointer) set(node, data any, nameProvider jsonname.NameProvider) error {`
`186`	`186`	`knd := reflect.ValueOf(node).Kind()`
`187`	`187`
`188`	`188`	`if knd != reflect.Ptr && knd != reflect.Struct && knd != reflect.Map && knd != reflect.Slice && knd != reflect.Array {`
`@@ -193,7 +193,7 @@ func (p Pointer) set(node, data any, nameProvider swag.NameProvider) error {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`if nameProvider == nil {`
`196`		`- nameProvider = swag.DefaultJSONNameProvider`
	`196`	`+ nameProvider = jsonname.DefaultJSONNameProvider`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`// Full document when empty`
`@@ -300,15 +300,15 @@ func isNil(input any) bool {`
`300`	`300`
`301`	`301`	`// GetForToken gets a value for a json pointer token 1 level deep`
`302`	`302`	`func GetForToken(document any, decodedToken string) (any, reflect.Kind, error) {`
`303`		`- return getSingleImpl(document, decodedToken, swag.DefaultJSONNameProvider)`
	`303`	`+ return getSingleImpl(document, decodedToken, jsonname.DefaultJSONNameProvider)`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`// SetForToken gets a value for a json pointer token 1 level deep`
`307`	`307`	`func SetForToken(document any, decodedToken string, value any) (any, error) {`
`308`		`- return document, setSingleImpl(document, value, decodedToken, swag.DefaultJSONNameProvider)`
	`308`	`+ return document, setSingleImpl(document, value, decodedToken, jsonname.DefaultJSONNameProvider)`
`309`	`309`	`}`
`310`	`310`
`311`		`-func getSingleImpl(node any, decodedToken string, nameProvider *swag.NameProvider) (any, reflect.Kind, error) {`
	`311`	`+func getSingleImpl(node any, decodedToken string, nameProvider *jsonname.NameProvider) (any, reflect.Kind, error) {`
`312`	`312`	`rValue := reflect.Indirect(reflect.ValueOf(node))`
`313`	`313`	`kind := rValue.Kind()`
`314`	`314`	`if isNil(node) {`
`@@ -362,7 +362,7 @@ func getSingleImpl(node any, decodedToken string, nameProvider *swag.NameProvide`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`		`-func setSingleImpl(node, data any, decodedToken string, nameProvider *swag.NameProvider) error {`
	`365`	`+func setSingleImpl(node, data any, decodedToken string, nameProvider *jsonname.NameProvider) error {`
`366`	`366`	`rValue := reflect.Indirect(reflect.ValueOf(node))`
`367`	`367`
`368`	`368`	`// Check for nil to prevent panic when calling rValue.Type()`