replaced stdlib encoding/json by ccy/go-json

Signed-off-by: Frederic BIDON <[email protected]>
go-openapi · Jan 9, 2024 · e327369 · e327369
1 parent ed00e71
commit e327369
Show file tree

Hide file tree

Showing 44 changed files with 65 additions and 61 deletions.
diff --git a/circular_test.go b/circular_test.go
@@ -1,14 +1,14 @@
 package spec
 
 import (
-	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"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
@@ -15,9 +15,8 @@
 package spec
 
 import (
-	"encoding/json"
-
 	"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
@@ -15,18 +15,18 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 const contactInfoJSON = `{
-	"name": "wordnik api team",
-	"url": "http://developer.wordnik.com",
-	"email": "[email protected]",
-	"x-teams": "test team"
+  "name": "wordnik api team",
+  "url": "http://developer.wordnik.com",
+  "email": "[email protected]",
+  "x-teams": "test team"
 }`
 
 var contactInfo = ContactInfo{ContactInfoProps: ContactInfoProps{
@@ -36,9 +36,9 @@ var contactInfo = ContactInfo{ContactInfoProps: ContactInfoProps{
 }, VendorExtensible: VendorExtensible{Extensions: map[string]interface{}{"x-teams": "test team"}}}
 
 func TestIntegrationContactInfo(t *testing.T) {
-	b, err := json.MarshalIndent(contactInfo, "", "\t")
+	b, err := json.MarshalIndent(contactInfo, "", " ")
 	require.NoError(t, err)
-	assert.Equal(t, contactInfoJSON, string(b))
+	assert.JSONEq(t, contactInfoJSON, string(b))
 
 	actual := ContactInfo{}
 	err = json.Unmarshal([]byte(contactInfoJSON), &actual)

diff --git a/expander.go b/expander.go
@@ -15,8 +15,9 @@
 package spec
 
 import (
-	"encoding/json"
 	"fmt"
+
+	json "github.com/goccy/go-json"
 )
 
 // ExpandOptions provides options for the spec expander.

diff --git a/expander_test.go b/expander_test.go
@@ -15,7 +15,6 @@
 package spec
 
 import (
-	"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"
 )

diff --git a/go.mod b/go.mod
@@ -4,6 +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/goccy/go-json v0.10.2
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/yaml.v3 v3.0.1
 )

diff --git a/go.sum b/go.sum
@@ -6,6 +6,8 @@ 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/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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

diff --git a/header.go b/header.go
@@ -15,11 +15,11 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"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
@@ -15,10 +15,10 @@
 package spec
 
 import (
-	"encoding/json"
 	"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,14 +1,14 @@
 package spec_test
 
 import (
-	"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"
 )

diff --git a/helpers_test.go b/helpers_test.go
@@ -1,13 +1,13 @@
 package spec
 
 import (
-	"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"
 )

diff --git a/info.go b/info.go
@@ -15,12 +15,12 @@
 package spec
 
 import (
-	"encoding/json"
 	"strconv"
 	"strings"
 
 	"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
@@ -15,9 +15,9 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -57,9 +57,9 @@ var info = Info{
 }
 
 func TestIntegrationInfo_Serialize(t *testing.T) {
-	b, err := json.MarshalIndent(info, "", "\t")
+	b, err := json.MarshalIndent(info, "", " ")
 	require.NoError(t, err)
-	assert.Equal(t, infoJSON, string(b))
+	assert.JSONEq(t, infoJSON, string(b))
 }
 
 func TestIntegrationInfo_Deserialize(t *testing.T) {

diff --git a/items.go b/items.go
@@ -15,11 +15,11 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"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
@@ -15,10 +15,10 @@
 package spec
 
 import (
-	"encoding/json"
 	"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
@@ -15,9 +15,8 @@
 package spec
 
 import (
-	"encoding/json"
-
 	"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
@@ -15,9 +15,9 @@
 package spec
 
 import (
-	"encoding/json"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -36,9 +36,9 @@ func TestIntegrationLicense(t *testing.T) {
 
 	// const licenseYAML = "name: the name\nurl: the url\n"
 
-	b, err := json.MarshalIndent(license, "", "\t")
+	b, err := json.MarshalIndent(license, "", " ")
 	require.NoError(t, err)
-	assert.Equal(t, licenseJSON, string(b))
+	assert.JSONEq(t, licenseJSON, string(b))
 
 	actual := License{}
 	err = json.Unmarshal([]byte(licenseJSON), &actual)

diff --git a/operation.go b/operation.go
@@ -17,11 +17,11 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"sort"
 
 	"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
@@ -17,9 +17,9 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"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
@@ -15,11 +15,11 @@
 package spec
 
 import (
-	"encoding/json"
 	"strings"
 
 	"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
@@ -15,10 +15,10 @@
 package spec
 
 import (
-	"encoding/json"
 	"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
@@ -15,10 +15,9 @@
 package spec
 
 import (
-	"encoding/json"
-
 	"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
@@ -15,9 +15,9 @@
 package spec
 
 import (
-	"encoding/json"
 	"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
@@ -15,11 +15,11 @@
 package spec
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 
 	"github.com/go-openapi/swag"
+	json "github.com/goccy/go-json"
 )
 
 // Paths holds the relative paths to the individual endpoints.

diff --git a/paths_test.go b/paths_test.go
@@ -15,9 +15,9 @@
 package spec
 
 import (
-	"encoding/json"
 	"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
@@ -2,9 +2,10 @@ package spec
 
 import (
 	"bytes"
-	"encoding/json"
 	"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
@@ -17,12 +17,12 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"net/http"
 	"os"
 	"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
@@ -17,9 +17,9 @@ package spec
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"testing"
 
+	json "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )