replaced stdlib encoding/json by jsoniter

fredbi · fredbi · commit c13cb3d25fe4 · 2019-10-28T19:08:25.000+01:00
Signed-off-by: Frederic BIDON &lt;fredbi@yahoo.com&gt;
diff --git a/cache.go b/cache.go
@@ -14,7 +14,11 @@
 
 package spec
 
-import "sync"
+import (
+	"sync"
+
+	jsoniter "github.com/json-iterator/go"
+)
 
 // ResolutionCache a cache for resolving urls
 type ResolutionCache interface {
@@ -45,9 +49,13 @@ func (s *simpleCache) Set(uri string, data interface{}) {
 	s.lock.Unlock()
 }
 
-var resCache ResolutionCache
+var (
+	resCache ResolutionCache
+	json     jsoniter.API
+)
 
 func init() {
+	json = jsoniter.ConfigFastest
 	resCache = initResolutionCache()
 }
 
diff --git a/expander.go b/expander.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 )
diff --git a/expander_test.go b/expander_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -27,6 +26,8 @@ import (
 	"strings"
 	"testing"
 
+	stdjson "encoding/json"
+
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
 	"github.com/stretchr/testify/assert"
@@ -39,12 +40,12 @@ var (
 	rex = regexp.MustCompile(`"\$ref":\s*"(.+)"`)
 )
 
-func jsonDoc(path string) (json.RawMessage, error) {
+func jsonDoc(path string) (stdjson.RawMessage, error) {
 	data, err := swag.LoadFromFileOrHTTP(path)
 	if err != nil {
 		return nil, err
 	}
-	return json.RawMessage(data), nil
+	return stdjson.RawMessage(data), nil
 }
 
 // tests that paths are normalized correctly
@@ -1030,8 +1031,9 @@ func TestSchemaExpansion(t *testing.T) {
 }
 
 func TestDefaultResolutionCache(t *testing.T) {
-
 	cache := initResolutionCache()
+	jsonSchema := MustLoadJSONSchemaDraft04()
+	swaggerSchema := MustLoadSwagger20Schema()
 
 	sch, ok := cache.Get("not there")
 	assert.False(t, ok)
@@ -1760,7 +1762,7 @@ func TestResolveExtraItem(t *testing.T) {
 }
 
 // PetStoreJSONMessage json raw message for Petstore20
-var PetStoreJSONMessage = json.RawMessage([]byte(PetStore20))
+var PetStoreJSONMessage = stdjson.RawMessage([]byte(PetStore20))
 
 // PetStore20 json doc for swagger 2.0 pet store
 const PetStore20 = `{
diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ require (
 	github.com/go-openapi/jsonpointer v0.19.3
 	github.com/go-openapi/jsonreference v0.19.2
 	github.com/go-openapi/swag v0.19.5
+	github.com/json-iterator/go v1.1.7
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 	gopkg.in/yaml.v2 v2.2.4
diff --git a/go.sum b/go.sum
@@ -15,6 +15,9 @@ github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88d
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -24,6 +27,10 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/header.go b/header.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"github.com/go-openapi/jsonpointer"
diff --git a/header_test.go b/header_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/info.go b/info.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"github.com/go-openapi/jsonpointer"
diff --git a/info_test.go b/info_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -55,9 +54,9 @@ var info = Info{
 }
 
 func TestIntegrationInfo_Serialize(t *testing.T) {
-	b, err := json.MarshalIndent(info, "", "\t")
+	b, err := json.MarshalIndent(info, "", " ")
 	if assert.NoError(t, err) {
-		assert.Equal(t, infoJSON, string(b))
+		assert.JSONEq(t, infoJSON, string(b))
 	}
 }
 
diff --git a/items.go b/items.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"github.com/go-openapi/jsonpointer"
diff --git a/items_test.go b/items_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/go-openapi/swag"
diff --git a/operation.go b/operation.go
@@ -17,7 +17,6 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"sort"
 
 	"github.com/go-openapi/jsonpointer"
diff --git a/operation_test.go b/operation_test.go
@@ -17,7 +17,6 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/parameter.go b/parameter.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"github.com/go-openapi/jsonpointer"
diff --git a/parameters_test.go b/parameters_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/path_item.go b/path_item.go
@@ -15,8 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
-
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
 )
diff --git a/path_item_test.go b/path_item_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/paths.go b/paths.go
@@ -15,10 +15,11 @@
 package spec
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 
+	stdjson "encoding/json"
+
 	"github.com/go-openapi/swag"
 )
 
@@ -46,7 +47,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]json.RawMessage
+	var res map[string]stdjson.RawMessage
 	if err := json.Unmarshal(data, &res); err != nil {
 		return err
 	}
diff --git a/paths_test.go b/paths_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/ref.go b/ref.go
@@ -17,7 +17,6 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"net/http"
 	"os"
 	"path/filepath"
diff --git a/ref_test.go b/ref_test.go
@@ -17,7 +17,6 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/response.go b/response.go
@@ -15,8 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
-
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
 )
diff --git a/response_test.go b/response_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/responses.go b/responses.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"fmt"
 	"reflect"
 	"strconv"
diff --git a/schema.go b/schema.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/url"
 	"strings"
diff --git a/schema_loader.go b/schema_loader.go
@@ -15,7 +15,7 @@
 package spec
 
 import (
-	"encoding/json"
+	stdjson "encoding/json"
 	"fmt"
 	"log"
 	"net/url"
@@ -26,15 +26,15 @@ import (
 )
 
 // PathLoader function to use when loading remote refs
-var PathLoader func(string) (json.RawMessage, error)
+var PathLoader func(string) (stdjson.RawMessage, error)
 
 func init() {
-	PathLoader = func(path string) (json.RawMessage, error) {
+	PathLoader = func(path string) (stdjson.RawMessage, error) {
 		data, err := swag.LoadFromFileOrHTTP(path)
 		if err != nil {
 			return nil, err
 		}
-		return json.RawMessage(data), nil
+		return stdjson.RawMessage(data), nil
 	}
 }
 
@@ -62,7 +62,7 @@ type schemaLoader struct {
 	options *ExpandOptions
 	cache   ResolutionCache
 	context *resolverContext
-	loadDoc func(string) (json.RawMessage, error)
+	loadDoc func(string) (stdjson.RawMessage, error)
 }
 
 func (r *schemaLoader) transitiveResolver(basePath string, ref Ref) (*schemaLoader, error) {
@@ -268,7 +268,7 @@ func defaultSchemaLoader(
 		options: expandOptions,
 		cache:   cache,
 		context: context,
-		loadDoc: func(path string) (json.RawMessage, error) {
+		loadDoc: func(path string) (stdjson.RawMessage, error) {
 			debugLog("fetching document at %q", path)
 			return PathLoader(path)
 		},
diff --git a/schema_test.go b/schema_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/security_scheme.go b/security_scheme.go
@@ -15,8 +15,6 @@
 package spec
 
 import (
-	"encoding/json"
-
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/swag"
 )
diff --git a/spec.go b/spec.go
@@ -14,8 +14,6 @@
 
 package spec
 
-import "encoding/json"
-
 //go:generate curl -L --progress -o ./schemas/v2/schema.json http://swagger.io/v2/schema.json
 //go:generate curl -L --progress  -o ./schemas/jsonschema-draft-04.json http://json-schema.org/draft-04/schema
 //go:generate go-bindata -pkg=spec -prefix=./schemas -ignore=.*\.md ./schemas/...
@@ -28,16 +26,6 @@ const (
 	JSONSchemaURL = "http://json-schema.org/draft-04/schema#"
 )
 
-var (
-	jsonSchema    *Schema
-	swaggerSchema *Schema
-)
-
-func init() {
-	jsonSchema = MustLoadJSONSchemaDraft04()
-	swaggerSchema = MustLoadSwagger20Schema()
-}
-
 // MustLoadJSONSchemaDraft04 panics when Swagger20Schema returns an error
 func MustLoadJSONSchemaDraft04() *Schema {
 	d, e := JSONSchemaDraft04()
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
`@@ -15,7 +15,6 @@`
`15`	`15`	`package spec`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "encoding/json"`
`19`	`18`	`"fmt"`
`20`	`19`	`"strings"`
`21`	`20`	`)`