From 643cd81677b024c8657340a49441dcfb4e7c781c Mon Sep 17 00:00:00 2001 From: John Wang Date: Sun, 19 Nov 2023 22:04:00 -0800 Subject: [PATCH] refactor: `encoding/jsonutil`: move `github.com/buger/jsonparser` support to `mogox` --- encoding/jsonutil/jsonparserutil.go | 43 ----------------------------- go.mod | 1 - go.sum | 2 -- 3 files changed, 46 deletions(-) delete mode 100644 encoding/jsonutil/jsonparserutil.go diff --git a/encoding/jsonutil/jsonparserutil.go b/encoding/jsonutil/jsonparserutil.go deleted file mode 100644 index bd0dad10..00000000 --- a/encoding/jsonutil/jsonparserutil.go +++ /dev/null @@ -1,43 +0,0 @@ -package jsonutil - -import ( - "encoding/json" - "fmt" - "strconv" - - "github.com/buger/jsonparser" -) - -func JSONParserGetArrayIntOneOnly(data []byte, key string) (int, error) { - values, err := JSONParserGetArrayString(data, key) - if err != nil { - return -1, err - } - if len(values) != 1 { - return -1, fmt.Errorf("expecting 1 value, got [%v] values", len(values)) - } - valueString := values[0] - valueInt, err := strconv.Atoi(valueString) - return valueInt, err -} - -func JSONParserGetArrayStringOneOnly(data []byte, key string) (string, error) { - values, err := JSONParserGetArrayString(data, key) - if err != nil { - return "", err - } - if len(values) != 1 { - return "", fmt.Errorf("expecting 1 value, got [%v] values", len(values)) - } - return values[0], nil -} - -func JSONParserGetArrayString(data []byte, key string) ([]string, error) { - strs := []string{} - value, _, _, err := jsonparser.Get(data, key) - if err != nil { - return strs, err - } - err = json.Unmarshal(value, &strs) - return strs, err -} diff --git a/go.mod b/go.mod index f242ecc5..f00c83f4 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ go 1.21 require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c - github.com/buger/jsonparser v1.1.1 github.com/caarlos0/env/v6 v6.10.1 github.com/google/go-querystring v1.1.0 github.com/grokify/base36 v1.0.5 diff --git a/go.sum b/go.sum index 2132970c..f65c11bf 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,6 @@ github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II= github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=