WIP: using go-json

fredbi · fredbi · commit 73720f1c1391 · 2024-01-09T12:29:10.000+01:00
Signed-off-by: Frederic BIDON &lt;fredbi@yahoo.com&gt;
diff --git a/cache.go b/cache.go
@@ -16,8 +16,6 @@ package spec
 
 import (
 	"sync"
-
-	jsoniter "github.com/json-iterator/go"
 )
 
 // ResolutionCache a cache for resolving urls
@@ -73,19 +71,14 @@ var (
 	resCache  *simpleCache
 	onceCache sync.Once
 
-	_    ResolutionCache = &simpleCache{}
-	json jsoniter.API
+	_ ResolutionCache = &simpleCache{}
 )
 
 // initResolutionCache initializes the URI resolution cache. To be wrapped in a sync.Once.Do call.
 func initResolutionCache() {
 	resCache = defaultResolutionCache()
 }
 
-func init() {
-	json = jsoniter.ConfigFastest
-}
-
 func defaultResolutionCache() *simpleCache {
 	return &simpleCache{store: map[string]interface{}{
 		"http://swagger.io/v2/schema.json":       MustLoadSwagger20Schema(),
diff --git a/circular_test.go b/circular_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/contact_info.go b/contact_info.go
@@ -16,6 +16,7 @@ package spec
 
 import (
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // ContactInfo contact information for the exposed API.
diff --git a/contact_info_test.go b/contact_info_test.go
@@ -17,6 +17,7 @@ package spec
 import (
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/expander.go b/expander.go
@@ -15,8 +15,9 @@
 package spec
 
 import (
-	stdjson "encoding/json"
 	"fmt"
+
+	json "github.com/goccy/go-json"
 )
 
 // ExpandOptions provides options for the spec expander.
@@ -28,11 +29,11 @@ import (
 //
 // PathLoader injects a document loading method. By default, this resolves to the function provided by the SpecLoader package variable.
 type ExpandOptions struct {
-	RelativeBase        string                                   // the path to the root document to expand. This is a file, not a directory
-	SkipSchemas         bool                                     // do not expand schemas, just paths, parameters and responses
-	ContinueOnError     bool                                     // continue expanding even after and error is found
-	PathLoader          func(string) (stdjson.RawMessage, error) `json:"-"` // the document loading method that takes a path as input and yields a json document
-	AbsoluteCircularRef bool                                     // circular $ref remaining after expansion remain absolute URLs
+	RelativeBase        string                                // the path to the root document to expand. This is a file, not a directory
+	SkipSchemas         bool                                  // do not expand schemas, just paths, parameters and responses
+	ContinueOnError     bool                                  // continue expanding even after and error is found
+	PathLoader          func(string) (json.RawMessage, error) `json:"-"` // the document loading method that takes a path as input and yields a json document
+	AbsoluteCircularRef bool                                  // circular $ref remaining after expansion remain absolute URLs
 }
 
 func optionsOrDefault(opts *ExpandOptions) *ExpandOptions {
diff --git a/expander_test.go b/expander_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	stdjson "encoding/json"
 	"io"
 	"log"
 	"net/http"
@@ -24,6 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -38,7 +38,7 @@ const (
 
 var (
 	// PetStoreJSONMessage json raw message for Petstore20
-	PetStoreJSONMessage = stdjson.RawMessage([]byte(PetStore20))
+	PetStoreJSONMessage = json.RawMessage([]byte(PetStore20))
 	specs               = filepath.Join("fixtures", "specs")
 )
 
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ require (
 	github.com/go-openapi/jsonpointer v0.20.2
 	github.com/go-openapi/jsonreference v0.20.4
 	github.com/go-openapi/swag v0.22.6
-	github.com/json-iterator/go v1.1.12
+	github.com/goccy/go-json v0.10.2
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -13,8 +13,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 )
 
diff --git a/go.sum b/go.sum
@@ -1,4 +1,3 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
@@ -7,25 +6,17 @@ github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdX
 github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
 github.com/go-openapi/swag v0.22.6 h1:dnqg1XfHXL9aBxSbktBqFR5CxVyVI+7fYWhAf1JOeTw=
 github.com/go-openapi/swag v0.22.6/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/header.go b/header.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 const (
diff --git a/header_test.go b/header_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/helpers_spec_test.go b/helpers_spec_test.go
@@ -1,35 +1,34 @@
 package spec_test
 
 import (
-	"encoding/json"
-	stdjson "encoding/json"
 	"fmt"
 	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 var (
 	rex        = regexp.MustCompile(`"\$ref":\s*"(.*?)"`)
-	testLoader func(string) (stdjson.RawMessage, error)
+	testLoader func(string) (json.RawMessage, error)
 )
 
 func init() {
 	// mimics what the go-openapi/load does
-	testLoader = func(path string) (stdjson.RawMessage, error) {
+	testLoader = func(path string) (json.RawMessage, error) {
 		if swag.YAMLMatcher(path) {
 			return swag.YAMLDoc(path)
 		}
 		data, err := swag.LoadFromFileOrHTTP(path)
 		if err != nil {
 			return nil, err
 		}
-		return stdjson.RawMessage(data), nil
+		return json.RawMessage(data), nil
 	}
 }
 
diff --git a/helpers_test.go b/helpers_test.go
@@ -1,25 +1,25 @@
 package spec
 
 import (
-	stdjson "encoding/json"
 	"fmt"
 	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 var rex = regexp.MustCompile(`"\$ref":\s*"(.*?)"`)
 
-func jsonDoc(path string) (stdjson.RawMessage, error) {
+func jsonDoc(path string) (json.RawMessage, error) {
 	data, err := swag.LoadFromFileOrHTTP(path)
 	if err != nil {
 		return nil, err
 	}
-	return stdjson.RawMessage(data), nil
+	return json.RawMessage(data), nil
 }
 
 func docAndOpts(t testing.TB, fixturePath string) ([]byte, *ExpandOptions) {
diff --git a/info.go b/info.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // Extensions vendor specific extensions
diff --git a/info_test.go b/info_test.go
@@ -17,6 +17,7 @@ package spec
 import (
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/items.go b/items.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 const (
diff --git a/items_test.go b/items_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/license.go b/license.go
@@ -16,6 +16,7 @@ package spec
 
 import (
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // License information for the exposed API.
diff --git a/license_test.go b/license_test.go
@@ -17,6 +17,7 @@ package spec
 import (
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/operation.go b/operation.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 func init() {
diff --git a/operation_test.go b/operation_test.go
@@ -19,6 +19,7 @@ import (
 	"encoding/gob"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/parameter.go b/parameter.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // QueryParam creates a query parameter
diff --git a/parameters_test.go b/parameters_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/path_item.go b/path_item.go
@@ -17,6 +17,7 @@ package spec
 import (
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // PathItemProps the path item specific properties
diff --git a/path_item_test.go b/path_item_test.go
@@ -17,6 +17,7 @@ package spec
 import (
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/paths.go b/paths.go
@@ -18,9 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	stdjson "encoding/json"
-
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // Paths holds the relative paths to the individual endpoints.
@@ -47,7 +46,7 @@ func (p Paths) JSONLookup(token string) (interface{}, error) {
 
 // UnmarshalJSON hydrates this items instance with the data from JSON
 func (p *Paths) UnmarshalJSON(data []byte) error {
-	var res map[string]stdjson.RawMessage
+	var res map[string]json.RawMessage
 	if err := json.Unmarshal(data, &res); err != nil {
 		return err
 	}
diff --git a/paths_test.go b/paths_test.go
@@ -17,6 +17,7 @@ package spec
 import (
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/properties.go b/properties.go
@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"reflect"
 	"sort"
+
+	json "github.com/goccy/go-json"
 )
 
 // OrderSchemaItem holds a named schema (e.g. from a property of an object)
diff --git a/ref.go b/ref.go
@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/go-openapi/jsonreference"
+	json "github.com/goccy/go-json"
 )
 
 // Refable is a struct for things that accept a $ref property
diff --git a/ref_test.go b/ref_test.go
@@ -19,6 +19,7 @@ import (
 	"encoding/gob"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/resolver_test.go b/resolver_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/jsonpointer"
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/response.go b/response.go
diff --git a/response_test.go b/response_test.go
diff --git a/responses.go b/responses.go
diff --git a/responses_test.go b/responses_test.go
diff --git a/schema.go b/schema.go
diff --git a/schema_loader.go b/schema_loader.go
diff --git a/schema_loader_test.go b/schema_loader_test.go
diff --git a/schema_test.go b/schema_test.go
diff --git a/security_scheme.go b/security_scheme.go
diff --git a/spec.go b/spec.go
diff --git a/structs_test.go b/structs_test.go
diff --git a/swagger.go b/swagger.go
diff --git a/swagger_test.go b/swagger_test.go
diff --git a/tag.go b/tag.go
diff --git a/xml_object_test.go b/xml_object_test.go

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`	`"time"`
`10`	`10`
	`11`	`+ json "github.com/goccy/go-json"`
`11`	`12`	`"github.com/stretchr/testify/assert"`
`12`	`13`	`"github.com/stretchr/testify/require"`
`13`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ package spec`
`16`	`16`
`17`	`17`	`import (`
`18`	`18`	`"github.com/go-openapi/swag"`
	`19`	`+ json "github.com/goccy/go-json"`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`// ContactInfo contact information for the exposed API.`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ package spec`
`17`	`17`	`import (`
`18`	`18`	`"testing"`
`19`	`19`
	`20`	`+ json "github.com/goccy/go-json"`
`20`	`21`	`"github.com/stretchr/testify/assert"`
`21`	`22`	`"github.com/stretchr/testify/require"`
`22`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`
`20`	`20`	`"github.com/go-openapi/jsonpointer"`
`21`	`21`	`"github.com/go-openapi/swag"`
	`22`	`+ json "github.com/goccy/go-json"`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`"testing"`
`19`	`19`
`20`	`20`	`"github.com/go-openapi/swag"`
	`21`	`+ json "github.com/goccy/go-json"`
`21`	`22`	`"github.com/stretchr/testify/assert"`
`22`	`23`	`"github.com/stretchr/testify/require"`
`23`	`24`	`)`