Replace JSON stdlib with Sonnet for better performance

api/ssi_types_test.go

@@ -19,7 +19,7 @@
 package ssiTypes
 
 import (
-	"encoding/json"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"

audit/audit.go

@@ -21,8 +21,8 @@ package audit
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/sirupsen/logrus"
 	"strings"
 	"sync"

auth/api/auth/v1/api.go

@@ -20,10 +20,10 @@ package v1
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/audit"
 	"github.com/nuts-foundation/nuts-node/auth/oauth"
+	"github.com/nuts-foundation/nuts-node/json"
 	"net/http"
 	"net/url"
 	"regexp"

auth/api/iam/api.go

@@ -26,10 +26,10 @@ import (
 	"embed"
 	"encoding/base64"
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/core/to"
+	"github.com/nuts-foundation/nuts-node/json"
 	"html/template"
 	"net/http"
 	"net/url"

auth/api/iam/api_test.go

@@ -21,9 +21,9 @@ package iam
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/nuts-foundation/nuts-node/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -639,7 +639,7 @@ func TestWrapper_IntrospectAccessToken(t *testing.T) {
 		// token is invalid JSON
 		require.NoError(t, ctx.client.accessTokenServerStore().Put("err", "{"))
 		res, err := ctx.client.IntrospectAccessToken(reqCtx, IntrospectAccessTokenRequestObject{Body: &TokenIntrospectionRequest{Token: "err"}})
-		assert.ErrorContains(t, err, "json: cannot unmarshal")
+		assert.ErrorContains(t, err, "sonnet: cannot unmarshal")
 		assert.Nil(t, res)
 	})
 	t.Run("error - does not exist", func(t *testing.T) {
@@ -1469,7 +1469,7 @@ func TestWrapper_subjectOwns(t *testing.T) {
 }
 
 func TestWrapper_accessTokenRequestCacheKey(t *testing.T) {
-	expected := "080c4170aa372da86b76c6b5db2c3c08a532c7c8454b5d2f3fb0e1d239e59758"
+	expected := "0ab3c494cd634278b5a9b8ba0d84486b0cb0b4686bed86fdfb3b77d662f66175"
 	key := accessTokenRequestCacheKey(RequestServiceAccessTokenRequestObject{SubjectID: holderSubjectID, Body: &RequestServiceAccessTokenJSONRequestBody{Scope: "test"}})
 	other := accessTokenRequestCacheKey(RequestServiceAccessTokenRequestObject{SubjectID: holderSubjectID, Body: &RequestServiceAccessTokenJSONRequestBody{Scope: "test2"}})
 

auth/api/iam/codegen_sillyness.go

@@ -18,7 +18,7 @@
 
 package iam
 
-import "encoding/json"
+import "github.com/nuts-foundation/nuts-node/json"
 
 var _ json.Marshaler = IntrospectAccessToken200JSONResponse{}
 

auth/api/iam/codegen_sillyness_test.go

@@ -19,7 +19,7 @@
 package iam
 
 import (
-	"encoding/json"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

auth/api/iam/openid4vci.go

@@ -20,9 +20,9 @@ package iam
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/nuts-foundation/nuts-node/json"
 	"net/http"
 	"net/url"
 	"time"

auth/api/iam/openid4vp.go

@@ -20,10 +20,10 @@ package iam
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/http/user"
+	"github.com/nuts-foundation/nuts-node/json"
 	"net/http"
 	"net/url"
 	"slices"

auth/api/iam/openid4vp_test.go

@@ -20,8 +20,8 @@ package iam
 
 import (
 	"context"
-	"encoding/json"
 	"github.com/nuts-foundation/nuts-node/http/user"
+	"github.com/nuts-foundation/nuts-node/json"
 	"net/http"
 	"net/url"
 	"strings"

auth/api/iam/s2s_vptoken_test.go

@@ -23,9 +23,9 @@ import (
 	"crypto/ecdsa"
 	"crypto/elliptic"
 	"crypto/rand"
-	"encoding/json"
 	"errors"
 	"github.com/nuts-foundation/nuts-node/auth/oauth"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/policy"
 	"go.uber.org/mock/gomock"
 	"net/http"

auth/api/iam/session_test.go

@@ -19,7 +19,7 @@
 package iam
 
 import (
-	"encoding/json"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vcr/pe"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

auth/client/iam/client.go

@@ -21,12 +21,12 @@ package iam
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/lestrrat-go/jwx/v2/jws"
 	"github.com/lestrrat-go/jwx/v2/jwt"
 	"github.com/nuts-foundation/nuts-node/crypto"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"io"
 	"net/http"

auth/client/iam/client_test.go

@@ -22,13 +22,13 @@ import (
 	"context"
 	"crypto"
 	"crypto/ecdsa"
-	"encoding/json"
 	"github.com/google/uuid"
 	"github.com/lestrrat-go/jwx/v2/jws"
 	"github.com/nuts-foundation/go-did/did"
 	"github.com/nuts-foundation/nuts-node/audit"
 	nutsCrypto "github.com/nuts-foundation/nuts-node/crypto"
 	test2 "github.com/nuts-foundation/nuts-node/crypto/test"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"net/http"
 	"net/http/httptest"
@@ -193,7 +193,7 @@ func TestHTTPClient_AccessToken(t *testing.T) {
 		_, err := client.AccessToken(ctx, tlsServer.URL, data, dpopHeader)
 
 		require.Error(t, err)
-		assert.EqualError(t, err, "unable to unmarshal response: invalid character '}' looking for beginning of value, }")
+		assert.EqualError(t, err, "unable to unmarshal response: sonnet: invalid character '}' looking for beginning of value, }")
 	})
 
 }

auth/client/iam/openid4vp.go

@@ -21,10 +21,10 @@ package iam
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/http/client"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vcr/credential"
 	"github.com/nuts-foundation/nuts-node/vdr/didsubject"
 	"github.com/piprate/json-gold/ld"

auth/client/iam/openid4vp_test.go

@@ -21,10 +21,10 @@ package iam
 import (
 	"context"
 	"crypto/tls"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/http/client"
+	"github.com/nuts-foundation/nuts-node/json"
 	test2 "github.com/nuts-foundation/nuts-node/test"
 	"github.com/nuts-foundation/nuts-node/vcr/credential"
 	"github.com/nuts-foundation/nuts-node/vdr/didsubject"
@@ -393,7 +393,7 @@ func TestRelyingParty_RequestRFC021AccessToken(t *testing.T) {
 
 		require.Error(t, err)
 		assert.ErrorIs(t, err, ErrBadGateway)
-		assert.ErrorContains(t, err, "unable to unmarshal response: unexpected end of JSON input")
+		assert.ErrorContains(t, err, "unable to unmarshal response: sonnet: unexpected EOF reading a byte")
 	})
 	t.Run("error - failed to build vp", func(t *testing.T) {
 		ctx := createClientServerTestContext(t)

auth/oauth/error.go

@@ -20,8 +20,8 @@ package oauth
 
 import (
 	"bytes"
-	"encoding/json"
 	"errors"
+	"github.com/nuts-foundation/nuts-node/json"
 	"html/template"
 	"net/http"
 	"net/url"

auth/oauth/types.go

@@ -20,9 +20,9 @@
 package oauth
 
 import (
-	"encoding/json"
 	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/nuts-foundation/nuts-node/core"
+	"github.com/nuts-foundation/nuts-node/json"
 	"net/url"
 )
 

auth/oauth/types_test.go

@@ -19,8 +19,8 @@
 package oauth
 
 import (
-	"encoding/json"
 	"github.com/nuts-foundation/nuts-node/core/to"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"

auth/services/dummy/dummy.go

@@ -22,9 +22,9 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/nuts-foundation/nuts-node/json"
 	"time"
 
 	ssi "github.com/nuts-foundation/go-did"

auth/services/irma/irmacontract.go

@@ -20,9 +20,9 @@ package irma
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/nuts-foundation/nuts-node/json"
 	"strings"
 	"time"
 

auth/services/irma/signer.go

@@ -21,11 +21,11 @@ package irma
 import (
 	"context"
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/nuts-foundation/nuts-node/core"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/sirupsen/logrus"
 	"net/http"
 	"os"

auth/services/messages.go

@@ -19,7 +19,7 @@
 package services
 
 import (
-	"encoding/json"
+	"github.com/nuts-foundation/nuts-node/json"
 
 	"github.com/nuts-foundation/go-did/vc"
 	irma "github.com/privacybydesign/irmago"

auth/services/messages_test.go

@@ -19,7 +19,7 @@
 package services
 
 import (
-	"encoding/json"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/stretchr/testify/require"
 	"testing"
 

auth/services/notary/notary_test.go

@@ -20,8 +20,8 @@ package notary
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"testing"
 	"time"

auth/services/oauth/authz_server.go

@@ -21,9 +21,9 @@ package oauth
 import (
 	"context"
 	"crypto"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/nuts-foundation/nuts-node/json"
 	"time"
 
 	"github.com/lestrrat-go/jwx/v2/jwt"

auth/services/oauth/authz_server_test.go

@@ -24,10 +24,10 @@ import (
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/rsa"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/audit"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"testing"
 	"time"

auth/services/selfsigned/signer.go

@@ -22,7 +22,6 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
 	ssi "github.com/nuts-foundation/go-did"
 	"github.com/nuts-foundation/go-did/did"
@@ -32,6 +31,7 @@ import (
 	"github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types"
 	"github.com/nuts-foundation/nuts-node/auth/services/selfsigned/web"
 	"github.com/nuts-foundation/nuts-node/core"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vcr"
 	"github.com/nuts-foundation/nuts-node/vcr/credential"
 	"github.com/nuts-foundation/nuts-node/vcr/holder"

auth/services/selfsigned/signer_test.go

@@ -20,14 +20,14 @@ package selfsigned
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	ssi "github.com/nuts-foundation/go-did"
 	"github.com/nuts-foundation/go-did/did"
 	"github.com/nuts-foundation/go-did/vc"
 	"github.com/nuts-foundation/nuts-node/auth/contract"
 	"github.com/nuts-foundation/nuts-node/auth/services"
 	"github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vcr"
 	"github.com/nuts-foundation/nuts-node/vcr/holder"
 	"github.com/nuts-foundation/nuts-node/vcr/issuer"

auth/services/selfsigned/test/generate_test.go

@@ -20,10 +20,10 @@ package test
 
 import (
 	"context"
-	"encoding/json"
 	"github.com/nuts-foundation/nuts-node/audit"
 	"github.com/nuts-foundation/nuts-node/crypto"
 	"github.com/nuts-foundation/nuts-node/crypto/util"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/jsonld"
 	"github.com/nuts-foundation/nuts-node/storage/orm"
 	"github.com/nuts-foundation/nuts-node/vcr/signature"

auth/services/selfsigned/types.go

@@ -19,9 +19,9 @@
 package selfsigned
 
 import (
-	"encoding/json"
 	"errors"
 	"github.com/nuts-foundation/go-did/vc"
+	"github.com/nuts-foundation/nuts-node/json"
 )
 
 // ContractFormat is the contract format type

auth/services/selfsigned/types/types.go

@@ -20,7 +20,7 @@ package types
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/nuts-foundation/nuts-node/json"
 	"github.com/nuts-foundation/nuts-node/vcr/credential"
 	"strings"
 	"time"