marshal URLs using jsonutil

MarkRosemaker · Dec 24, 2024 · 91bac37 · 91bac37
1 parent d47e3d8
commit 91bac37
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 147 deletions.
diff --git a/internal/json/opts.go b/internal/json/opts.go
@@ -1,6 +1,7 @@
 package json
 
 import (
+	"github.com/MarkRosemaker/jsonutil"
 	"github.com/go-json-experiment/json"
 	"github.com/go-json-experiment/json/jsontext"
 )
@@ -9,7 +10,7 @@ var Options = json.JoinOptions([]json.Options{
 	// unevaluatedProperties is set to false in most objects according to the OpenAPI specification
 	// also protect against deleting unknown fields when overwriting later
 	json.RejectUnknownMembers(true),
-	json.WithMarshalers(URLMarshal),
-	json.WithUnmarshalers(URLUnmarshal),
+	json.WithMarshalers(json.NewMarshalers(json.MarshalFuncV2(jsonutil.URLMarshal))),
+	json.WithUnmarshalers(json.NewUnmarshalers(json.UnmarshalFuncV2(jsonutil.URLUnmarshal))),
 	jsontext.WithIndent("  "), // indent with two spaces
 }...)
diff --git a/internal/json/url.go b/internal/json/url.go
diff --git a/internal/json/url_test.go b/internal/json/url_test.go