From 5fc2b15b2afeb2fe98aecce7615f226a6a935f9c Mon Sep 17 00:00:00 2001 From: dapeng Date: Wed, 6 Nov 2024 16:08:22 +0800 Subject: [PATCH 1/7] feat: Add Default Preparer for new code directory structure --- example/use_default/README.md | 7 +++ example/use_default/go.mod | 43 +++++++++++++++++++ example/use_default/import.gone.go | 8 ++++ example/use_default/internal/food/food.go | 11 +++++ .../use_default/internal/food/init.gone.go | 9 ++++ .../use_default/internal/user/init.gone.go | 12 ++++++ example/use_default/internal/user/session.go | 15 +++++++ example/use_default/internal/user/user.go | 11 +++++ example/use_default/main.go | 19 ++++++++ example/use_default/service/i_food.go | 5 +++ example/use_default/service/i_session.go | 6 +++ example/use_default/service/i_user.go | 5 +++ heaven.go | 4 ++ interface.go | 2 + prepare.go | 10 +++++ 15 files changed, 167 insertions(+) create mode 100644 example/use_default/README.md create mode 100644 example/use_default/go.mod create mode 100644 example/use_default/import.gone.go create mode 100644 example/use_default/internal/food/food.go create mode 100644 example/use_default/internal/food/init.gone.go create mode 100644 example/use_default/internal/user/init.gone.go create mode 100644 example/use_default/internal/user/session.go create mode 100644 example/use_default/internal/user/user.go create mode 100644 example/use_default/main.go create mode 100644 example/use_default/service/i_food.go create mode 100644 example/use_default/service/i_session.go create mode 100644 example/use_default/service/i_user.go diff --git a/example/use_default/README.md b/example/use_default/README.md new file mode 100644 index 0000000..98a80a8 --- /dev/null +++ b/example/use_default/README.md @@ -0,0 +1,7 @@ +# New code directory structure + +## 1. `import.gone.go` and `init.gone.go` will be generated by `gonectr` automatically + +## 2. `init.gone.go` is responsible for loading goner module to the `gone` framework + +## 3. `import.gone.go` is responsible for importing all packages which contain goner module in the project \ No newline at end of file diff --git a/example/use_default/go.mod b/example/use_default/go.mod new file mode 100644 index 0000000..3429c6d --- /dev/null +++ b/example/use_default/go.mod @@ -0,0 +1,43 @@ +module use_default + +go 1.22.2 + +require github.com/gone-io/gone v1.0.9 + +require ( + github.com/bytedance/sonic v1.10.2 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect + github.com/chenzhuoyu/iasm v0.9.1 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gin-gonic/gin v1.9.1 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.17.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect + github.com/leodido/go-urn v1.3.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/soheilhy/cmux v0.1.5 // indirect + github.com/syndtr/goleveldb v1.0.0 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.7.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect + xorm.io/xorm v1.3.2 // indirect +) + +replace ( + github.com/gone-io/gone v1.0.9 => ../../ +) diff --git a/example/use_default/import.gone.go b/example/use_default/import.gone.go new file mode 100644 index 0000000..264c932 --- /dev/null +++ b/example/use_default/import.gone.go @@ -0,0 +1,8 @@ +// Code generated by Goner. DO NOT EDIT. + +package main + +import ( + _ "use_default/internal/food" + _ "use_default/internal/user" +) diff --git a/example/use_default/internal/food/food.go b/example/use_default/internal/food/food.go new file mode 100644 index 0000000..7826a90 --- /dev/null +++ b/example/use_default/internal/food/food.go @@ -0,0 +1,11 @@ +package food + +import "github.com/gone-io/gone" + +type iFood struct { + gone.Flag +} + +func (s *iFood) Create() error { + return nil +} diff --git a/example/use_default/internal/food/init.gone.go b/example/use_default/internal/food/init.gone.go new file mode 100644 index 0000000..da252e5 --- /dev/null +++ b/example/use_default/internal/food/init.gone.go @@ -0,0 +1,9 @@ +// Code generated by Goner. DO NOT EDIT. + +package food + +import "github.com/gone-io/gone" + +func init() { + gone.Default.Load(&iFood{}) +} diff --git a/example/use_default/internal/user/init.gone.go b/example/use_default/internal/user/init.gone.go new file mode 100644 index 0000000..ad4cd27 --- /dev/null +++ b/example/use_default/internal/user/init.gone.go @@ -0,0 +1,12 @@ +// Code generated by Goner. DO NOT EDIT. + +package user + +import "github.com/gone-io/gone" + +func init() { + gone. + Default. + Load(&iUser{}). + Load(&iSession{}) +} diff --git a/example/use_default/internal/user/session.go b/example/use_default/internal/user/session.go new file mode 100644 index 0000000..ae7c337 --- /dev/null +++ b/example/use_default/internal/user/session.go @@ -0,0 +1,15 @@ +package user + +import "github.com/gone-io/gone" + +type iSession struct { + gone.Flag +} + +func (s *iSession) Put(any) error { + return nil +} + +func (s *iSession) Get() (any, error) { + return nil, nil +} diff --git a/example/use_default/internal/user/user.go b/example/use_default/internal/user/user.go new file mode 100644 index 0000000..b4dad5d --- /dev/null +++ b/example/use_default/internal/user/user.go @@ -0,0 +1,11 @@ +package user + +import "github.com/gone-io/gone" + +type iUser struct { + gone.Flag +} + +func (s *iUser) Hello() string { + return "hello" +} diff --git a/example/use_default/main.go b/example/use_default/main.go new file mode 100644 index 0000000..6a47ab3 --- /dev/null +++ b/example/use_default/main.go @@ -0,0 +1,19 @@ +package main + +import ( + "github.com/gone-io/gone" + "use_default/service" +) + +func main() { + gone.Default.Run(func(i struct { + iFood service.IFood `gone:"*"` + iSession service.ISession `gone:"*"` + iUser service.IUser `gone:"*"` + }) { + _ = i.iSession.Put("ok") + _ = i.iFood.Create() + hello := i.iUser.Hello() + println(hello) + }) +} diff --git a/example/use_default/service/i_food.go b/example/use_default/service/i_food.go new file mode 100644 index 0000000..710501d --- /dev/null +++ b/example/use_default/service/i_food.go @@ -0,0 +1,5 @@ +package service + +type IFood interface { + Create() error +} diff --git a/example/use_default/service/i_session.go b/example/use_default/service/i_session.go new file mode 100644 index 0000000..a95eb4f --- /dev/null +++ b/example/use_default/service/i_session.go @@ -0,0 +1,6 @@ +package service + +type ISession interface { + Put(any) error + Get() (any, error) +} diff --git a/example/use_default/service/i_user.go b/example/use_default/service/i_user.go new file mode 100644 index 0000000..9549e88 --- /dev/null +++ b/example/use_default/service/i_user.go @@ -0,0 +1,5 @@ +package service + +type IUser interface { + Hello() string +} diff --git a/heaven.go b/heaven.go index 9dd395f..496242d 100644 --- a/heaven.go +++ b/heaven.go @@ -47,6 +47,10 @@ type heaven struct { afterStopSignalWaitSecond int } +func (h *heaven) GetCemetery() Cemetery { + return h.cemetery +} + func (h *heaven) SetAfterStopSignalWaitSecond(sec int) { h.afterStopSignalWaitSecond = sec } diff --git a/interface.go b/interface.go index 362c2a1..72c39a4 100644 --- a/interface.go +++ b/interface.go @@ -127,6 +127,8 @@ type Heaven interface { AfterStop(Process) Heaven SetAfterStopSignalWaitSecond(sec int) + + GetCemetery() Cemetery } type AfterReviveError error diff --git a/prepare.go b/prepare.go index 260b9d5..0314a7d 100644 --- a/prepare.go +++ b/prepare.go @@ -50,6 +50,14 @@ func (p *Preparer) Serve(fns ...any) { Stop() } +func (p *Preparer) Load(goner Goner) *Preparer { + p.heaven.GetCemetery().Bury(goner) + return p +} +func (p *Preparer) Bury(goner Goner) *Preparer { + return p.Load(goner) +} + func Prepare(priests ...Priest) *Preparer { h := New(priests...) @@ -58,6 +66,8 @@ func Prepare(priests ...Priest) *Preparer { } } +var Default = Prepare() + /* Run A Gone Program； From 03e773ba918651e87d04bfb0f9835c374e4714c9 Mon Sep 17 00:00:00 2001 From: dapeng Date: Wed, 6 Nov 2024 21:01:51 +0800 Subject: [PATCH 2/7] feat: Add LoadPriest for Preparer --- prepare.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/prepare.go b/prepare.go index 0314a7d..eab81bd 100644 --- a/prepare.go +++ b/prepare.go @@ -58,6 +58,16 @@ func (p *Preparer) Bury(goner Goner) *Preparer { return p.Load(goner) } +func (p *Preparer) LoadPriest(priests ...Priest) *Preparer { + for _, priest := range priests { + err := priest(p.heaven.GetCemetery()) + if err != nil { + panic(err) + } + } + return p +} + func Prepare(priests ...Priest) *Preparer { h := New(priests...) From a7dfd754219ff2b6cda81dcc277a11c52a983a36 Mon Sep 17 00:00:00 2001 From: dapeng Date: Wed, 6 Nov 2024 21:05:30 +0800 Subject: [PATCH 3/7] feat: update packages --- example/use_default/go.mod | 14 ++++++-------- go.mod | 38 +++++++++++++++++++------------------- go.sum | 17 +++++++++++++++++ 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/example/use_default/go.mod b/example/use_default/go.mod index 3429c6d..04b35f5 100644 --- a/example/use_default/go.mod +++ b/example/use_default/go.mod @@ -28,16 +28,14 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect xorm.io/xorm v1.3.2 // indirect ) -replace ( - github.com/gone-io/gone v1.0.9 => ../../ -) +replace github.com/gone-io/gone v1.0.9 => ../../ diff --git a/go.mod b/go.mod index 138ca93..f260af4 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/gone-io/gone -go 1.21 +go 1.22.0 -toolchain go1.21.1 +toolchain go1.22.2 require ( github.com/bytedance/sonic v1.10.2 @@ -12,7 +12,7 @@ require ( github.com/golang/mock v1.6.0 github.com/gomodule/redigo v1.8.9 github.com/google/uuid v1.6.0 - github.com/imroc/req/v3 v3.43.3 + github.com/imroc/req/v3 v3.48.0 github.com/jmoiron/sqlx v1.3.5 github.com/json-iterator/go v1.1.12 github.com/jtolds/gls v4.20.0+incompatible @@ -27,7 +27,7 @@ require ( github.com/urfave/cli/v2 v2.27.2 go.uber.org/zap v1.27.0 golang.org/x/time v0.5.0 - golang.org/x/tools v0.20.0 + golang.org/x/tools v0.25.0 google.golang.org/grpc v1.63.2 gopkg.in/errgo.v2 v2.1.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -39,7 +39,7 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect @@ -49,23 +49,23 @@ require ( github.com/go-playground/validator/v10 v10.17.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -81,15 +81,15 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect ) diff --git a/go.sum b/go.sum index bf210fe..979bcbc 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,7 @@ github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI= github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -148,6 +149,7 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -194,6 +196,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/imroc/req/v3 v3.43.3 h1:WdZhpUev9THtuwEZsW2LOYacl12fm7IkB7OgACv40+k= github.com/imroc/req/v3 v3.43.3/go.mod h1:SQIz5iYop16MJxbo8ib+4LnostGCok8NQf8ToyQc2xA= +github.com/imroc/req/v3 v3.48.0/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= @@ -261,6 +264,7 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -340,6 +344,7 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= @@ -387,11 +392,14 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/quic-go v0.43.0 h1:sjtsTKWX0dsHpuMJvLxGqoQdtgJnbAPWY+W+5vjYW/g= github.com/quic-go/quic-go v0.43.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M= +github.com/quic-go/quic-go v0.47.0/go.mod h1:3bCapYsJvXGZcipOHuu7plYtaV6tnF+z7wIFsU0WK9E= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/refraction-networking/utls v1.6.4 h1:aeynTroaYn7y+mFtqv8D0bQ4bw0y9nJHneGxJ7lvRDM= github.com/refraction-networking/utls v1.6.4/go.mod h1:2VL2xfiqgFAZtJKeUTlf+PSYFs3Eu7km0gCtXJ3m8zs= +github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= @@ -525,9 +533,11 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -539,6 +549,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -561,6 +572,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -573,6 +585,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -607,6 +620,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -616,6 +630,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -640,6 +655,7 @@ golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -670,6 +686,7 @@ google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From a3b810cccd9db196aeb554d46f50320274c646c2 Mon Sep 17 00:00:00 2001 From: dapeng Date: Sat, 9 Nov 2024 10:35:04 +0800 Subject: [PATCH 4/7] feat: add interface NamedGoner for telling GoneId by `GetGonerId` function --- example/app/go.mod | 36 +++++++++--------- example/gen-code/go.mod | 14 ++++--- example/go.mod | 14 ++++--- example/go.sum | 5 +++ example/grpc/go.mod | 30 +++++++-------- example/http-server/go.mod | 36 +++++++++--------- example/use-config/go.mod | 14 ++++--- example/use-rdb/go.mod | 36 +++++++++--------- example/use-redis/go.mod | 36 +++++++++--------- example/use-schedule/go.mod | 36 +++++++++--------- example/web-mysql/go.mod | 36 +++++++++--------- example/web/go.mod | 36 +++++++++--------- go.sum | 59 ++++++++++------------------- interface.go | 4 ++ prepare.go | 6 ++- tools/gone/priest/testdata/x/go.mod | 14 ++++--- tools/gone/priest/testdata/x/go.sum | 5 +++ 17 files changed, 216 insertions(+), 201 deletions(-) diff --git a/example/app/go.mod b/example/app/go.mod index 59991c4..0995588 100644 --- a/example/app/go.mod +++ b/example/app/go.mod @@ -1,8 +1,8 @@ module github.com/gone-io/gone/example/app -go 1.21 +go 1.22.0 -toolchain go1.21.1 +toolchain go1.22.2 require ( github.com/gone-io/gone v1.0.2 @@ -14,7 +14,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect @@ -26,28 +26,28 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -58,16 +58,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/example/gen-code/go.mod b/example/gen-code/go.mod index 2d77a24..73672be 100644 --- a/example/gen-code/go.mod +++ b/example/gen-code/go.mod @@ -1,6 +1,8 @@ module gen-code -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require github.com/gone-io/gone v1.0.2 @@ -28,11 +30,11 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect xorm.io/xorm v1.3.2 // indirect diff --git a/example/go.mod b/example/go.mod index 204748c..dc4cf6f 100644 --- a/example/go.mod +++ b/example/go.mod @@ -1,6 +1,8 @@ module example -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require ( github.com/golang/mock v1.6.0 @@ -36,11 +38,11 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect xorm.io/xorm v1.3.2 // indirect diff --git a/example/go.sum b/example/go.sum index c4b865b..1ab0210 100644 --- a/example/go.sum +++ b/example/go.sum @@ -439,6 +439,7 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -473,6 +474,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -518,6 +520,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -527,6 +530,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -576,6 +580,7 @@ google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= diff --git a/example/grpc/go.mod b/example/grpc/go.mod index 7273bb6..41902c8 100644 --- a/example/grpc/go.mod +++ b/example/grpc/go.mod @@ -13,7 +13,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -24,27 +24,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -55,13 +55,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/example/http-server/go.mod b/example/http-server/go.mod index 872cf1c..c5f807b 100644 --- a/example/http-server/go.mod +++ b/example/http-server/go.mod @@ -1,8 +1,8 @@ module github.com/gone-io/gone/example/http-server -go 1.21 +go 1.22.0 -toolchain go1.21.1 +toolchain go1.22.2 require github.com/gone-io/gone v1.0.2 @@ -11,7 +11,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -22,27 +22,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -53,16 +53,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/example/use-config/go.mod b/example/use-config/go.mod index c612beb..580f8c4 100644 --- a/example/use-config/go.mod +++ b/example/use-config/go.mod @@ -1,6 +1,8 @@ module use-config -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require github.com/gone-io/gone v1.0.2 @@ -30,11 +32,11 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect xorm.io/xorm v1.3.2 // indirect diff --git a/example/use-rdb/go.mod b/example/use-rdb/go.mod index b340222..14441ac 100644 --- a/example/use-rdb/go.mod +++ b/example/use-rdb/go.mod @@ -1,6 +1,8 @@ module use-mysql -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require ( github.com/go-sql-driver/mysql v1.6.0 @@ -12,7 +14,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -23,27 +25,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -54,16 +56,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/example/use-redis/go.mod b/example/use-redis/go.mod index 9987c74..39bc09d 100644 --- a/example/use-redis/go.mod +++ b/example/use-redis/go.mod @@ -1,6 +1,8 @@ module use-redis -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require github.com/gone-io/gone v1.0.2 @@ -9,7 +11,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -20,27 +22,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -51,16 +53,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/example/use-schedule/go.mod b/example/use-schedule/go.mod index 9987c74..39bc09d 100644 --- a/example/use-schedule/go.mod +++ b/example/use-schedule/go.mod @@ -1,6 +1,8 @@ module use-redis -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require github.com/gone-io/gone v1.0.2 @@ -9,7 +11,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -20,27 +22,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -51,16 +53,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/example/web-mysql/go.mod b/example/web-mysql/go.mod index 1c0d34d..4beccd2 100644 --- a/example/web-mysql/go.mod +++ b/example/web-mysql/go.mod @@ -1,8 +1,8 @@ module web-mysql -go 1.21 +go 1.22.0 -toolchain go1.21.1 +toolchain go1.22.2 require ( github.com/go-sql-driver/mysql v1.6.0 @@ -15,7 +15,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -26,27 +26,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/syndtr/goleveldb v1.0.0 // indirect @@ -56,16 +56,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/example/web/go.mod b/example/web/go.mod index 872cf1c..c5f807b 100644 --- a/example/web/go.mod +++ b/example/web/go.mod @@ -1,8 +1,8 @@ module github.com/gone-io/gone/example/http-server -go 1.21 +go 1.22.0 -toolchain go1.21.1 +toolchain go1.22.2 require github.com/gone-io/gone v1.0.2 @@ -11,7 +11,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.4.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect @@ -22,27 +22,27 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/imroc/req/v3 v3.43.3 // indirect + github.com/imroc/req/v3 v3.48.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.17.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.43.0 // indirect - github.com/refraction-networking/utls v1.6.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.47.0 // indirect + github.com/refraction-networking/utls v1.6.7 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -53,16 +53,16 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect diff --git a/go.sum b/go.sum index 979bcbc..08870f4 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,7 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI= -github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= @@ -97,8 +96,8 @@ github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgO github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -147,8 +146,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ= github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -194,8 +192,7 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/imroc/req/v3 v3.43.3 h1:WdZhpUev9THtuwEZsW2LOYacl12fm7IkB7OgACv40+k= -github.com/imroc/req/v3 v3.43.3/go.mod h1:SQIz5iYop16MJxbo8ib+4LnostGCok8NQf8ToyQc2xA= +github.com/imroc/req/v3 v3.48.0 h1:IYuMGetuwLzOOTzDCquDqs912WNwpsPK0TBXWPIvoqg= github.com/imroc/req/v3 v3.48.0/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= @@ -262,8 +259,7 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= @@ -342,12 +338,11 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= @@ -390,15 +385,12 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= -github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= -github.com/quic-go/quic-go v0.43.0 h1:sjtsTKWX0dsHpuMJvLxGqoQdtgJnbAPWY+W+5vjYW/g= -github.com/quic-go/quic-go v0.43.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M= +github.com/quic-go/quic-go v0.47.0 h1:yXs3v7r2bm1wmPTYNLKAAJTHMYkPEsfYJmTazXrCZ7Y= github.com/quic-go/quic-go v0.47.0/go.mod h1:3bCapYsJvXGZcipOHuu7plYtaV6tnF+z7wIFsU0WK9E= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/refraction-networking/utls v1.6.4 h1:aeynTroaYn7y+mFtqv8D0bQ4bw0y9nJHneGxJ7lvRDM= -github.com/refraction-networking/utls v1.6.4/go.mod h1:2VL2xfiqgFAZtJKeUTlf+PSYFs3Eu7km0gCtXJ3m8zs= +github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= @@ -531,12 +523,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -547,8 +537,7 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -570,8 +559,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -583,8 +571,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -618,8 +605,7 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -628,8 +614,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -653,8 +638,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -684,8 +668,7 @@ google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/interface.go b/interface.go index 72c39a4..ffff680 100644 --- a/interface.go +++ b/interface.go @@ -268,3 +268,7 @@ type Configure interface { //Get the value from config system Get(key string, v any, defaultVal string) error } + +type NamedGoner interface { + GetGonerId() GonerId +} diff --git a/prepare.go b/prepare.go index eab81bd..d357611 100644 --- a/prepare.go +++ b/prepare.go @@ -51,7 +51,11 @@ func (p *Preparer) Serve(fns ...any) { } func (p *Preparer) Load(goner Goner) *Preparer { - p.heaven.GetCemetery().Bury(goner) + if gonerWithId, ok := goner.(NamedGoner); ok { + p.heaven.GetCemetery().Bury(goner, gonerWithId.GetGonerId()) + } else { + p.heaven.GetCemetery().Bury(goner) + } return p } func (p *Preparer) Bury(goner Goner) *Preparer { diff --git a/tools/gone/priest/testdata/x/go.mod b/tools/gone/priest/testdata/x/go.mod index 7bba422..398df2c 100644 --- a/tools/gone/priest/testdata/x/go.mod +++ b/tools/gone/priest/testdata/x/go.mod @@ -1,6 +1,8 @@ module x -go 1.21.1 +go 1.22.0 + +toolchain go1.22.2 require github.com/gone-io/gone v0.3.1 @@ -30,11 +32,11 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect xorm.io/xorm v1.3.2 // indirect diff --git a/tools/gone/priest/testdata/x/go.sum b/tools/gone/priest/testdata/x/go.sum index 2aa6680..704e7ec 100644 --- a/tools/gone/priest/testdata/x/go.sum +++ b/tools/gone/priest/testdata/x/go.sum @@ -435,6 +435,7 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -467,6 +468,7 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -510,6 +512,7 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -519,6 +522,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -567,6 +571,7 @@ google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= From f2354c0ee46d32e4f9721f74d3010b2a64083147 Mon Sep 17 00:00:00 2001 From: dapeng Date: Wed, 13 Nov 2024 18:24:46 +0800 Subject: [PATCH 5/7] feat: Use mobile `go.uber.org/mock` instead of `github.com/golang/mock` --- cemetery_test.go | 2 +- example/test/distance_calculator_test.go | 2 +- example/test/mock/i_point.go | 2 +- go.mod | 11 +- go.sum | 17 - goner/cmux/cmux_test.go | 2 +- goner/cmux/interface.go | 2 +- goner/cmux/net_Listener_mock_test.go | 49 +- goner/gin/gin_response_writer_mock_test.go | 20 +- goner/gin/gone_gin_mock_test.go | 203 ++--- goner/gin/gone_mock_test.go | 771 ++++++++++-------- goner/gin/http-injector_test.go | 2 +- goner/gin/mock_test.go | 41 +- goner/gin/net_listener_mock_test.go | 8 +- goner/gin/proxy_test.go | 2 +- goner/gin/responer_test.go | 2 +- goner/gin/router_test.go | 2 +- goner/gin/server_test.go | 2 +- goner/gin/sse_test.go | 2 +- goner/gin/sys_middleware_test.go | 2 +- goner/grpc/client_test.go | 2 +- goner/grpc/gone_mock_test.go | 771 ++++++++++-------- goner/grpc/mock_test.go | 13 +- goner/grpc/net_listener_mock_test.go | 8 +- goner/grpc/server_test.go | 2 +- goner/redis/locker_test.go | 2 +- goner/redis/mock_test.go | 74 +- goner/redis/redis_Conn_mock_test.go | 34 +- goner/schedule/mock_test.go | 11 +- goner/schedule/schedule_test.go | 2 +- goner/urllib/req_RoundTripper_mock_test.go | 10 +- goner/urllib/req_test.go | 2 +- goner/xorm/engine_mock_test.go | 552 ++++++------- goner/xorm/implement.go | 2 +- goner/xorm/implement_test.go | 2 +- goner/xorm/session_mock_test.go | 270 +++--- goner/xorm/transaction.go | 2 +- goner/xorm/transaction_test.go | 2 +- heaven_test.go | 2 +- mock_test.go | 766 +++++++++-------- templates/.gitignore | 1 - templates/f.go | 8 - templates/web+mysql/.dockerignore | 2 - templates/web+mysql/.gitignore | 3 - templates/web+mysql/Dockerfile | 35 - templates/web+mysql/Makefile | 32 - templates/web+mysql/README.md | 79 -- templates/web+mysql/cmd/server/main.go.tpl | 42 - templates/web+mysql/config/default.properties | 41 - templates/web+mysql/config/dev.properties | 1 - templates/web+mysql/config/local.properties | 4 - templates/web+mysql/config/prod.properties | 3 - templates/web+mysql/docker-compose.yaml | 31 - templates/web+mysql/go.mod.tpl | 10 - .../internal/controller/demo_ctr.go.tpl | 159 ---- .../internal/interface/domain/demo.go.tpl | 5 - .../internal/interface/domain/page.go.tpl | 12 - .../internal/interface/domain/user.go.tpl | 7 - .../internal/interface/entity/User.go.tpl | 13 - .../internal/interface/service/i_demo.go.tpl | 16 - templates/web+mysql/internal/master.go.tpl | 16 - .../internal/middleware/authorize.go.tpl | 44 - .../web+mysql/internal/middleware/pub.go.tpl | 22 - .../web+mysql/internal/module/demo/db.go.tpl | 60 -- .../internal/module/demo/demo_svc.go.tpl | 98 --- .../internal/module/demo/error.go.tpl | 10 - .../internal/module/demo/i_db.go.tpl | 12 - .../web+mysql/internal/pkg/utils/error.go.tpl | 18 - templates/web+mysql/internal/priest.go.tpl | 20 - .../internal/router/auth_router.go.tpl | 27 - .../internal/router/pub_router.go.tpl | 25 - .../web+mysql/scripts/mysql/initdb.d/user.sql | 9 - templates/web+mysql/tests/api/demo.http | 115 --- .../web+mysql/tests/api/http-client.env.json | 5 - templates/web+mysql/tests/api/user.http | 29 - templates/web/.dockerignore | 2 - templates/web/.gitignore | 2 - templates/web/Dockerfile | 35 - templates/web/Makefile | 32 - templates/web/README.md | 71 -- templates/web/cmd/server/main.go.tpl | 13 - templates/web/config/default.properties | 1 - templates/web/config/dev.properties | 1 - templates/web/config/local.properties | 2 - templates/web/config/prod.properties | 1 - templates/web/docker-compose.yaml | 11 - templates/web/go.mod.tpl | 7 - .../web/internal/controller/demo_ctr.go.tpl | 59 -- .../web/internal/interface/domain/demo.go.tpl | 5 - .../web/internal/interface/domain/user.go.tpl | 5 - .../internal/interface/service/i_demo.go.tpl | 9 - templates/web/internal/master.go.tpl | 14 - .../web/internal/middleware/authorize.go.tpl | 43 - templates/web/internal/middleware/pub.go.tpl | 22 - .../web/internal/module/demo/demo_svc.go.tpl | 27 - .../web/internal/module/demo/error.go.tpl | 11 - templates/web/internal/pkg/utils/error.go.tpl | 18 - .../web/internal/router/auth_router.go.tpl | 27 - .../web/internal/router/pub_router.go.tpl | 25 - templates/web/tests/api/demo.http | 74 -- tools/gone/.gitignore | 1 - tools/gone/Makefile | 8 - tools/gone/app/action.go | 48 -- tools/gone/app/action_test.go | 18 - tools/gone/app/app.go | 84 -- tools/gone/app/app_test.go | 49 -- tools/gone/app/testdata/.gitignore | 1 - tools/gone/app/testdata/from/sub/file.txt | 0 tools/gone/app/testdata/from/sub/x.json | 1 - tools/gone/app/testdata/from/xx.go.tpl | 0 tools/gone/main.go | 33 +- tools/gone/main_test.go | 11 - tools/gone/mock/action.go | 56 -- tools/gone/mock/action_test.go | 31 - tools/gone/mock/mock.go | 73 -- tools/gone/mock/mock_test.go | 30 - tools/gone/mock/testdata/interface.go | 7 - tools/gone/mock/testdata/mock/.gitignore | 1 - tools/gone/mock/testdata/testInterface.go | 63 -- tools/gone/priest/action.go | 116 --- tools/gone/priest/action_test.go | 65 -- tools/gone/priest/fileparse.go | 151 ---- tools/gone/priest/fileparse_test.go | 31 - tools/gone/priest/loader.go | 233 ------ tools/gone/priest/loader_test.go | 34 - tools/gone/priest/stat.go | 18 - tools/gone/priest/testdata/x/.gitignore | 2 - tools/gone/priest/testdata/x/go.mod | 43 - tools/gone/priest/testdata/x/go.sum | 716 ---------------- tools/gone/priest/testdata/x/goner.go | 18 - tools/gone/priest/testdata/x/sub/.keep | 0 tools/gone/priest/testdata/x/sub2/sub.go | 9 - tools/gone/priest/watch.go | 79 -- 133 files changed, 2051 insertions(+), 5183 deletions(-) delete mode 100644 templates/.gitignore delete mode 100644 templates/f.go delete mode 100644 templates/web+mysql/.dockerignore delete mode 100644 templates/web+mysql/.gitignore delete mode 100644 templates/web+mysql/Dockerfile delete mode 100644 templates/web+mysql/Makefile delete mode 100644 templates/web+mysql/README.md delete mode 100644 templates/web+mysql/cmd/server/main.go.tpl delete mode 100644 templates/web+mysql/config/default.properties delete mode 100644 templates/web+mysql/config/dev.properties delete mode 100644 templates/web+mysql/config/local.properties delete mode 100644 templates/web+mysql/config/prod.properties delete mode 100644 templates/web+mysql/docker-compose.yaml delete mode 100644 templates/web+mysql/go.mod.tpl delete mode 100644 templates/web+mysql/internal/controller/demo_ctr.go.tpl delete mode 100644 templates/web+mysql/internal/interface/domain/demo.go.tpl delete mode 100644 templates/web+mysql/internal/interface/domain/page.go.tpl delete mode 100644 templates/web+mysql/internal/interface/domain/user.go.tpl delete mode 100644 templates/web+mysql/internal/interface/entity/User.go.tpl delete mode 100644 templates/web+mysql/internal/interface/service/i_demo.go.tpl delete mode 100644 templates/web+mysql/internal/master.go.tpl delete mode 100644 templates/web+mysql/internal/middleware/authorize.go.tpl delete mode 100644 templates/web+mysql/internal/middleware/pub.go.tpl delete mode 100644 templates/web+mysql/internal/module/demo/db.go.tpl delete mode 100644 templates/web+mysql/internal/module/demo/demo_svc.go.tpl delete mode 100644 templates/web+mysql/internal/module/demo/error.go.tpl delete mode 100644 templates/web+mysql/internal/module/demo/i_db.go.tpl delete mode 100644 templates/web+mysql/internal/pkg/utils/error.go.tpl delete mode 100644 templates/web+mysql/internal/priest.go.tpl delete mode 100644 templates/web+mysql/internal/router/auth_router.go.tpl delete mode 100644 templates/web+mysql/internal/router/pub_router.go.tpl delete mode 100644 templates/web+mysql/scripts/mysql/initdb.d/user.sql delete mode 100644 templates/web+mysql/tests/api/demo.http delete mode 100644 templates/web+mysql/tests/api/http-client.env.json delete mode 100644 templates/web+mysql/tests/api/user.http delete mode 100644 templates/web/.dockerignore delete mode 100644 templates/web/.gitignore delete mode 100644 templates/web/Dockerfile delete mode 100644 templates/web/Makefile delete mode 100644 templates/web/README.md delete mode 100644 templates/web/cmd/server/main.go.tpl delete mode 100644 templates/web/config/default.properties delete mode 100644 templates/web/config/dev.properties delete mode 100644 templates/web/config/local.properties delete mode 100644 templates/web/config/prod.properties delete mode 100644 templates/web/docker-compose.yaml delete mode 100644 templates/web/go.mod.tpl delete mode 100644 templates/web/internal/controller/demo_ctr.go.tpl delete mode 100644 templates/web/internal/interface/domain/demo.go.tpl delete mode 100644 templates/web/internal/interface/domain/user.go.tpl delete mode 100644 templates/web/internal/interface/service/i_demo.go.tpl delete mode 100644 templates/web/internal/master.go.tpl delete mode 100644 templates/web/internal/middleware/authorize.go.tpl delete mode 100644 templates/web/internal/middleware/pub.go.tpl delete mode 100644 templates/web/internal/module/demo/demo_svc.go.tpl delete mode 100644 templates/web/internal/module/demo/error.go.tpl delete mode 100644 templates/web/internal/pkg/utils/error.go.tpl delete mode 100644 templates/web/internal/router/auth_router.go.tpl delete mode 100644 templates/web/internal/router/pub_router.go.tpl delete mode 100644 templates/web/tests/api/demo.http delete mode 100644 tools/gone/.gitignore delete mode 100644 tools/gone/Makefile delete mode 100644 tools/gone/app/action.go delete mode 100644 tools/gone/app/action_test.go delete mode 100644 tools/gone/app/app.go delete mode 100644 tools/gone/app/app_test.go delete mode 100644 tools/gone/app/testdata/.gitignore delete mode 100644 tools/gone/app/testdata/from/sub/file.txt delete mode 100644 tools/gone/app/testdata/from/sub/x.json delete mode 100644 tools/gone/app/testdata/from/xx.go.tpl delete mode 100644 tools/gone/main_test.go delete mode 100644 tools/gone/mock/action.go delete mode 100644 tools/gone/mock/action_test.go delete mode 100644 tools/gone/mock/mock.go delete mode 100644 tools/gone/mock/mock_test.go delete mode 100644 tools/gone/mock/testdata/interface.go delete mode 100644 tools/gone/mock/testdata/mock/.gitignore delete mode 100644 tools/gone/mock/testdata/testInterface.go delete mode 100644 tools/gone/priest/action.go delete mode 100644 tools/gone/priest/action_test.go delete mode 100644 tools/gone/priest/fileparse.go delete mode 100644 tools/gone/priest/fileparse_test.go delete mode 100644 tools/gone/priest/loader.go delete mode 100644 tools/gone/priest/loader_test.go delete mode 100644 tools/gone/priest/stat.go delete mode 100644 tools/gone/priest/testdata/x/.gitignore delete mode 100644 tools/gone/priest/testdata/x/go.mod delete mode 100644 tools/gone/priest/testdata/x/go.sum delete mode 100644 tools/gone/priest/testdata/x/goner.go delete mode 100644 tools/gone/priest/testdata/x/sub/.keep delete mode 100644 tools/gone/priest/testdata/x/sub2/sub.go delete mode 100644 tools/gone/priest/watch.go diff --git a/cemetery_test.go b/cemetery_test.go index 9b66a84..08c6f08 100644 --- a/cemetery_test.go +++ b/cemetery_test.go @@ -2,8 +2,8 @@ package gone import ( "errors" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "reflect" "testing" ) diff --git a/example/test/distance_calculator_test.go b/example/test/distance_calculator_test.go index db4485e..ddb7e94 100644 --- a/example/test/distance_calculator_test.go +++ b/example/test/distance_calculator_test.go @@ -2,9 +2,9 @@ package test import ( "example/test/mock" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" ) diff --git a/example/test/mock/i_point.go b/example/test/mock/i_point.go index a3cc5e1..c7cca19 100644 --- a/example/test/mock/i_point.go +++ b/example/test/mock/i_point.go @@ -8,7 +8,7 @@ import ( goneMock "github.com/gone-io/gone" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockIPoint is a mock of IPoint interface. diff --git a/go.mod b/go.mod index f260af4..808058f 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,8 @@ toolchain go1.22.2 require ( github.com/bytedance/sonic v1.10.2 - github.com/fsnotify/fsnotify v1.7.0 github.com/gin-gonic/gin v1.9.1 github.com/goccy/go-json v0.10.2 - github.com/golang/mock v1.6.0 github.com/gomodule/redigo v1.8.9 github.com/google/uuid v1.6.0 github.com/imroc/req/v3 v3.48.0 @@ -24,10 +22,9 @@ require ( github.com/soheilhy/cmux v0.1.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - github.com/urfave/cli/v2 v2.27.2 + go.uber.org/mock v0.4.0 go.uber.org/zap v1.27.0 golang.org/x/time v0.5.0 - golang.org/x/tools v0.25.0 google.golang.org/grpc v1.63.2 gopkg.in/errgo.v2 v2.1.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -40,8 +37,8 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/cloudflare/circl v1.4.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -66,7 +63,6 @@ require ( github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.47.0 // indirect github.com/refraction-networking/utls v1.6.7 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect @@ -77,8 +73,6 @@ require ( github.com/syndtr/goleveldb v1.0.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect - go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.7.0 // indirect golang.org/x/crypto v0.27.0 // indirect @@ -88,6 +82,7 @@ require ( golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/text v0.18.0 // indirect + golang.org/x/tools v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 08870f4..428fe4f 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,6 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -126,8 +124,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -404,8 +400,6 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= @@ -472,13 +466,8 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI= -github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= -github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -536,7 +525,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -558,7 +546,6 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -570,7 +557,6 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -597,8 +583,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -637,7 +621,6 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/goner/cmux/cmux_test.go b/goner/cmux/cmux_test.go index f4ad8df..84d0087 100644 --- a/goner/cmux/cmux_test.go +++ b/goner/cmux/cmux_test.go @@ -2,10 +2,10 @@ package cmux import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" Cmux "github.com/soheilhy/cmux" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "net" "testing" ) diff --git a/goner/cmux/interface.go b/goner/cmux/interface.go index 72eb0ff..baba695 100644 --- a/goner/cmux/interface.go +++ b/goner/cmux/interface.go @@ -4,7 +4,7 @@ import ( "github.com/gone-io/gone" ) -//go:generate sh -c "mockgen -package=cmux net Listener,Conn > net_Listener_mock_test.go" +//go:generate mockgen -package=cmux -destination=./net_Listener_mock_test.go net Listener,Conn // Server cumx 服务，用于复用同一端口监听多种协议，参考文档：https://pkg.go.dev/github.com/soheilhy/cmux type Server = gone.CMuxServer diff --git a/goner/cmux/net_Listener_mock_test.go b/goner/cmux/net_Listener_mock_test.go index 0d0ff54..e2f46c2 100644 --- a/goner/cmux/net_Listener_mock_test.go +++ b/goner/cmux/net_Listener_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: net (interfaces: Listener,Conn) +// +// Generated by this command: +// +// mockgen -package=cmux -destination=./net_Listener_mock_test.go net Listener,Conn +// // Package cmux is a generated GoMock package. package cmux @@ -9,13 +14,14 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockListener is a mock of Listener interface. type MockListener struct { ctrl *gomock.Controller recorder *MockListenerMockRecorder + isgomock struct{} } // MockListenerMockRecorder is the mock recorder for MockListener. @@ -82,6 +88,7 @@ func (mr *MockListenerMockRecorder) Close() *gomock.Call { type MockConn struct { ctrl *gomock.Controller recorder *MockConnMockRecorder + isgomock struct{} } // MockConnMockRecorder is the mock recorder for MockConn. @@ -130,18 +137,18 @@ func (mr *MockConnMockRecorder) LocalAddr() *gomock.Call { } // Read mocks base method. -func (m *MockConn) Read(arg0 []byte) (int, error) { +func (m *MockConn) Read(b []byte) (int, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Read", arg0) + ret := m.ctrl.Call(m, "Read", b) ret0, _ := ret[0].(int) ret1, _ := ret[1].(error) return ret0, ret1 } // Read indicates an expected call of Read. -func (mr *MockConnMockRecorder) Read(arg0 interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) Read(b any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockConn)(nil).Read), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockConn)(nil).Read), b) } // RemoteAddr mocks base method. @@ -159,58 +166,58 @@ func (mr *MockConnMockRecorder) RemoteAddr() *gomock.Call { } // SetDeadline mocks base method. -func (m *MockConn) SetDeadline(arg0 time.Time) error { +func (m *MockConn) SetDeadline(t time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetDeadline", arg0) + ret := m.ctrl.Call(m, "SetDeadline", t) ret0, _ := ret[0].(error) return ret0 } // SetDeadline indicates an expected call of SetDeadline. -func (mr *MockConnMockRecorder) SetDeadline(arg0 interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) SetDeadline(t any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDeadline", reflect.TypeOf((*MockConn)(nil).SetDeadline), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDeadline", reflect.TypeOf((*MockConn)(nil).SetDeadline), t) } // SetReadDeadline mocks base method. -func (m *MockConn) SetReadDeadline(arg0 time.Time) error { +func (m *MockConn) SetReadDeadline(t time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetReadDeadline", arg0) + ret := m.ctrl.Call(m, "SetReadDeadline", t) ret0, _ := ret[0].(error) return ret0 } // SetReadDeadline indicates an expected call of SetReadDeadline. -func (mr *MockConnMockRecorder) SetReadDeadline(arg0 interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) SetReadDeadline(t any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetReadDeadline", reflect.TypeOf((*MockConn)(nil).SetReadDeadline), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetReadDeadline", reflect.TypeOf((*MockConn)(nil).SetReadDeadline), t) } // SetWriteDeadline mocks base method. -func (m *MockConn) SetWriteDeadline(arg0 time.Time) error { +func (m *MockConn) SetWriteDeadline(t time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetWriteDeadline", arg0) + ret := m.ctrl.Call(m, "SetWriteDeadline", t) ret0, _ := ret[0].(error) return ret0 } // SetWriteDeadline indicates an expected call of SetWriteDeadline. -func (mr *MockConnMockRecorder) SetWriteDeadline(arg0 interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) SetWriteDeadline(t any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWriteDeadline", reflect.TypeOf((*MockConn)(nil).SetWriteDeadline), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWriteDeadline", reflect.TypeOf((*MockConn)(nil).SetWriteDeadline), t) } // Write mocks base method. -func (m *MockConn) Write(arg0 []byte) (int, error) { +func (m *MockConn) Write(b []byte) (int, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Write", arg0) + ret := m.ctrl.Call(m, "Write", b) ret0, _ := ret[0].(int) ret1, _ := ret[1].(error) return ret0, ret1 } // Write indicates an expected call of Write. -func (mr *MockConnMockRecorder) Write(arg0 interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) Write(b any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Write", reflect.TypeOf((*MockConn)(nil).Write), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Write", reflect.TypeOf((*MockConn)(nil).Write), b) } diff --git a/goner/gin/gin_response_writer_mock_test.go b/goner/gin/gin_response_writer_mock_test.go index 1bcc78d..15f80fd 100644 --- a/goner/gin/gin_response_writer_mock_test.go +++ b/goner/gin/gin_response_writer_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/gin-gonic/gin (interfaces: ResponseWriter) +// +// Generated by this command: +// +// mockgen -package=gin github.com/gin-gonic/gin ResponseWriter +// // Package gin is a generated GoMock package. package gin @@ -10,13 +15,14 @@ import ( http "net/http" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockResponseWriter is a mock of ResponseWriter interface. type MockResponseWriter struct { ctrl *gomock.Controller recorder *MockResponseWriterMockRecorder + isgomock struct{} } // MockResponseWriterMockRecorder is the mock recorder for MockResponseWriter. @@ -144,21 +150,21 @@ func (m *MockResponseWriter) Write(arg0 []byte) (int, error) { } // Write indicates an expected call of Write. -func (mr *MockResponseWriterMockRecorder) Write(arg0 interface{}) *gomock.Call { +func (mr *MockResponseWriterMockRecorder) Write(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Write", reflect.TypeOf((*MockResponseWriter)(nil).Write), arg0) } // WriteHeader mocks base method. -func (m *MockResponseWriter) WriteHeader(arg0 int) { +func (m *MockResponseWriter) WriteHeader(statusCode int) { m.ctrl.T.Helper() - m.ctrl.Call(m, "WriteHeader", arg0) + m.ctrl.Call(m, "WriteHeader", statusCode) } // WriteHeader indicates an expected call of WriteHeader. -func (mr *MockResponseWriterMockRecorder) WriteHeader(arg0 interface{}) *gomock.Call { +func (mr *MockResponseWriterMockRecorder) WriteHeader(statusCode any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteHeader", reflect.TypeOf((*MockResponseWriter)(nil).WriteHeader), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteHeader", reflect.TypeOf((*MockResponseWriter)(nil).WriteHeader), statusCode) } // WriteHeaderNow mocks base method. @@ -183,7 +189,7 @@ func (m *MockResponseWriter) WriteString(arg0 string) (int, error) { } // WriteString indicates an expected call of WriteString. -func (mr *MockResponseWriterMockRecorder) WriteString(arg0 interface{}) *gomock.Call { +func (mr *MockResponseWriterMockRecorder) WriteString(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteString", reflect.TypeOf((*MockResponseWriter)(nil).WriteString), arg0) } diff --git a/goner/gin/gone_gin_mock_test.go b/goner/gin/gone_gin_mock_test.go index 0e0f771..8e65fd8 100644 --- a/goner/gin/gone_gin_mock_test.go +++ b/goner/gin/gone_gin_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ../../gin_interface.go +// +// Generated by this command: +// +// mockgen -package=gin -source=../../gin_interface.go +// // Package gin is a generated GoMock package. package gin @@ -9,8 +14,8 @@ import ( reflect "reflect" gin "github.com/gin-gonic/gin" - gomock "github.com/golang/mock/gomock" gone "github.com/gone-io/gone" + gomock "go.uber.org/mock/gomock" ) // MockIRoutes is a mock of IRoutes interface. @@ -18,6 +23,7 @@ type MockIRoutes struct { goneMock.Flag ctrl *gomock.Controller recorder *MockIRoutesMockRecorder + isgomock struct{} } // MockIRoutesMockRecorder is the mock recorder for MockIRoutes. @@ -40,7 +46,7 @@ func (m *MockIRoutes) EXPECT() *MockIRoutesMockRecorder { // Any mocks base method. func (m *MockIRoutes) Any(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -50,16 +56,16 @@ func (m *MockIRoutes) Any(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // Any indicates an expected call of Any. -func (mr *MockIRoutesMockRecorder) Any(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) Any(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Any", reflect.TypeOf((*MockIRoutes)(nil).Any), varargs...) } // DELETE mocks base method. func (m *MockIRoutes) DELETE(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -69,16 +75,16 @@ func (m *MockIRoutes) DELETE(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // DELETE indicates an expected call of DELETE. -func (mr *MockIRoutesMockRecorder) DELETE(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) DELETE(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DELETE", reflect.TypeOf((*MockIRoutes)(nil).DELETE), varargs...) } // GET mocks base method. func (m *MockIRoutes) GET(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -88,16 +94,16 @@ func (m *MockIRoutes) GET(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // GET indicates an expected call of GET. -func (mr *MockIRoutesMockRecorder) GET(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) GET(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GET", reflect.TypeOf((*MockIRoutes)(nil).GET), varargs...) } // HEAD mocks base method. func (m *MockIRoutes) HEAD(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -107,16 +113,16 @@ func (m *MockIRoutes) HEAD(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // HEAD indicates an expected call of HEAD. -func (mr *MockIRoutesMockRecorder) HEAD(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) HEAD(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HEAD", reflect.TypeOf((*MockIRoutes)(nil).HEAD), varargs...) } // Handle mocks base method. func (m *MockIRoutes) Handle(arg0, arg1 string, arg2 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -126,16 +132,16 @@ func (m *MockIRoutes) Handle(arg0, arg1 string, arg2 ...gone.HandlerFunc) gone.I } // Handle indicates an expected call of Handle. -func (mr *MockIRoutesMockRecorder) Handle(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) Handle(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Handle", reflect.TypeOf((*MockIRoutes)(nil).Handle), varargs...) } // OPTIONS mocks base method. func (m *MockIRoutes) OPTIONS(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -145,16 +151,16 @@ func (m *MockIRoutes) OPTIONS(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoute } // OPTIONS indicates an expected call of OPTIONS. -func (mr *MockIRoutesMockRecorder) OPTIONS(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) OPTIONS(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OPTIONS", reflect.TypeOf((*MockIRoutes)(nil).OPTIONS), varargs...) } // PATCH mocks base method. func (m *MockIRoutes) PATCH(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -164,16 +170,16 @@ func (m *MockIRoutes) PATCH(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // PATCH indicates an expected call of PATCH. -func (mr *MockIRoutesMockRecorder) PATCH(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) PATCH(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PATCH", reflect.TypeOf((*MockIRoutes)(nil).PATCH), varargs...) } // POST mocks base method. func (m *MockIRoutes) POST(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -183,16 +189,16 @@ func (m *MockIRoutes) POST(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // POST indicates an expected call of POST. -func (mr *MockIRoutesMockRecorder) POST(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) POST(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "POST", reflect.TypeOf((*MockIRoutes)(nil).POST), varargs...) } // PUT mocks base method. func (m *MockIRoutes) PUT(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -202,16 +208,16 @@ func (m *MockIRoutes) PUT(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // PUT indicates an expected call of PUT. -func (mr *MockIRoutesMockRecorder) PUT(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) PUT(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PUT", reflect.TypeOf((*MockIRoutes)(nil).PUT), varargs...) } // Use mocks base method. func (m *MockIRoutes) Use(arg0 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -221,7 +227,7 @@ func (m *MockIRoutes) Use(arg0 ...gone.HandlerFunc) gone.IRoutes { } // Use indicates an expected call of Use. -func (mr *MockIRoutesMockRecorder) Use(arg0 ...interface{}) *gomock.Call { +func (mr *MockIRoutesMockRecorder) Use(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Use", reflect.TypeOf((*MockIRoutes)(nil).Use), arg0...) } @@ -231,6 +237,7 @@ type MockIRouter struct { goneMock.Flag ctrl *gomock.Controller recorder *MockIRouterMockRecorder + isgomock struct{} } // MockIRouterMockRecorder is the mock recorder for MockIRouter. @@ -253,7 +260,7 @@ func (m *MockIRouter) EXPECT() *MockIRouterMockRecorder { // Any mocks base method. func (m *MockIRouter) Any(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -263,16 +270,16 @@ func (m *MockIRouter) Any(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // Any indicates an expected call of Any. -func (mr *MockIRouterMockRecorder) Any(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) Any(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Any", reflect.TypeOf((*MockIRouter)(nil).Any), varargs...) } // DELETE mocks base method. func (m *MockIRouter) DELETE(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -282,16 +289,16 @@ func (m *MockIRouter) DELETE(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // DELETE indicates an expected call of DELETE. -func (mr *MockIRouterMockRecorder) DELETE(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) DELETE(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DELETE", reflect.TypeOf((*MockIRouter)(nil).DELETE), varargs...) } // GET mocks base method. func (m *MockIRouter) GET(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -301,9 +308,9 @@ func (m *MockIRouter) GET(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // GET indicates an expected call of GET. -func (mr *MockIRouterMockRecorder) GET(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) GET(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GET", reflect.TypeOf((*MockIRouter)(nil).GET), varargs...) } @@ -324,7 +331,7 @@ func (mr *MockIRouterMockRecorder) GetGinRouter() *gomock.Call { // Group mocks base method. func (m *MockIRouter) Group(arg0 string, arg1 ...gone.HandlerFunc) gone.RouteGroup { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -334,16 +341,16 @@ func (m *MockIRouter) Group(arg0 string, arg1 ...gone.HandlerFunc) gone.RouteGro } // Group indicates an expected call of Group. -func (mr *MockIRouterMockRecorder) Group(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) Group(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Group", reflect.TypeOf((*MockIRouter)(nil).Group), varargs...) } // HEAD mocks base method. func (m *MockIRouter) HEAD(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -353,16 +360,16 @@ func (m *MockIRouter) HEAD(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // HEAD indicates an expected call of HEAD. -func (mr *MockIRouterMockRecorder) HEAD(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) HEAD(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HEAD", reflect.TypeOf((*MockIRouter)(nil).HEAD), varargs...) } // Handle mocks base method. func (m *MockIRouter) Handle(arg0, arg1 string, arg2 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -372,9 +379,9 @@ func (m *MockIRouter) Handle(arg0, arg1 string, arg2 ...gone.HandlerFunc) gone.I } // Handle indicates an expected call of Handle. -func (mr *MockIRouterMockRecorder) Handle(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) Handle(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Handle", reflect.TypeOf((*MockIRouter)(nil).Handle), varargs...) } @@ -385,7 +392,7 @@ func (m *MockIRouter) LoadHTMLGlob(pattern string) { } // LoadHTMLGlob indicates an expected call of LoadHTMLGlob. -func (mr *MockIRouterMockRecorder) LoadHTMLGlob(pattern interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) LoadHTMLGlob(pattern any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadHTMLGlob", reflect.TypeOf((*MockIRouter)(nil).LoadHTMLGlob), pattern) } @@ -393,7 +400,7 @@ func (mr *MockIRouterMockRecorder) LoadHTMLGlob(pattern interface{}) *gomock.Cal // OPTIONS mocks base method. func (m *MockIRouter) OPTIONS(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -403,16 +410,16 @@ func (m *MockIRouter) OPTIONS(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoute } // OPTIONS indicates an expected call of OPTIONS. -func (mr *MockIRouterMockRecorder) OPTIONS(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) OPTIONS(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OPTIONS", reflect.TypeOf((*MockIRouter)(nil).OPTIONS), varargs...) } // PATCH mocks base method. func (m *MockIRouter) PATCH(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -422,16 +429,16 @@ func (m *MockIRouter) PATCH(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // PATCH indicates an expected call of PATCH. -func (mr *MockIRouterMockRecorder) PATCH(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) PATCH(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PATCH", reflect.TypeOf((*MockIRouter)(nil).PATCH), varargs...) } // POST mocks base method. func (m *MockIRouter) POST(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -441,16 +448,16 @@ func (m *MockIRouter) POST(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // POST indicates an expected call of POST. -func (mr *MockIRouterMockRecorder) POST(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) POST(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "POST", reflect.TypeOf((*MockIRouter)(nil).POST), varargs...) } // PUT mocks base method. func (m *MockIRouter) PUT(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -460,16 +467,16 @@ func (m *MockIRouter) PUT(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { } // PUT indicates an expected call of PUT. -func (mr *MockIRouterMockRecorder) PUT(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) PUT(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PUT", reflect.TypeOf((*MockIRouter)(nil).PUT), varargs...) } // Use mocks base method. func (m *MockIRouter) Use(arg0 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -479,7 +486,7 @@ func (m *MockIRouter) Use(arg0 ...gone.HandlerFunc) gone.IRoutes { } // Use indicates an expected call of Use. -func (mr *MockIRouterMockRecorder) Use(arg0 ...interface{}) *gomock.Call { +func (mr *MockIRouterMockRecorder) Use(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Use", reflect.TypeOf((*MockIRouter)(nil).Use), arg0...) } @@ -489,6 +496,7 @@ type MockRouteGroup struct { goneMock.Flag ctrl *gomock.Controller recorder *MockRouteGroupMockRecorder + isgomock struct{} } // MockRouteGroupMockRecorder is the mock recorder for MockRouteGroup. @@ -511,7 +519,7 @@ func (m *MockRouteGroup) EXPECT() *MockRouteGroupMockRecorder { // Any mocks base method. func (m *MockRouteGroup) Any(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -521,16 +529,16 @@ func (m *MockRouteGroup) Any(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // Any indicates an expected call of Any. -func (mr *MockRouteGroupMockRecorder) Any(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) Any(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Any", reflect.TypeOf((*MockRouteGroup)(nil).Any), varargs...) } // DELETE mocks base method. func (m *MockRouteGroup) DELETE(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -540,16 +548,16 @@ func (m *MockRouteGroup) DELETE(arg0 string, arg1 ...gone.HandlerFunc) gone.IRou } // DELETE indicates an expected call of DELETE. -func (mr *MockRouteGroupMockRecorder) DELETE(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) DELETE(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DELETE", reflect.TypeOf((*MockRouteGroup)(nil).DELETE), varargs...) } // GET mocks base method. func (m *MockRouteGroup) GET(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -559,9 +567,9 @@ func (m *MockRouteGroup) GET(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // GET indicates an expected call of GET. -func (mr *MockRouteGroupMockRecorder) GET(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) GET(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GET", reflect.TypeOf((*MockRouteGroup)(nil).GET), varargs...) } @@ -582,7 +590,7 @@ func (mr *MockRouteGroupMockRecorder) GetGinRouter() *gomock.Call { // Group mocks base method. func (m *MockRouteGroup) Group(arg0 string, arg1 ...gone.HandlerFunc) gone.RouteGroup { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -592,16 +600,16 @@ func (m *MockRouteGroup) Group(arg0 string, arg1 ...gone.HandlerFunc) gone.Route } // Group indicates an expected call of Group. -func (mr *MockRouteGroupMockRecorder) Group(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) Group(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Group", reflect.TypeOf((*MockRouteGroup)(nil).Group), varargs...) } // HEAD mocks base method. func (m *MockRouteGroup) HEAD(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -611,16 +619,16 @@ func (m *MockRouteGroup) HEAD(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoute } // HEAD indicates an expected call of HEAD. -func (mr *MockRouteGroupMockRecorder) HEAD(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) HEAD(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HEAD", reflect.TypeOf((*MockRouteGroup)(nil).HEAD), varargs...) } // Handle mocks base method. func (m *MockRouteGroup) Handle(arg0, arg1 string, arg2 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -630,9 +638,9 @@ func (m *MockRouteGroup) Handle(arg0, arg1 string, arg2 ...gone.HandlerFunc) gon } // Handle indicates an expected call of Handle. -func (mr *MockRouteGroupMockRecorder) Handle(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) Handle(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Handle", reflect.TypeOf((*MockRouteGroup)(nil).Handle), varargs...) } @@ -643,7 +651,7 @@ func (m *MockRouteGroup) LoadHTMLGlob(pattern string) { } // LoadHTMLGlob indicates an expected call of LoadHTMLGlob. -func (mr *MockRouteGroupMockRecorder) LoadHTMLGlob(pattern interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) LoadHTMLGlob(pattern any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadHTMLGlob", reflect.TypeOf((*MockRouteGroup)(nil).LoadHTMLGlob), pattern) } @@ -651,7 +659,7 @@ func (mr *MockRouteGroupMockRecorder) LoadHTMLGlob(pattern interface{}) *gomock. // OPTIONS mocks base method. func (m *MockRouteGroup) OPTIONS(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -661,16 +669,16 @@ func (m *MockRouteGroup) OPTIONS(arg0 string, arg1 ...gone.HandlerFunc) gone.IRo } // OPTIONS indicates an expected call of OPTIONS. -func (mr *MockRouteGroupMockRecorder) OPTIONS(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) OPTIONS(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OPTIONS", reflect.TypeOf((*MockRouteGroup)(nil).OPTIONS), varargs...) } // PATCH mocks base method. func (m *MockRouteGroup) PATCH(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -680,16 +688,16 @@ func (m *MockRouteGroup) PATCH(arg0 string, arg1 ...gone.HandlerFunc) gone.IRout } // PATCH indicates an expected call of PATCH. -func (mr *MockRouteGroupMockRecorder) PATCH(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) PATCH(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PATCH", reflect.TypeOf((*MockRouteGroup)(nil).PATCH), varargs...) } // POST mocks base method. func (m *MockRouteGroup) POST(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -699,16 +707,16 @@ func (m *MockRouteGroup) POST(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoute } // POST indicates an expected call of POST. -func (mr *MockRouteGroupMockRecorder) POST(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) POST(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "POST", reflect.TypeOf((*MockRouteGroup)(nil).POST), varargs...) } // PUT mocks base method. func (m *MockRouteGroup) PUT(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -718,16 +726,16 @@ func (m *MockRouteGroup) PUT(arg0 string, arg1 ...gone.HandlerFunc) gone.IRoutes } // PUT indicates an expected call of PUT. -func (mr *MockRouteGroupMockRecorder) PUT(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) PUT(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PUT", reflect.TypeOf((*MockRouteGroup)(nil).PUT), varargs...) } // Use mocks base method. func (m *MockRouteGroup) Use(arg0 ...gone.HandlerFunc) gone.IRoutes { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -737,7 +745,7 @@ func (m *MockRouteGroup) Use(arg0 ...gone.HandlerFunc) gone.IRoutes { } // Use indicates an expected call of Use. -func (mr *MockRouteGroupMockRecorder) Use(arg0 ...interface{}) *gomock.Call { +func (mr *MockRouteGroupMockRecorder) Use(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Use", reflect.TypeOf((*MockRouteGroup)(nil).Use), arg0...) } @@ -747,6 +755,7 @@ type MockGinMiddleware struct { goneMock.Flag ctrl *gomock.Controller recorder *MockGinMiddlewareMockRecorder + isgomock struct{} } // MockGinMiddlewareMockRecorder is the mock recorder for MockGinMiddleware. @@ -775,7 +784,7 @@ func (m *MockGinMiddleware) Process(ctx *gone.Context) error { } // Process indicates an expected call of Process. -func (mr *MockGinMiddlewareMockRecorder) Process(ctx interface{}) *gomock.Call { +func (mr *MockGinMiddlewareMockRecorder) Process(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Process", reflect.TypeOf((*MockGinMiddleware)(nil).Process), ctx) } diff --git a/goner/gin/gone_mock_test.go b/goner/gin/gone_mock_test.go index 9be05cb..19fbac4 100644 --- a/goner/gin/gone_mock_test.go +++ b/goner/gin/gone_mock_test.go @@ -1,20 +1,25 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ../../interface.go +// +// Generated by this command: +// +// mockgen -package=gin -source=../../interface.go +// // Package gin is a generated GoMock package. package gin import ( - goneMock "github.com/gone-io/gone" context "context" sql "database/sql" + goneMock "github.com/gone-io/gone" net "net" reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" gone "github.com/gone-io/gone" cmux "github.com/soheilhy/cmux" + gomock "go.uber.org/mock/gomock" xorm "xorm.io/xorm" caches "xorm.io/xorm/caches" contexts "xorm.io/xorm/contexts" @@ -29,6 +34,7 @@ type MockGoner struct { goneMock.Flag ctrl *gomock.Controller recorder *MockGonerMockRecorder + isgomock struct{} } // MockGonerMockRecorder is the mock recorder for MockGoner. @@ -60,78 +66,80 @@ func (mr *MockGonerMockRecorder) goneFlag() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "goneFlag", reflect.TypeOf((*MockGoner)(nil).goneFlag)) } -// Mockidentity is a mock of identity interface. -type Mockidentity struct { +// MockGonerOption is a mock of GonerOption interface. +type MockGonerOption struct { goneMock.Flag ctrl *gomock.Controller - recorder *MockidentityMockRecorder + recorder *MockGonerOptionMockRecorder + isgomock struct{} } -// MockidentityMockRecorder is the mock recorder for Mockidentity. -type MockidentityMockRecorder struct { - mock *Mockidentity +// MockGonerOptionMockRecorder is the mock recorder for MockGonerOption. +type MockGonerOptionMockRecorder struct { + mock *MockGonerOption } -// NewMockidentity creates a new mock instance. -func NewMockidentity(ctrl *gomock.Controller) *Mockidentity { - mock := &Mockidentity{ctrl: ctrl} - mock.recorder = &MockidentityMockRecorder{mock} +// NewMockGonerOption creates a new mock instance. +func NewMockGonerOption(ctrl *gomock.Controller) *MockGonerOption { + mock := &MockGonerOption{ctrl: ctrl} + mock.recorder = &MockGonerOptionMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *Mockidentity) EXPECT() *MockidentityMockRecorder { +func (m *MockGonerOption) EXPECT() *MockGonerOptionMockRecorder { return m.recorder } -// GetId mocks base method. -func (m *Mockidentity) GetId() gone.GonerId { +// option mocks base method. +func (m *MockGonerOption) option() { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetId") - ret0, _ := ret[0].(gone.GonerId) - return ret0 + m.ctrl.Call(m, "option") } -// GetId indicates an expected call of GetId. -func (mr *MockidentityMockRecorder) GetId() *gomock.Call { +// option indicates an expected call of option. +func (mr *MockGonerOptionMockRecorder) option() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetId", reflect.TypeOf((*Mockidentity)(nil).GetId)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "option", reflect.TypeOf((*MockGonerOption)(nil).option)) } -// MockGonerOption is a mock of GonerOption interface. -type MockGonerOption struct { +// Mockidentity is a mock of identity interface. +type Mockidentity struct { goneMock.Flag ctrl *gomock.Controller - recorder *MockGonerOptionMockRecorder + recorder *MockidentityMockRecorder + isgomock struct{} } -// MockGonerOptionMockRecorder is the mock recorder for MockGonerOption. -type MockGonerOptionMockRecorder struct { - mock *MockGonerOption +// MockidentityMockRecorder is the mock recorder for Mockidentity. +type MockidentityMockRecorder struct { + mock *Mockidentity } -// NewMockGonerOption creates a new mock instance. -func NewMockGonerOption(ctrl *gomock.Controller) *MockGonerOption { - mock := &MockGonerOption{ctrl: ctrl} - mock.recorder = &MockGonerOptionMockRecorder{mock} +// NewMockidentity creates a new mock instance. +func NewMockidentity(ctrl *gomock.Controller) *Mockidentity { + mock := &Mockidentity{ctrl: ctrl} + mock.recorder = &MockidentityMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockGonerOption) EXPECT() *MockGonerOptionMockRecorder { +func (m *Mockidentity) EXPECT() *MockidentityMockRecorder { return m.recorder } -// option mocks base method. -func (m *MockGonerOption) option() { +// GetId mocks base method. +func (m *Mockidentity) GetId() gone.GonerId { m.ctrl.T.Helper() - m.ctrl.Call(m, "option") + ret := m.ctrl.Call(m, "GetId") + ret0, _ := ret[0].(gone.GonerId) + return ret0 } -// option indicates an expected call of option. -func (mr *MockGonerOptionMockRecorder) option() *gomock.Call { +// GetId indicates an expected call of GetId. +func (mr *MockidentityMockRecorder) GetId() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "option", reflect.TypeOf((*MockGonerOption)(nil).option)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetId", reflect.TypeOf((*Mockidentity)(nil).GetId)) } // MockTomb is a mock of Tomb interface. @@ -139,6 +147,7 @@ type MockTomb struct { goneMock.Flag ctrl *gomock.Controller recorder *MockTombMockRecorder + isgomock struct{} } // MockTombMockRecorder is the mock recorder for MockTomb. @@ -203,7 +212,7 @@ func (mr *MockTombMockRecorder) GetOrder() *gomock.Call { // GonerIsRevive mocks base method. func (m *MockTomb) GonerIsRevive(flags ...bool) bool { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range flags { varargs = append(varargs, a) } @@ -213,37 +222,37 @@ func (m *MockTomb) GonerIsRevive(flags ...bool) bool { } // GonerIsRevive indicates an expected call of GonerIsRevive. -func (mr *MockTombMockRecorder) GonerIsRevive(flags ...interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) GonerIsRevive(flags ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GonerIsRevive", reflect.TypeOf((*MockTomb)(nil).GonerIsRevive), flags...) } // IsDefault mocks base method. -func (m *MockTomb) IsDefault() bool { +func (m *MockTomb) IsDefault(arg0 reflect.Type) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsDefault") + ret := m.ctrl.Call(m, "IsDefault", arg0) ret0, _ := ret[0].(bool) return ret0 } // IsDefault indicates an expected call of IsDefault. -func (mr *MockTombMockRecorder) IsDefault() *gomock.Call { +func (mr *MockTombMockRecorder) IsDefault(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDefault", reflect.TypeOf((*MockTomb)(nil).IsDefault)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDefault", reflect.TypeOf((*MockTomb)(nil).IsDefault), arg0) } // SetDefault mocks base method. -func (m *MockTomb) SetDefault(isDefault bool) gone.Tomb { +func (m *MockTomb) SetDefault(arg0 reflect.Type) gone.Tomb { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetDefault", isDefault) + ret := m.ctrl.Call(m, "SetDefault", arg0) ret0, _ := ret[0].(gone.Tomb) return ret0 } // SetDefault indicates an expected call of SetDefault. -func (mr *MockTombMockRecorder) SetDefault(isDefault interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetDefault(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockTomb)(nil).SetDefault), isDefault) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockTomb)(nil).SetDefault), arg0) } // SetId mocks base method. @@ -255,7 +264,7 @@ func (m *MockTomb) SetId(arg0 gone.GonerId) gone.Tomb { } // SetId indicates an expected call of SetId. -func (mr *MockTombMockRecorder) SetId(arg0 interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetId(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetId", reflect.TypeOf((*MockTomb)(nil).SetId), arg0) } @@ -269,7 +278,7 @@ func (m *MockTomb) SetOrder(order gone.Order) gone.Tomb { } // SetOrder indicates an expected call of SetOrder. -func (mr *MockTombMockRecorder) SetOrder(order interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetOrder(order any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOrder", reflect.TypeOf((*MockTomb)(nil).SetOrder), order) } @@ -279,6 +288,7 @@ type MockCemetery struct { goneMock.Flag ctrl *gomock.Controller recorder *MockCemeteryMockRecorder + isgomock struct{} } // MockCemeteryMockRecorder is the mock recorder for MockCemetery. @@ -301,7 +311,7 @@ func (m *MockCemetery) EXPECT() *MockCemeteryMockRecorder { // Bury mocks base method. func (m *MockCemetery) Bury(arg0 gone.Goner, arg1 ...gone.GonerOption) gone.Cemetery { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -311,16 +321,16 @@ func (m *MockCemetery) Bury(arg0 gone.Goner, arg1 ...gone.GonerOption) gone.Ceme } // Bury indicates an expected call of Bury. -func (mr *MockCemeteryMockRecorder) Bury(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) Bury(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Bury", reflect.TypeOf((*MockCemetery)(nil).Bury), varargs...) } // BuryOnce mocks base method. func (m *MockCemetery) BuryOnce(goner gone.Goner, options ...gone.GonerOption) gone.Cemetery { m.ctrl.T.Helper() - varargs := []interface{}{goner} + varargs := []any{goner} for _, a := range options { varargs = append(varargs, a) } @@ -330,9 +340,9 @@ func (m *MockCemetery) BuryOnce(goner gone.Goner, options ...gone.GonerOption) g } // BuryOnce indicates an expected call of BuryOnce. -func (mr *MockCemeteryMockRecorder) BuryOnce(goner interface{}, options ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) BuryOnce(goner any, options ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{goner}, options...) + varargs := append([]any{goner}, options...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuryOnce", reflect.TypeOf((*MockCemetery)(nil).BuryOnce), varargs...) } @@ -345,7 +355,7 @@ func (m *MockCemetery) GetTomById(arg0 gone.GonerId) gone.Tomb { } // GetTomById indicates an expected call of GetTomById. -func (mr *MockCemeteryMockRecorder) GetTomById(arg0 interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) GetTomById(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTomById", reflect.TypeOf((*MockCemetery)(nil).GetTomById), arg0) } @@ -359,7 +369,7 @@ func (m *MockCemetery) GetTomByType(arg0 reflect.Type) []gone.Tomb { } // GetTomByType indicates an expected call of GetTomByType. -func (mr *MockCemeteryMockRecorder) GetTomByType(arg0 interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) GetTomByType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTomByType", reflect.TypeOf((*MockCemetery)(nil).GetTomByType), arg0) } @@ -374,7 +384,7 @@ func (m *MockCemetery) InjectFuncParameters(fn any, injectBefore func(reflect.Ty } // InjectFuncParameters indicates an expected call of InjectFuncParameters. -func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injectAfter interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injectAfter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InjectFuncParameters", reflect.TypeOf((*MockCemetery)(nil).InjectFuncParameters), fn, injectBefore, injectAfter) } @@ -382,7 +392,7 @@ func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injec // ReplaceBury mocks base method. func (m *MockCemetery) ReplaceBury(goner gone.Goner, options ...gone.GonerOption) error { m.ctrl.T.Helper() - varargs := []interface{}{goner} + varargs := []any{goner} for _, a := range options { varargs = append(varargs, a) } @@ -392,9 +402,9 @@ func (m *MockCemetery) ReplaceBury(goner gone.Goner, options ...gone.GonerOption } // ReplaceBury indicates an expected call of ReplaceBury. -func (mr *MockCemeteryMockRecorder) ReplaceBury(goner interface{}, options ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) ReplaceBury(goner any, options ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{goner}, options...) + varargs := append([]any{goner}, options...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplaceBury", reflect.TypeOf((*MockCemetery)(nil).ReplaceBury), varargs...) } @@ -422,7 +432,7 @@ func (m *MockCemetery) ReviveOne(goner any) ([]gone.Tomb, error) { } // ReviveOne indicates an expected call of ReviveOne. -func (mr *MockCemeteryMockRecorder) ReviveOne(goner interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) ReviveOne(goner any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReviveOne", reflect.TypeOf((*MockCemetery)(nil).ReviveOne), goner) } @@ -444,6 +454,7 @@ type MockHeaven struct { goneMock.Flag ctrl *gomock.Controller recorder *MockHeavenMockRecorder + isgomock struct{} } // MockHeavenMockRecorder is the mock recorder for MockHeaven. @@ -472,7 +483,7 @@ func (m *MockHeaven) AfterStart(arg0 gone.Process) gone.Heaven { } // AfterStart indicates an expected call of AfterStart. -func (mr *MockHeavenMockRecorder) AfterStart(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) AfterStart(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AfterStart", reflect.TypeOf((*MockHeaven)(nil).AfterStart), arg0) } @@ -486,7 +497,7 @@ func (m *MockHeaven) AfterStop(arg0 gone.Process) gone.Heaven { } // AfterStop indicates an expected call of AfterStop. -func (mr *MockHeavenMockRecorder) AfterStop(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) AfterStop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AfterStop", reflect.TypeOf((*MockHeaven)(nil).AfterStop), arg0) } @@ -500,7 +511,7 @@ func (m *MockHeaven) BeforeStart(arg0 gone.Process) gone.Heaven { } // BeforeStart indicates an expected call of BeforeStart. -func (mr *MockHeavenMockRecorder) BeforeStart(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) BeforeStart(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeforeStart", reflect.TypeOf((*MockHeaven)(nil).BeforeStart), arg0) } @@ -514,7 +525,7 @@ func (m *MockHeaven) BeforeStop(arg0 gone.Process) gone.Heaven { } // BeforeStop indicates an expected call of BeforeStop. -func (mr *MockHeavenMockRecorder) BeforeStop(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) BeforeStop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeforeStop", reflect.TypeOf((*MockHeaven)(nil).BeforeStop), arg0) } @@ -533,6 +544,20 @@ func (mr *MockHeavenMockRecorder) End() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "End", reflect.TypeOf((*MockHeaven)(nil).End)) } +// GetCemetery mocks base method. +func (m *MockHeaven) GetCemetery() gone.Cemetery { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetCemetery") + ret0, _ := ret[0].(gone.Cemetery) + return ret0 +} + +// GetCemetery indicates an expected call of GetCemetery. +func (mr *MockHeavenMockRecorder) GetCemetery() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCemetery", reflect.TypeOf((*MockHeaven)(nil).GetCemetery)) +} + // GetHeavenStopSignal mocks base method. func (m *MockHeaven) GetHeavenStopSignal() <-chan struct{} { m.ctrl.T.Helper() @@ -568,7 +593,7 @@ func (m *MockHeaven) SetAfterStopSignalWaitSecond(sec int) { } // SetAfterStopSignalWaitSecond indicates an expected call of SetAfterStopSignalWaitSecond. -func (mr *MockHeavenMockRecorder) SetAfterStopSignalWaitSecond(sec interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) SetAfterStopSignalWaitSecond(sec any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAfterStopSignalWaitSecond", reflect.TypeOf((*MockHeaven)(nil).SetAfterStopSignalWaitSecond), sec) } @@ -620,6 +645,7 @@ type MockProphet struct { goneMock.Flag ctrl *gomock.Controller recorder *MockProphetMockRecorder + isgomock struct{} } // MockProphetMockRecorder is the mock recorder for MockProphet. @@ -670,6 +696,7 @@ type MockProphet2 struct { goneMock.Flag ctrl *gomock.Controller recorder *MockProphet2MockRecorder + isgomock struct{} } // MockProphet2MockRecorder is the mock recorder for MockProphet2. @@ -720,6 +747,7 @@ type MockAngel struct { goneMock.Flag ctrl *gomock.Controller recorder *MockAngelMockRecorder + isgomock struct{} } // MockAngelMockRecorder is the mock recorder for MockAngel. @@ -748,7 +776,7 @@ func (m *MockAngel) Start(arg0 gone.Cemetery) error { } // Start indicates an expected call of Start. -func (mr *MockAngelMockRecorder) Start(arg0 interface{}) *gomock.Call { +func (mr *MockAngelMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockAngel)(nil).Start), arg0) } @@ -762,7 +790,7 @@ func (m *MockAngel) Stop(arg0 gone.Cemetery) error { } // Stop indicates an expected call of Stop. -func (mr *MockAngelMockRecorder) Stop(arg0 interface{}) *gomock.Call { +func (mr *MockAngelMockRecorder) Stop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockAngel)(nil).Stop), arg0) } @@ -784,6 +812,7 @@ type MockVampire struct { goneMock.Flag ctrl *gomock.Controller recorder *MockVampireMockRecorder + isgomock struct{} } // MockVampireMockRecorder is the mock recorder for MockVampire. @@ -812,7 +841,7 @@ func (m *MockVampire) Suck(conf string, v reflect.Value) gone.SuckError { } // Suck indicates an expected call of Suck. -func (mr *MockVampireMockRecorder) Suck(conf, v interface{}) *gomock.Call { +func (mr *MockVampireMockRecorder) Suck(conf, v any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Suck", reflect.TypeOf((*MockVampire)(nil).Suck), conf, v) } @@ -834,6 +863,7 @@ type MockVampire2 struct { goneMock.Flag ctrl *gomock.Controller recorder *MockVampire2MockRecorder + isgomock struct{} } // MockVampire2MockRecorder is the mock recorder for MockVampire2. @@ -862,7 +892,7 @@ func (m *MockVampire2) Suck(conf string, v reflect.Value, field reflect.StructFi } // Suck indicates an expected call of Suck. -func (mr *MockVampire2MockRecorder) Suck(conf, v, field interface{}) *gomock.Call { +func (mr *MockVampire2MockRecorder) Suck(conf, v, field any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Suck", reflect.TypeOf((*MockVampire2)(nil).Suck), conf, v, field) } @@ -884,6 +914,7 @@ type MockError struct { goneMock.Flag ctrl *gomock.Controller recorder *MockErrorMockRecorder + isgomock struct{} } // MockErrorMockRecorder is the mock recorder for MockError. @@ -931,6 +962,20 @@ func (mr *MockErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockError) Msg() string { m.ctrl.T.Helper() @@ -950,6 +995,7 @@ type MockInnerError struct { goneMock.Flag ctrl *gomock.Controller recorder *MockInnerErrorMockRecorder + isgomock struct{} } // MockInnerErrorMockRecorder is the mock recorder for MockInnerError. @@ -997,6 +1043,20 @@ func (mr *MockInnerErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockInnerError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockInnerError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockInnerErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockInnerError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockInnerError) Msg() string { m.ctrl.T.Helper() @@ -1030,6 +1090,7 @@ type MockBusinessError struct { goneMock.Flag ctrl *gomock.Controller recorder *MockBusinessErrorMockRecorder + isgomock struct{} } // MockBusinessErrorMockRecorder is the mock recorder for MockBusinessError. @@ -1091,6 +1152,20 @@ func (mr *MockBusinessErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockBusinessError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockBusinessError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockBusinessErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockBusinessError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockBusinessError) Msg() string { m.ctrl.T.Helper() @@ -1110,6 +1185,7 @@ type MockLogger struct { goneMock.Flag ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -1132,7 +1208,7 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { // Debug mocks base method. func (m *MockLogger) Debug(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1140,7 +1216,7 @@ func (m *MockLogger) Debug(args ...any) { } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), args...) } @@ -1148,7 +1224,7 @@ func (mr *MockLoggerMockRecorder) Debug(args ...interface{}) *gomock.Call { // Debugf mocks base method. func (m *MockLogger) Debugf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1156,16 +1232,16 @@ func (m *MockLogger) Debugf(format string, args ...any) { } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Debugln mocks base method. func (m *MockLogger) Debugln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1173,7 +1249,7 @@ func (m *MockLogger) Debugln(args ...any) { } // Debugln indicates an expected call of Debugln. -func (mr *MockLoggerMockRecorder) Debugln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugln", reflect.TypeOf((*MockLogger)(nil).Debugln), args...) } @@ -1181,7 +1257,7 @@ func (mr *MockLoggerMockRecorder) Debugln(args ...interface{}) *gomock.Call { // Error mocks base method. func (m *MockLogger) Error(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1189,7 +1265,7 @@ func (m *MockLogger) Error(args ...any) { } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), args...) } @@ -1197,7 +1273,7 @@ func (mr *MockLoggerMockRecorder) Error(args ...interface{}) *gomock.Call { // Errorf mocks base method. func (m *MockLogger) Errorf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1205,16 +1281,16 @@ func (m *MockLogger) Errorf(format string, args ...any) { } // Errorf indicates an expected call of Errorf. -func (mr *MockLoggerMockRecorder) Errorf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) } // Errorln mocks base method. func (m *MockLogger) Errorln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1222,7 +1298,7 @@ func (m *MockLogger) Errorln(args ...any) { } // Errorln indicates an expected call of Errorln. -func (mr *MockLoggerMockRecorder) Errorln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorln", reflect.TypeOf((*MockLogger)(nil).Errorln), args...) } @@ -1230,7 +1306,7 @@ func (mr *MockLoggerMockRecorder) Errorln(args ...interface{}) *gomock.Call { // Fatal mocks base method. func (m *MockLogger) Fatal(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1238,7 +1314,7 @@ func (m *MockLogger) Fatal(args ...any) { } // Fatal indicates an expected call of Fatal. -func (mr *MockLoggerMockRecorder) Fatal(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatal(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatal", reflect.TypeOf((*MockLogger)(nil).Fatal), args...) } @@ -1246,7 +1322,7 @@ func (mr *MockLoggerMockRecorder) Fatal(args ...interface{}) *gomock.Call { // Fatalf mocks base method. func (m *MockLogger) Fatalf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1254,16 +1330,16 @@ func (m *MockLogger) Fatalf(format string, args ...any) { } // Fatalf indicates an expected call of Fatalf. -func (mr *MockLoggerMockRecorder) Fatalf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalf", reflect.TypeOf((*MockLogger)(nil).Fatalf), varargs...) } // Fatalln mocks base method. func (m *MockLogger) Fatalln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1271,7 +1347,7 @@ func (m *MockLogger) Fatalln(args ...any) { } // Fatalln indicates an expected call of Fatalln. -func (mr *MockLoggerMockRecorder) Fatalln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalln", reflect.TypeOf((*MockLogger)(nil).Fatalln), args...) } @@ -1279,7 +1355,7 @@ func (mr *MockLoggerMockRecorder) Fatalln(args ...interface{}) *gomock.Call { // Info mocks base method. func (m *MockLogger) Info(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1287,7 +1363,7 @@ func (m *MockLogger) Info(args ...any) { } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), args...) } @@ -1295,7 +1371,7 @@ func (mr *MockLoggerMockRecorder) Info(args ...interface{}) *gomock.Call { // Infof mocks base method. func (m *MockLogger) Infof(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1303,16 +1379,16 @@ func (m *MockLogger) Infof(format string, args ...any) { } // Infof indicates an expected call of Infof. -func (mr *MockLoggerMockRecorder) Infof(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infof(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infof", reflect.TypeOf((*MockLogger)(nil).Infof), varargs...) } // Infoln mocks base method. func (m *MockLogger) Infoln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1320,7 +1396,7 @@ func (m *MockLogger) Infoln(args ...any) { } // Infoln indicates an expected call of Infoln. -func (mr *MockLoggerMockRecorder) Infoln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infoln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infoln", reflect.TypeOf((*MockLogger)(nil).Infoln), args...) } @@ -1328,7 +1404,7 @@ func (mr *MockLoggerMockRecorder) Infoln(args ...interface{}) *gomock.Call { // Panic mocks base method. func (m *MockLogger) Panic(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1336,7 +1412,7 @@ func (m *MockLogger) Panic(args ...any) { } // Panic indicates an expected call of Panic. -func (mr *MockLoggerMockRecorder) Panic(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panic(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panic", reflect.TypeOf((*MockLogger)(nil).Panic), args...) } @@ -1344,7 +1420,7 @@ func (mr *MockLoggerMockRecorder) Panic(args ...interface{}) *gomock.Call { // Panicf mocks base method. func (m *MockLogger) Panicf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1352,16 +1428,16 @@ func (m *MockLogger) Panicf(format string, args ...any) { } // Panicf indicates an expected call of Panicf. -func (mr *MockLoggerMockRecorder) Panicf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panicf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panicf", reflect.TypeOf((*MockLogger)(nil).Panicf), varargs...) } // Panicln mocks base method. func (m *MockLogger) Panicln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1369,7 +1445,7 @@ func (m *MockLogger) Panicln(args ...any) { } // Panicln indicates an expected call of Panicln. -func (mr *MockLoggerMockRecorder) Panicln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panicln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panicln", reflect.TypeOf((*MockLogger)(nil).Panicln), args...) } @@ -1377,7 +1453,7 @@ func (mr *MockLoggerMockRecorder) Panicln(args ...interface{}) *gomock.Call { // Print mocks base method. func (m *MockLogger) Print(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1385,7 +1461,7 @@ func (m *MockLogger) Print(args ...any) { } // Print indicates an expected call of Print. -func (mr *MockLoggerMockRecorder) Print(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Print(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Print", reflect.TypeOf((*MockLogger)(nil).Print), args...) } @@ -1393,7 +1469,7 @@ func (mr *MockLoggerMockRecorder) Print(args ...interface{}) *gomock.Call { // Printf mocks base method. func (m *MockLogger) Printf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1401,16 +1477,16 @@ func (m *MockLogger) Printf(format string, args ...any) { } // Printf indicates an expected call of Printf. -func (mr *MockLoggerMockRecorder) Printf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Printf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Printf", reflect.TypeOf((*MockLogger)(nil).Printf), varargs...) } // Println mocks base method. func (m *MockLogger) Println(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1418,7 +1494,7 @@ func (m *MockLogger) Println(args ...any) { } // Println indicates an expected call of Println. -func (mr *MockLoggerMockRecorder) Println(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Println(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Println", reflect.TypeOf((*MockLogger)(nil).Println), args...) } @@ -1426,7 +1502,7 @@ func (mr *MockLoggerMockRecorder) Println(args ...interface{}) *gomock.Call { // Trace mocks base method. func (m *MockLogger) Trace(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1434,7 +1510,7 @@ func (m *MockLogger) Trace(args ...any) { } // Trace indicates an expected call of Trace. -func (mr *MockLoggerMockRecorder) Trace(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Trace(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trace", reflect.TypeOf((*MockLogger)(nil).Trace), args...) } @@ -1442,7 +1518,7 @@ func (mr *MockLoggerMockRecorder) Trace(args ...interface{}) *gomock.Call { // Tracef mocks base method. func (m *MockLogger) Tracef(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1450,16 +1526,16 @@ func (m *MockLogger) Tracef(format string, args ...any) { } // Tracef indicates an expected call of Tracef. -func (mr *MockLoggerMockRecorder) Tracef(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Tracef(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Tracef", reflect.TypeOf((*MockLogger)(nil).Tracef), varargs...) } // Traceln mocks base method. func (m *MockLogger) Traceln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1467,7 +1543,7 @@ func (m *MockLogger) Traceln(args ...any) { } // Traceln indicates an expected call of Traceln. -func (mr *MockLoggerMockRecorder) Traceln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Traceln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Traceln", reflect.TypeOf((*MockLogger)(nil).Traceln), args...) } @@ -1475,7 +1551,7 @@ func (mr *MockLoggerMockRecorder) Traceln(args ...interface{}) *gomock.Call { // Warn mocks base method. func (m *MockLogger) Warn(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1483,7 +1559,7 @@ func (m *MockLogger) Warn(args ...any) { } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), args...) } @@ -1491,7 +1567,7 @@ func (mr *MockLoggerMockRecorder) Warn(args ...interface{}) *gomock.Call { // Warnf mocks base method. func (m *MockLogger) Warnf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1499,16 +1575,16 @@ func (m *MockLogger) Warnf(format string, args ...any) { } // Warnf indicates an expected call of Warnf. -func (mr *MockLoggerMockRecorder) Warnf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) } // Warnln mocks base method. func (m *MockLogger) Warnln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1516,7 +1592,7 @@ func (m *MockLogger) Warnln(args ...any) { } // Warnln indicates an expected call of Warnln. -func (mr *MockLoggerMockRecorder) Warnln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnln", reflect.TypeOf((*MockLogger)(nil).Warnln), args...) } @@ -1526,6 +1602,7 @@ type MockTracer struct { goneMock.Flag ctrl *gomock.Controller recorder *MockTracerMockRecorder + isgomock struct{} } // MockTracerMockRecorder is the mock recorder for MockTracer. @@ -1566,7 +1643,7 @@ func (m *MockTracer) Go(fn func()) { } // Go indicates an expected call of Go. -func (mr *MockTracerMockRecorder) Go(fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) Go(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Go", reflect.TypeOf((*MockTracer)(nil).Go), fn) } @@ -1590,7 +1667,7 @@ func (m *MockTracer) RecoverSetTraceId(traceId string, fn func()) { } // RecoverSetTraceId indicates an expected call of RecoverSetTraceId. -func (mr *MockTracerMockRecorder) RecoverSetTraceId(traceId, fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) RecoverSetTraceId(traceId, fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecoverSetTraceId", reflect.TypeOf((*MockTracer)(nil).RecoverSetTraceId), traceId, fn) } @@ -1602,7 +1679,7 @@ func (m *MockTracer) SetTraceId(traceId string, fn func()) { } // SetTraceId indicates an expected call of SetTraceId. -func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTraceId", reflect.TypeOf((*MockTracer)(nil).SetTraceId), traceId, fn) } @@ -1612,6 +1689,7 @@ type MockXormEngine struct { goneMock.Flag ctrl *gomock.Controller recorder *MockXormEngineMockRecorder + isgomock struct{} } // MockXormEngineMockRecorder is the mock recorder for MockXormEngine. @@ -1638,7 +1716,7 @@ func (m *MockXormEngine) AddHook(hook contexts.Hook) { } // AddHook indicates an expected call of AddHook. -func (mr *MockXormEngineMockRecorder) AddHook(hook interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) AddHook(hook any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHook", reflect.TypeOf((*MockXormEngine)(nil).AddHook), hook) } @@ -1652,7 +1730,7 @@ func (m *MockXormEngine) Alias(alias string) *xorm.Session { } // Alias indicates an expected call of Alias. -func (mr *MockXormEngineMockRecorder) Alias(alias interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Alias(alias any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Alias", reflect.TypeOf((*MockXormEngine)(nil).Alias), alias) } @@ -1674,7 +1752,7 @@ func (mr *MockXormEngineMockRecorder) AllCols() *gomock.Call { // Asc mocks base method. func (m *MockXormEngine) Asc(colNames ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range colNames { varargs = append(varargs, a) } @@ -1684,13 +1762,13 @@ func (m *MockXormEngine) Asc(colNames ...string) *xorm.Session { } // Asc indicates an expected call of Asc. -func (mr *MockXormEngineMockRecorder) Asc(colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Asc(colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Asc", reflect.TypeOf((*MockXormEngine)(nil).Asc), colNames...) } // Before mocks base method. -func (m *MockXormEngine) Before(arg0 func(interface{})) *xorm.Session { +func (m *MockXormEngine) Before(arg0 func(any)) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Before", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -1698,7 +1776,7 @@ func (m *MockXormEngine) Before(arg0 func(interface{})) *xorm.Session { } // Before indicates an expected call of Before. -func (mr *MockXormEngineMockRecorder) Before(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Before(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Before", reflect.TypeOf((*MockXormEngine)(nil).Before), arg0) } @@ -1712,7 +1790,7 @@ func (m *MockXormEngine) BufferSize(size int) *xorm.Session { } // BufferSize indicates an expected call of BufferSize. -func (mr *MockXormEngineMockRecorder) BufferSize(size interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) BufferSize(size any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BufferSize", reflect.TypeOf((*MockXormEngine)(nil).BufferSize), size) } @@ -1726,15 +1804,15 @@ func (m *MockXormEngine) Charset(charset string) *xorm.Session { } // Charset indicates an expected call of Charset. -func (mr *MockXormEngineMockRecorder) Charset(charset interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Charset(charset any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Charset", reflect.TypeOf((*MockXormEngine)(nil).Charset), charset) } // ClearCache mocks base method. -func (m *MockXormEngine) ClearCache(arg0 ...interface{}) error { +func (m *MockXormEngine) ClearCache(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1744,7 +1822,7 @@ func (m *MockXormEngine) ClearCache(arg0 ...interface{}) error { } // ClearCache indicates an expected call of ClearCache. -func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearCache", reflect.TypeOf((*MockXormEngine)(nil).ClearCache), arg0...) } @@ -1752,7 +1830,7 @@ func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Ca // Cols mocks base method. func (m *MockXormEngine) Cols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -1762,7 +1840,7 @@ func (m *MockXormEngine) Cols(columns ...string) *xorm.Session { } // Cols indicates an expected call of Cols. -func (mr *MockXormEngineMockRecorder) Cols(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Cols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cols", reflect.TypeOf((*MockXormEngine)(nil).Cols), columns...) } @@ -1776,15 +1854,15 @@ func (m *MockXormEngine) Context(arg0 context.Context) *xorm.Session { } // Context indicates an expected call of Context. -func (mr *MockXormEngineMockRecorder) Context(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Context(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockXormEngine)(nil).Context), arg0) } // Count mocks base method. -func (m *MockXormEngine) Count(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Count(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1795,13 +1873,13 @@ func (m *MockXormEngine) Count(arg0 ...interface{}) (int64, error) { } // Count indicates an expected call of Count. -func (mr *MockXormEngineMockRecorder) Count(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Count(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Count", reflect.TypeOf((*MockXormEngine)(nil).Count), arg0...) } // CreateIndexes mocks base method. -func (m *MockXormEngine) CreateIndexes(bean interface{}) error { +func (m *MockXormEngine) CreateIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateIndexes", bean) ret0, _ := ret[0].(error) @@ -1809,15 +1887,15 @@ func (m *MockXormEngine) CreateIndexes(bean interface{}) error { } // CreateIndexes indicates an expected call of CreateIndexes. -func (mr *MockXormEngineMockRecorder) CreateIndexes(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateIndexes", reflect.TypeOf((*MockXormEngine)(nil).CreateIndexes), bean) } // CreateTables mocks base method. -func (m *MockXormEngine) CreateTables(arg0 ...interface{}) error { +func (m *MockXormEngine) CreateTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1827,13 +1905,13 @@ func (m *MockXormEngine) CreateTables(arg0 ...interface{}) error { } // CreateTables indicates an expected call of CreateTables. -func (mr *MockXormEngineMockRecorder) CreateTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTables", reflect.TypeOf((*MockXormEngine)(nil).CreateTables), arg0...) } // CreateUniques mocks base method. -func (m *MockXormEngine) CreateUniques(bean interface{}) error { +func (m *MockXormEngine) CreateUniques(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateUniques", bean) ret0, _ := ret[0].(error) @@ -1841,7 +1919,7 @@ func (m *MockXormEngine) CreateUniques(bean interface{}) error { } // CreateUniques indicates an expected call of CreateUniques. -func (mr *MockXormEngineMockRecorder) CreateUniques(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateUniques(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUniques", reflect.TypeOf((*MockXormEngine)(nil).CreateUniques), bean) } @@ -1877,9 +1955,9 @@ func (mr *MockXormEngineMockRecorder) DBVersion() *gomock.Call { } // Decr mocks base method. -func (m *MockXormEngine) Decr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXormEngine) Decr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -1889,16 +1967,16 @@ func (m *MockXormEngine) Decr(column string, arg ...interface{}) *xorm.Session { } // Decr indicates an expected call of Decr. -func (mr *MockXormEngineMockRecorder) Decr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Decr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockXormEngine)(nil).Decr), varargs...) } // Delete mocks base method. -func (m *MockXormEngine) Delete(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Delete(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1909,7 +1987,7 @@ func (m *MockXormEngine) Delete(arg0 ...interface{}) (int64, error) { } // Delete indicates an expected call of Delete. -func (mr *MockXormEngineMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Delete(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockXormEngine)(nil).Delete), arg0...) } @@ -1917,7 +1995,7 @@ func (mr *MockXormEngineMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { // Desc mocks base method. func (m *MockXormEngine) Desc(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1927,7 +2005,7 @@ func (m *MockXormEngine) Desc(arg0 ...string) *xorm.Session { } // Desc indicates an expected call of Desc. -func (mr *MockXormEngineMockRecorder) Desc(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Desc(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Desc", reflect.TypeOf((*MockXormEngine)(nil).Desc), arg0...) } @@ -1949,7 +2027,7 @@ func (mr *MockXormEngineMockRecorder) Dialect() *gomock.Call { // Distinct mocks base method. func (m *MockXormEngine) Distinct(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -1959,7 +2037,7 @@ func (m *MockXormEngine) Distinct(columns ...string) *xorm.Session { } // Distinct indicates an expected call of Distinct. -func (mr *MockXormEngineMockRecorder) Distinct(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Distinct(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Distinct", reflect.TypeOf((*MockXormEngine)(nil).Distinct), columns...) } @@ -1979,7 +2057,7 @@ func (mr *MockXormEngineMockRecorder) DriverName() *gomock.Call { } // DropIndexes mocks base method. -func (m *MockXormEngine) DropIndexes(bean interface{}) error { +func (m *MockXormEngine) DropIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DropIndexes", bean) ret0, _ := ret[0].(error) @@ -1987,15 +2065,15 @@ func (m *MockXormEngine) DropIndexes(bean interface{}) error { } // DropIndexes indicates an expected call of DropIndexes. -func (mr *MockXormEngineMockRecorder) DropIndexes(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DropIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropIndexes", reflect.TypeOf((*MockXormEngine)(nil).DropIndexes), bean) } // DropTables mocks base method. -func (m *MockXormEngine) DropTables(arg0 ...interface{}) error { +func (m *MockXormEngine) DropTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2005,7 +2083,7 @@ func (m *MockXormEngine) DropTables(arg0 ...interface{}) error { } // DropTables indicates an expected call of DropTables. -func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropTables", reflect.TypeOf((*MockXormEngine)(nil).DropTables), arg0...) } @@ -2013,7 +2091,7 @@ func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...interface{}) *gomock.Ca // DumpAllToFile mocks base method. func (m *MockXormEngine) DumpAllToFile(fp string, tp ...schemas.DBType) error { m.ctrl.T.Helper() - varargs := []interface{}{fp} + varargs := []any{fp} for _, a := range tp { varargs = append(varargs, a) } @@ -2023,9 +2101,9 @@ func (m *MockXormEngine) DumpAllToFile(fp string, tp ...schemas.DBType) error { } // DumpAllToFile indicates an expected call of DumpAllToFile. -func (mr *MockXormEngineMockRecorder) DumpAllToFile(fp interface{}, tp ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DumpAllToFile(fp any, tp ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{fp}, tp...) + varargs := append([]any{fp}, tp...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DumpAllToFile", reflect.TypeOf((*MockXormEngine)(nil).DumpAllToFile), varargs...) } @@ -2036,15 +2114,15 @@ func (m *MockXormEngine) EnableSessionID(arg0 bool) { } // EnableSessionID indicates an expected call of EnableSessionID. -func (mr *MockXormEngineMockRecorder) EnableSessionID(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) EnableSessionID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableSessionID", reflect.TypeOf((*MockXormEngine)(nil).EnableSessionID), arg0) } // Exec mocks base method. -func (m *MockXormEngine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { +func (m *MockXormEngine) Exec(sqlOrArgs ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2055,15 +2133,15 @@ func (m *MockXormEngine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockXormEngineMockRecorder) Exec(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Exec(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockXormEngine)(nil).Exec), sqlOrArgs...) } // Exist mocks base method. -func (m *MockXormEngine) Exist(bean ...interface{}) (bool, error) { +func (m *MockXormEngine) Exist(bean ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range bean { varargs = append(varargs, a) } @@ -2074,15 +2152,15 @@ func (m *MockXormEngine) Exist(bean ...interface{}) (bool, error) { } // Exist indicates an expected call of Exist. -func (mr *MockXormEngineMockRecorder) Exist(bean ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Exist(bean ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exist", reflect.TypeOf((*MockXormEngine)(nil).Exist), bean...) } // Find mocks base method. -func (m *MockXormEngine) Find(arg0 interface{}, arg1 ...interface{}) error { +func (m *MockXormEngine) Find(arg0 any, arg1 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2092,16 +2170,16 @@ func (m *MockXormEngine) Find(arg0 interface{}, arg1 ...interface{}) error { } // Find indicates an expected call of Find. -func (mr *MockXormEngineMockRecorder) Find(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Find(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockXormEngine)(nil).Find), varargs...) } // FindAndCount mocks base method. -func (m *MockXormEngine) FindAndCount(arg0 interface{}, arg1 ...interface{}) (int64, error) { +func (m *MockXormEngine) FindAndCount(arg0 any, arg1 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2112,16 +2190,16 @@ func (m *MockXormEngine) FindAndCount(arg0 interface{}, arg1 ...interface{}) (in } // FindAndCount indicates an expected call of FindAndCount. -func (mr *MockXormEngineMockRecorder) FindAndCount(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) FindAndCount(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindAndCount", reflect.TypeOf((*MockXormEngine)(nil).FindAndCount), varargs...) } // Get mocks base method. -func (m *MockXormEngine) Get(arg0 ...interface{}) (bool, error) { +func (m *MockXormEngine) Get(arg0 ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2132,7 +2210,7 @@ func (m *MockXormEngine) Get(arg0 ...interface{}) (bool, error) { } // Get indicates an expected call of Get. -func (mr *MockXormEngineMockRecorder) Get(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Get(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockXormEngine)(nil).Get), arg0...) } @@ -2146,7 +2224,7 @@ func (m *MockXormEngine) GetCacher(arg0 string) caches.Cacher { } // GetCacher indicates an expected call of GetCacher. -func (mr *MockXormEngineMockRecorder) GetCacher(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) GetCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCacher", reflect.TypeOf((*MockXormEngine)(nil).GetCacher), arg0) } @@ -2244,13 +2322,13 @@ func (m *MockXormEngine) GroupBy(keys string) *xorm.Session { } // GroupBy indicates an expected call of GroupBy. -func (mr *MockXormEngineMockRecorder) GroupBy(keys interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) GroupBy(keys any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupBy", reflect.TypeOf((*MockXormEngine)(nil).GroupBy), keys) } // ID mocks base method. -func (m *MockXormEngine) ID(arg0 interface{}) *xorm.Session { +func (m *MockXormEngine) ID(arg0 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -2258,7 +2336,7 @@ func (m *MockXormEngine) ID(arg0 interface{}) *xorm.Session { } // ID indicates an expected call of ID. -func (mr *MockXormEngineMockRecorder) ID(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockXormEngine)(nil).ID), arg0) } @@ -2273,15 +2351,15 @@ func (m *MockXormEngine) ImportFile(fp string) ([]sql.Result, error) { } // ImportFile indicates an expected call of ImportFile. -func (mr *MockXormEngineMockRecorder) ImportFile(fp interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ImportFile(fp any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImportFile", reflect.TypeOf((*MockXormEngine)(nil).ImportFile), fp) } // In mocks base method. -func (m *MockXormEngine) In(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) In(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2291,16 +2369,16 @@ func (m *MockXormEngine) In(arg0 string, arg1 ...interface{}) *xorm.Session { } // In indicates an expected call of In. -func (mr *MockXormEngineMockRecorder) In(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) In(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "In", reflect.TypeOf((*MockXormEngine)(nil).In), varargs...) } // Incr mocks base method. -func (m *MockXormEngine) Incr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXormEngine) Incr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -2310,16 +2388,16 @@ func (m *MockXormEngine) Incr(column string, arg ...interface{}) *xorm.Session { } // Incr indicates an expected call of Incr. -func (mr *MockXormEngineMockRecorder) Incr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Incr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockXormEngine)(nil).Incr), varargs...) } // Insert mocks base method. -func (m *MockXormEngine) Insert(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Insert(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2330,13 +2408,13 @@ func (m *MockXormEngine) Insert(arg0 ...interface{}) (int64, error) { } // Insert indicates an expected call of Insert. -func (mr *MockXormEngineMockRecorder) Insert(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Insert(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockXormEngine)(nil).Insert), arg0...) } // InsertOne mocks base method. -func (m *MockXormEngine) InsertOne(arg0 interface{}) (int64, error) { +func (m *MockXormEngine) InsertOne(arg0 any) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertOne", arg0) ret0, _ := ret[0].(int64) @@ -2345,13 +2423,13 @@ func (m *MockXormEngine) InsertOne(arg0 interface{}) (int64, error) { } // InsertOne indicates an expected call of InsertOne. -func (mr *MockXormEngineMockRecorder) InsertOne(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) InsertOne(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertOne", reflect.TypeOf((*MockXormEngine)(nil).InsertOne), arg0) } // IsTableEmpty mocks base method. -func (m *MockXormEngine) IsTableEmpty(bean interface{}) (bool, error) { +func (m *MockXormEngine) IsTableEmpty(bean any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableEmpty", bean) ret0, _ := ret[0].(bool) @@ -2360,13 +2438,13 @@ func (m *MockXormEngine) IsTableEmpty(bean interface{}) (bool, error) { } // IsTableEmpty indicates an expected call of IsTableEmpty. -func (mr *MockXormEngineMockRecorder) IsTableEmpty(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) IsTableEmpty(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableEmpty", reflect.TypeOf((*MockXormEngine)(nil).IsTableEmpty), bean) } // IsTableExist mocks base method. -func (m *MockXormEngine) IsTableExist(beanOrTableName interface{}) (bool, error) { +func (m *MockXormEngine) IsTableExist(beanOrTableName any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableExist", beanOrTableName) ret0, _ := ret[0].(bool) @@ -2375,13 +2453,13 @@ func (m *MockXormEngine) IsTableExist(beanOrTableName interface{}) (bool, error) } // IsTableExist indicates an expected call of IsTableExist. -func (mr *MockXormEngineMockRecorder) IsTableExist(beanOrTableName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) IsTableExist(beanOrTableName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableExist", reflect.TypeOf((*MockXormEngine)(nil).IsTableExist), beanOrTableName) } // Iterate mocks base method. -func (m *MockXormEngine) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { +func (m *MockXormEngine) Iterate(arg0 any, arg1 xorm.IterFunc) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -2389,15 +2467,15 @@ func (m *MockXormEngine) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { } // Iterate indicates an expected call of Iterate. -func (mr *MockXormEngineMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Iterate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockXormEngine)(nil).Iterate), arg0, arg1) } // Join mocks base method. -func (m *MockXormEngine) Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *xorm.Session { +func (m *MockXormEngine) Join(joinOperator string, tablename any, condition string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{joinOperator, tablename, condition} + varargs := []any{joinOperator, tablename, condition} for _, a := range args { varargs = append(varargs, a) } @@ -2407,16 +2485,16 @@ func (m *MockXormEngine) Join(joinOperator string, tablename interface{}, condit } // Join indicates an expected call of Join. -func (mr *MockXormEngineMockRecorder) Join(joinOperator, tablename, condition interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Join(joinOperator, tablename, condition any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{joinOperator, tablename, condition}, args...) + varargs := append([]any{joinOperator, tablename, condition}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Join", reflect.TypeOf((*MockXormEngine)(nil).Join), varargs...) } // Limit mocks base method. func (m *MockXormEngine) Limit(arg0 int, arg1 ...int) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2426,14 +2504,14 @@ func (m *MockXormEngine) Limit(arg0 int, arg1 ...int) *xorm.Session { } // Limit indicates an expected call of Limit. -func (mr *MockXormEngineMockRecorder) Limit(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Limit(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Limit", reflect.TypeOf((*MockXormEngine)(nil).Limit), varargs...) } // MapCacher mocks base method. -func (m *MockXormEngine) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { +func (m *MockXormEngine) MapCacher(arg0 any, arg1 caches.Cacher) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MapCacher", arg0, arg1) ret0, _ := ret[0].(error) @@ -2441,7 +2519,7 @@ func (m *MockXormEngine) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { } // MapCacher indicates an expected call of MapCacher. -func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MapCacher", reflect.TypeOf((*MockXormEngine)(nil).MapCacher), arg0, arg1) } @@ -2449,7 +2527,7 @@ func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock. // MustCols mocks base method. func (m *MockXormEngine) MustCols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -2459,7 +2537,7 @@ func (m *MockXormEngine) MustCols(columns ...string) *xorm.Session { } // MustCols indicates an expected call of MustCols. -func (mr *MockXormEngineMockRecorder) MustCols(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) MustCols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MustCols", reflect.TypeOf((*MockXormEngine)(nil).MustCols), columns...) } @@ -2481,7 +2559,7 @@ func (mr *MockXormEngineMockRecorder) NewSession() *gomock.Call { // NoAutoCondition mocks base method. func (m *MockXormEngine) NoAutoCondition(arg0 ...bool) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2491,7 +2569,7 @@ func (m *MockXormEngine) NoAutoCondition(arg0 ...bool) *xorm.Session { } // NoAutoCondition indicates an expected call of NoAutoCondition. -func (mr *MockXormEngineMockRecorder) NoAutoCondition(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) NoAutoCondition(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NoAutoCondition", reflect.TypeOf((*MockXormEngine)(nil).NoAutoCondition), arg0...) } @@ -2511,9 +2589,9 @@ func (mr *MockXormEngineMockRecorder) NoAutoTime() *gomock.Call { } // NotIn mocks base method. -func (m *MockXormEngine) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) NotIn(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2523,16 +2601,16 @@ func (m *MockXormEngine) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { } // NotIn indicates an expected call of NotIn. -func (mr *MockXormEngineMockRecorder) NotIn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) NotIn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotIn", reflect.TypeOf((*MockXormEngine)(nil).NotIn), varargs...) } // Nullable mocks base method. func (m *MockXormEngine) Nullable(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2542,7 +2620,7 @@ func (m *MockXormEngine) Nullable(arg0 ...string) *xorm.Session { } // Nullable indicates an expected call of Nullable. -func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Nullable", reflect.TypeOf((*MockXormEngine)(nil).Nullable), arg0...) } @@ -2550,7 +2628,7 @@ func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call // Omit mocks base method. func (m *MockXormEngine) Omit(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -2560,15 +2638,15 @@ func (m *MockXormEngine) Omit(columns ...string) *xorm.Session { } // Omit indicates an expected call of Omit. -func (mr *MockXormEngineMockRecorder) Omit(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Omit(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Omit", reflect.TypeOf((*MockXormEngine)(nil).Omit), columns...) } // OrderBy mocks base method. -func (m *MockXormEngine) OrderBy(order interface{}, args ...interface{}) *xorm.Session { +func (m *MockXormEngine) OrderBy(order any, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{order} + varargs := []any{order} for _, a := range args { varargs = append(varargs, a) } @@ -2578,9 +2656,9 @@ func (m *MockXormEngine) OrderBy(order interface{}, args ...interface{}) *xorm.S } // OrderBy indicates an expected call of OrderBy. -func (mr *MockXormEngineMockRecorder) OrderBy(order interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) OrderBy(order any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{order}, args...) + varargs := append([]any{order}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OrderBy", reflect.TypeOf((*MockXormEngine)(nil).OrderBy), varargs...) } @@ -2613,9 +2691,9 @@ func (mr *MockXormEngineMockRecorder) Prepare() *gomock.Call { } // Query mocks base method. -func (m *MockXormEngine) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) { +func (m *MockXormEngine) Query(sqlOrArgs ...any) ([]map[string][]byte, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2626,34 +2704,34 @@ func (m *MockXormEngine) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, e } // Query indicates an expected call of Query. -func (mr *MockXormEngineMockRecorder) Query(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Query(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockXormEngine)(nil).Query), sqlOrArgs...) } // QueryInterface mocks base method. -func (m *MockXormEngine) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) { +func (m *MockXormEngine) QueryInterface(sqlOrArgs ...any) ([]map[string]any, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryInterface", varargs...) - ret0, _ := ret[0].([]map[string]interface{}) + ret0, _ := ret[0].([]map[string]any) ret1, _ := ret[1].(error) return ret0, ret1 } // QueryInterface indicates an expected call of QueryInterface. -func (mr *MockXormEngineMockRecorder) QueryInterface(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) QueryInterface(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryInterface", reflect.TypeOf((*MockXormEngine)(nil).QueryInterface), sqlOrArgs...) } // QueryString mocks base method. -func (m *MockXormEngine) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) { +func (m *MockXormEngine) QueryString(sqlOrArgs ...any) ([]map[string]string, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2664,7 +2742,7 @@ func (m *MockXormEngine) QueryString(sqlOrArgs ...interface{}) ([]map[string]str } // QueryString indicates an expected call of QueryString. -func (mr *MockXormEngineMockRecorder) QueryString(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) QueryString(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryString", reflect.TypeOf((*MockXormEngine)(nil).QueryString), sqlOrArgs...) } @@ -2678,13 +2756,13 @@ func (m *MockXormEngine) Quote(arg0 string) string { } // Quote indicates an expected call of Quote. -func (mr *MockXormEngineMockRecorder) Quote(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Quote(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Quote", reflect.TypeOf((*MockXormEngine)(nil).Quote), arg0) } // Rows mocks base method. -func (m *MockXormEngine) Rows(bean interface{}) (*xorm.Rows, error) { +func (m *MockXormEngine) Rows(bean any) (*xorm.Rows, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Rows", bean) ret0, _ := ret[0].(*xorm.Rows) @@ -2693,15 +2771,15 @@ func (m *MockXormEngine) Rows(bean interface{}) (*xorm.Rows, error) { } // Rows indicates an expected call of Rows. -func (mr *MockXormEngineMockRecorder) Rows(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Rows(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rows", reflect.TypeOf((*MockXormEngine)(nil).Rows), bean) } // SQL mocks base method. -func (m *MockXormEngine) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) SQL(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2711,9 +2789,9 @@ func (m *MockXormEngine) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Sessio } // SQL indicates an expected call of SQL. -func (mr *MockXormEngineMockRecorder) SQL(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SQL(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SQL", reflect.TypeOf((*MockXormEngine)(nil).SQL), varargs...) } @@ -2726,7 +2804,7 @@ func (m *MockXormEngine) Select(arg0 string) *xorm.Session { } // Select indicates an expected call of Select. -func (mr *MockXormEngineMockRecorder) Select(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Select(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Select", reflect.TypeOf((*MockXormEngine)(nil).Select), arg0) } @@ -2738,7 +2816,7 @@ func (m *MockXormEngine) SetCacher(arg0 string, arg1 caches.Cacher) { } // SetCacher indicates an expected call of SetCacher. -func (mr *MockXormEngineMockRecorder) SetCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCacher", reflect.TypeOf((*MockXormEngine)(nil).SetCacher), arg0, arg1) } @@ -2750,7 +2828,7 @@ func (m *MockXormEngine) SetColumnMapper(arg0 names.Mapper) { } // SetColumnMapper indicates an expected call of SetColumnMapper. -func (mr *MockXormEngineMockRecorder) SetColumnMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetColumnMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColumnMapper", reflect.TypeOf((*MockXormEngine)(nil).SetColumnMapper), arg0) } @@ -2762,7 +2840,7 @@ func (m *MockXormEngine) SetConnMaxLifetime(arg0 time.Duration) { } // SetConnMaxLifetime indicates an expected call of SetConnMaxLifetime. -func (mr *MockXormEngineMockRecorder) SetConnMaxLifetime(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetConnMaxLifetime(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetConnMaxLifetime", reflect.TypeOf((*MockXormEngine)(nil).SetConnMaxLifetime), arg0) } @@ -2774,13 +2852,13 @@ func (m *MockXormEngine) SetDefaultCacher(arg0 caches.Cacher) { } // SetDefaultCacher indicates an expected call of SetDefaultCacher. -func (mr *MockXormEngineMockRecorder) SetDefaultCacher(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetDefaultCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefaultCacher", reflect.TypeOf((*MockXormEngine)(nil).SetDefaultCacher), arg0) } // SetExpr mocks base method. -func (m *MockXormEngine) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { +func (m *MockXormEngine) SetExpr(arg0 string, arg1 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetExpr", arg0, arg1) ret0, _ := ret[0].(*xorm.Session) @@ -2788,7 +2866,7 @@ func (m *MockXormEngine) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { } // SetExpr indicates an expected call of SetExpr. -func (mr *MockXormEngineMockRecorder) SetExpr(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetExpr(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExpr", reflect.TypeOf((*MockXormEngine)(nil).SetExpr), arg0, arg1) } @@ -2800,19 +2878,19 @@ func (m *MockXormEngine) SetLogLevel(arg0 log.LogLevel) { } // SetLogLevel indicates an expected call of SetLogLevel. -func (mr *MockXormEngineMockRecorder) SetLogLevel(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetLogLevel(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogLevel", reflect.TypeOf((*MockXormEngine)(nil).SetLogLevel), arg0) } // SetLogger mocks base method. -func (m *MockXormEngine) SetLogger(logger interface{}) { +func (m *MockXormEngine) SetLogger(logger any) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetLogger", logger) } // SetLogger indicates an expected call of SetLogger. -func (mr *MockXormEngineMockRecorder) SetLogger(logger interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetLogger(logger any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogger", reflect.TypeOf((*MockXormEngine)(nil).SetLogger), logger) } @@ -2824,7 +2902,7 @@ func (m *MockXormEngine) SetMapper(arg0 names.Mapper) { } // SetMapper indicates an expected call of SetMapper. -func (mr *MockXormEngineMockRecorder) SetMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMapper", reflect.TypeOf((*MockXormEngine)(nil).SetMapper), arg0) } @@ -2836,7 +2914,7 @@ func (m *MockXormEngine) SetMaxIdleConns(arg0 int) { } // SetMaxIdleConns indicates an expected call of SetMaxIdleConns. -func (mr *MockXormEngineMockRecorder) SetMaxIdleConns(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMaxIdleConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxIdleConns", reflect.TypeOf((*MockXormEngine)(nil).SetMaxIdleConns), arg0) } @@ -2848,7 +2926,7 @@ func (m *MockXormEngine) SetMaxOpenConns(arg0 int) { } // SetMaxOpenConns indicates an expected call of SetMaxOpenConns. -func (mr *MockXormEngineMockRecorder) SetMaxOpenConns(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMaxOpenConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxOpenConns", reflect.TypeOf((*MockXormEngine)(nil).SetMaxOpenConns), arg0) } @@ -2860,7 +2938,7 @@ func (m *MockXormEngine) SetQuotePolicy(arg0 dialects.QuotePolicy) { } // SetQuotePolicy indicates an expected call of SetQuotePolicy. -func (mr *MockXormEngineMockRecorder) SetQuotePolicy(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetQuotePolicy(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQuotePolicy", reflect.TypeOf((*MockXormEngine)(nil).SetQuotePolicy), arg0) } @@ -2872,7 +2950,7 @@ func (m *MockXormEngine) SetSchema(arg0 string) { } // SetSchema indicates an expected call of SetSchema. -func (mr *MockXormEngineMockRecorder) SetSchema(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetSchema(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSchema", reflect.TypeOf((*MockXormEngine)(nil).SetSchema), arg0) } @@ -2884,7 +2962,7 @@ func (m *MockXormEngine) SetTZDatabase(tz *time.Location) { } // SetTZDatabase indicates an expected call of SetTZDatabase. -func (mr *MockXormEngineMockRecorder) SetTZDatabase(tz interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTZDatabase(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZDatabase", reflect.TypeOf((*MockXormEngine)(nil).SetTZDatabase), tz) } @@ -2896,7 +2974,7 @@ func (m *MockXormEngine) SetTZLocation(tz *time.Location) { } // SetTZLocation indicates an expected call of SetTZLocation. -func (mr *MockXormEngineMockRecorder) SetTZLocation(tz interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTZLocation(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZLocation", reflect.TypeOf((*MockXormEngine)(nil).SetTZLocation), tz) } @@ -2908,7 +2986,7 @@ func (m *MockXormEngine) SetTableMapper(arg0 names.Mapper) { } // SetTableMapper indicates an expected call of SetTableMapper. -func (mr *MockXormEngineMockRecorder) SetTableMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTableMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTableMapper", reflect.TypeOf((*MockXormEngine)(nil).SetTableMapper), arg0) } @@ -2920,7 +2998,7 @@ func (m *MockXormEngine) SetTagIdentifier(arg0 string) { } // SetTagIdentifier indicates an expected call of SetTagIdentifier. -func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTagIdentifier", reflect.TypeOf((*MockXormEngine)(nil).SetTagIdentifier), arg0) } @@ -2928,7 +3006,7 @@ func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock // ShowSQL mocks base method. func (m *MockXormEngine) ShowSQL(show ...bool) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range show { varargs = append(varargs, a) } @@ -2936,7 +3014,7 @@ func (m *MockXormEngine) ShowSQL(show ...bool) { } // ShowSQL indicates an expected call of ShowSQL. -func (mr *MockXormEngineMockRecorder) ShowSQL(show ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ShowSQL(show ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowSQL", reflect.TypeOf((*MockXormEngine)(nil).ShowSQL), show...) } @@ -2944,7 +3022,7 @@ func (mr *MockXormEngineMockRecorder) ShowSQL(show ...interface{}) *gomock.Call // Sqlx mocks base method. func (m *MockXormEngine) Sqlx(sql string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{sql} + varargs := []any{sql} for _, a := range args { varargs = append(varargs, a) } @@ -2954,9 +3032,9 @@ func (m *MockXormEngine) Sqlx(sql string, args ...any) *xorm.Session { } // Sqlx indicates an expected call of Sqlx. -func (mr *MockXormEngineMockRecorder) Sqlx(sql interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sqlx(sql any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{sql}, args...) + varargs := append([]any{sql}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sqlx", reflect.TypeOf((*MockXormEngine)(nil).Sqlx), varargs...) } @@ -2969,13 +3047,13 @@ func (m *MockXormEngine) StoreEngine(storeEngine string) *xorm.Session { } // StoreEngine indicates an expected call of StoreEngine. -func (mr *MockXormEngineMockRecorder) StoreEngine(storeEngine interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) StoreEngine(storeEngine any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreEngine", reflect.TypeOf((*MockXormEngine)(nil).StoreEngine), storeEngine) } // Sum mocks base method. -func (m *MockXormEngine) Sum(bean interface{}, colName string) (float64, error) { +func (m *MockXormEngine) Sum(bean any, colName string) (float64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sum", bean, colName) ret0, _ := ret[0].(float64) @@ -2984,13 +3062,13 @@ func (m *MockXormEngine) Sum(bean interface{}, colName string) (float64, error) } // Sum indicates an expected call of Sum. -func (mr *MockXormEngineMockRecorder) Sum(bean, colName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sum(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockXormEngine)(nil).Sum), bean, colName) } // SumInt mocks base method. -func (m *MockXormEngine) SumInt(bean interface{}, colName string) (int64, error) { +func (m *MockXormEngine) SumInt(bean any, colName string) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SumInt", bean, colName) ret0, _ := ret[0].(int64) @@ -2999,15 +3077,15 @@ func (m *MockXormEngine) SumInt(bean interface{}, colName string) (int64, error) } // SumInt indicates an expected call of SumInt. -func (mr *MockXormEngineMockRecorder) SumInt(bean, colName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SumInt(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumInt", reflect.TypeOf((*MockXormEngine)(nil).SumInt), bean, colName) } // Sums mocks base method. -func (m *MockXormEngine) Sums(bean interface{}, colNames ...string) ([]float64, error) { +func (m *MockXormEngine) Sums(bean any, colNames ...string) ([]float64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -3018,16 +3096,16 @@ func (m *MockXormEngine) Sums(bean interface{}, colNames ...string) ([]float64, } // Sums indicates an expected call of Sums. -func (mr *MockXormEngineMockRecorder) Sums(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sums(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sums", reflect.TypeOf((*MockXormEngine)(nil).Sums), varargs...) } // SumsInt mocks base method. -func (m *MockXormEngine) SumsInt(bean interface{}, colNames ...string) ([]int64, error) { +func (m *MockXormEngine) SumsInt(bean any, colNames ...string) ([]int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -3038,16 +3116,16 @@ func (m *MockXormEngine) SumsInt(bean interface{}, colNames ...string) ([]int64, } // SumsInt indicates an expected call of SumsInt. -func (mr *MockXormEngineMockRecorder) SumsInt(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SumsInt(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumsInt", reflect.TypeOf((*MockXormEngine)(nil).SumsInt), varargs...) } // Sync mocks base method. -func (m *MockXormEngine) Sync(arg0 ...interface{}) error { +func (m *MockXormEngine) Sync(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3057,15 +3135,15 @@ func (m *MockXormEngine) Sync(arg0 ...interface{}) error { } // Sync indicates an expected call of Sync. -func (mr *MockXormEngineMockRecorder) Sync(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sync(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockXormEngine)(nil).Sync), arg0...) } // Sync2 mocks base method. -func (m *MockXormEngine) Sync2(arg0 ...interface{}) error { +func (m *MockXormEngine) Sync2(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3075,13 +3153,13 @@ func (m *MockXormEngine) Sync2(arg0 ...interface{}) error { } // Sync2 indicates an expected call of Sync2. -func (mr *MockXormEngineMockRecorder) Sync2(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sync2(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync2", reflect.TypeOf((*MockXormEngine)(nil).Sync2), arg0...) } // Table mocks base method. -func (m *MockXormEngine) Table(tableNameOrBean interface{}) *xorm.Session { +func (m *MockXormEngine) Table(tableNameOrBean any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Table", tableNameOrBean) ret0, _ := ret[0].(*xorm.Session) @@ -3089,13 +3167,13 @@ func (m *MockXormEngine) Table(tableNameOrBean interface{}) *xorm.Session { } // Table indicates an expected call of Table. -func (mr *MockXormEngineMockRecorder) Table(tableNameOrBean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Table(tableNameOrBean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Table", reflect.TypeOf((*MockXormEngine)(nil).Table), tableNameOrBean) } // TableInfo mocks base method. -func (m *MockXormEngine) TableInfo(bean interface{}) (*schemas.Table, error) { +func (m *MockXormEngine) TableInfo(bean any) (*schemas.Table, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TableInfo", bean) ret0, _ := ret[0].(*schemas.Table) @@ -3104,15 +3182,15 @@ func (m *MockXormEngine) TableInfo(bean interface{}) (*schemas.Table, error) { } // TableInfo indicates an expected call of TableInfo. -func (mr *MockXormEngineMockRecorder) TableInfo(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) TableInfo(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableInfo", reflect.TypeOf((*MockXormEngine)(nil).TableInfo), bean) } // TableName mocks base method. -func (m *MockXormEngine) TableName(arg0 interface{}, arg1 ...bool) string { +func (m *MockXormEngine) TableName(arg0 any, arg1 ...bool) string { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -3122,9 +3200,9 @@ func (m *MockXormEngine) TableName(arg0 interface{}, arg1 ...bool) string { } // TableName indicates an expected call of TableName. -func (mr *MockXormEngineMockRecorder) TableName(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) TableName(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableName", reflect.TypeOf((*MockXormEngine)(nil).TableName), varargs...) } @@ -3137,7 +3215,7 @@ func (m *MockXormEngine) Transaction(fn func(xorm.Interface) error) error { } // Transaction indicates an expected call of Transaction. -func (mr *MockXormEngineMockRecorder) Transaction(fn interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Transaction(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transaction", reflect.TypeOf((*MockXormEngine)(nil).Transaction), fn) } @@ -3149,7 +3227,7 @@ func (m *MockXormEngine) UnMapType(arg0 reflect.Type) { } // UnMapType indicates an expected call of UnMapType. -func (mr *MockXormEngineMockRecorder) UnMapType(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) UnMapType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnMapType", reflect.TypeOf((*MockXormEngine)(nil).UnMapType), arg0) } @@ -3169,9 +3247,9 @@ func (mr *MockXormEngineMockRecorder) Unscoped() *gomock.Call { } // Update mocks base method. -func (m *MockXormEngine) Update(bean interface{}, condiBeans ...interface{}) (int64, error) { +func (m *MockXormEngine) Update(bean any, condiBeans ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range condiBeans { varargs = append(varargs, a) } @@ -3182,16 +3260,16 @@ func (m *MockXormEngine) Update(bean interface{}, condiBeans ...interface{}) (in } // Update indicates an expected call of Update. -func (mr *MockXormEngineMockRecorder) Update(bean interface{}, condiBeans ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Update(bean any, condiBeans ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, condiBeans...) + varargs := append([]any{bean}, condiBeans...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockXormEngine)(nil).Update), varargs...) } // UseBool mocks base method. func (m *MockXormEngine) UseBool(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3201,15 +3279,15 @@ func (m *MockXormEngine) UseBool(arg0 ...string) *xorm.Session { } // UseBool indicates an expected call of UseBool. -func (mr *MockXormEngineMockRecorder) UseBool(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) UseBool(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseBool", reflect.TypeOf((*MockXormEngine)(nil).UseBool), arg0...) } // Where mocks base method. -func (m *MockXormEngine) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) Where(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -3219,9 +3297,9 @@ func (m *MockXormEngine) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Sess } // Where indicates an expected call of Where. -func (mr *MockXormEngineMockRecorder) Where(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Where(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Where", reflect.TypeOf((*MockXormEngine)(nil).Where), varargs...) } @@ -3230,6 +3308,7 @@ type MockCMuxServer struct { goneMock.Flag ctrl *gomock.Controller recorder *MockCMuxServerMockRecorder + isgomock struct{} } // MockCMuxServerMockRecorder is the mock recorder for MockCMuxServer. @@ -3266,7 +3345,7 @@ func (mr *MockCMuxServerMockRecorder) GetAddress() *gomock.Call { // Match mocks base method. func (m *MockCMuxServer) Match(matcher ...cmux.Matcher) net.Listener { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range matcher { varargs = append(varargs, a) } @@ -3276,7 +3355,7 @@ func (m *MockCMuxServer) Match(matcher ...cmux.Matcher) net.Listener { } // Match indicates an expected call of Match. -func (mr *MockCMuxServerMockRecorder) Match(matcher ...interface{}) *gomock.Call { +func (mr *MockCMuxServerMockRecorder) Match(matcher ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Match", reflect.TypeOf((*MockCMuxServer)(nil).Match), matcher...) } @@ -3284,7 +3363,7 @@ func (mr *MockCMuxServerMockRecorder) Match(matcher ...interface{}) *gomock.Call // MatchWithWriters mocks base method. func (m *MockCMuxServer) MatchWithWriters(matcher ...cmux.MatchWriter) net.Listener { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range matcher { varargs = append(varargs, a) } @@ -3294,7 +3373,7 @@ func (m *MockCMuxServer) MatchWithWriters(matcher ...cmux.MatchWriter) net.Liste } // MatchWithWriters indicates an expected call of MatchWithWriters. -func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...interface{}) *gomock.Call { +func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MatchWithWriters", reflect.TypeOf((*MockCMuxServer)(nil).MatchWithWriters), matcher...) } @@ -3304,6 +3383,7 @@ type MockConfigure struct { goneMock.Flag ctrl *gomock.Controller recorder *MockConfigureMockRecorder + isgomock struct{} } // MockConfigureMockRecorder is the mock recorder for MockConfigure. @@ -3332,7 +3412,46 @@ func (m *MockConfigure) Get(key string, v any, defaultVal string) error { } // Get indicates an expected call of Get. -func (mr *MockConfigureMockRecorder) Get(key, v, defaultVal interface{}) *gomock.Call { +func (mr *MockConfigureMockRecorder) Get(key, v, defaultVal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockConfigure)(nil).Get), key, v, defaultVal) } + +// MockNamedGoner is a mock of NamedGoner interface. +type MockNamedGoner struct { + goneMock.Flag + ctrl *gomock.Controller + recorder *MockNamedGonerMockRecorder + isgomock struct{} +} + +// MockNamedGonerMockRecorder is the mock recorder for MockNamedGoner. +type MockNamedGonerMockRecorder struct { + mock *MockNamedGoner +} + +// NewMockNamedGoner creates a new mock instance. +func NewMockNamedGoner(ctrl *gomock.Controller) *MockNamedGoner { + mock := &MockNamedGoner{ctrl: ctrl} + mock.recorder = &MockNamedGonerMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockNamedGoner) EXPECT() *MockNamedGonerMockRecorder { + return m.recorder +} + +// GetGonerId mocks base method. +func (m *MockNamedGoner) GetGonerId() gone.GonerId { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetGonerId") + ret0, _ := ret[0].(gone.GonerId) + return ret0 +} + +// GetGonerId indicates an expected call of GetGonerId. +func (mr *MockNamedGonerMockRecorder) GetGonerId() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGonerId", reflect.TypeOf((*MockNamedGoner)(nil).GetGonerId)) +} diff --git a/goner/gin/http-injector_test.go b/goner/gin/http-injector_test.go index 99b8bfe..4fba404 100644 --- a/goner/gin/http-injector_test.go +++ b/goner/gin/http-injector_test.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/internal/json" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "gopkg.in/yaml.v3" "io" "net/http" diff --git a/goner/gin/mock_test.go b/goner/gin/mock_test.go index b29e06a..e080251 100644 --- a/goner/gin/mock_test.go +++ b/goner/gin/mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interface.go +// +// Generated by this command: +// +// mockgen -package=gin -self_package=github.com/gone-io/gone/goner/gin -source=interface.go +// // Package gin is a generated GoMock package. package gin @@ -9,7 +14,7 @@ import ( reflect "reflect" gin "github.com/gin-gonic/gin" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockController is a mock of Controller interface. @@ -17,6 +22,7 @@ type MockController struct { goneMock.Flag ctrl *gomock.Controller recorder *MockControllerMockRecorder + isgomock struct{} } // MockControllerMockRecorder is the mock recorder for MockController. @@ -55,6 +61,7 @@ type MockHandleProxyToGin struct { goneMock.Flag ctrl *gomock.Controller recorder *MockHandleProxyToGinMockRecorder + isgomock struct{} } // MockHandleProxyToGinMockRecorder is the mock recorder for MockHandleProxyToGin. @@ -77,7 +84,7 @@ func (m *MockHandleProxyToGin) EXPECT() *MockHandleProxyToGinMockRecorder { // Proxy mocks base method. func (m *MockHandleProxyToGin) Proxy(handler ...HandlerFunc) []gin.HandlerFunc { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range handler { varargs = append(varargs, a) } @@ -87,7 +94,7 @@ func (m *MockHandleProxyToGin) Proxy(handler ...HandlerFunc) []gin.HandlerFunc { } // Proxy indicates an expected call of Proxy. -func (mr *MockHandleProxyToGinMockRecorder) Proxy(handler ...interface{}) *gomock.Call { +func (mr *MockHandleProxyToGinMockRecorder) Proxy(handler ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Proxy", reflect.TypeOf((*MockHandleProxyToGin)(nil).Proxy), handler...) } @@ -95,7 +102,7 @@ func (mr *MockHandleProxyToGinMockRecorder) Proxy(handler ...interface{}) *gomoc // ProxyForMiddleware mocks base method. func (m *MockHandleProxyToGin) ProxyForMiddleware(handlers ...HandlerFunc) []gin.HandlerFunc { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range handlers { varargs = append(varargs, a) } @@ -105,7 +112,7 @@ func (m *MockHandleProxyToGin) ProxyForMiddleware(handlers ...HandlerFunc) []gin } // ProxyForMiddleware indicates an expected call of ProxyForMiddleware. -func (mr *MockHandleProxyToGinMockRecorder) ProxyForMiddleware(handlers ...interface{}) *gomock.Call { +func (mr *MockHandleProxyToGinMockRecorder) ProxyForMiddleware(handlers ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProxyForMiddleware", reflect.TypeOf((*MockHandleProxyToGin)(nil).ProxyForMiddleware), handlers...) } @@ -115,6 +122,7 @@ type MockXContext struct { goneMock.Flag ctrl *gomock.Controller recorder *MockXContextMockRecorder + isgomock struct{} } // MockXContextMockRecorder is the mock recorder for MockXContext. @@ -153,7 +161,7 @@ func (m *MockXContext) JSON(code int, obj any) { } // JSON indicates an expected call of JSON. -func (mr *MockXContextMockRecorder) JSON(code, obj interface{}) *gomock.Call { +func (mr *MockXContextMockRecorder) JSON(code, obj any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "JSON", reflect.TypeOf((*MockXContext)(nil).JSON), code, obj) } @@ -161,7 +169,7 @@ func (mr *MockXContextMockRecorder) JSON(code, obj interface{}) *gomock.Call { // String mocks base method. func (m *MockXContext) String(code int, format string, values ...any) { m.ctrl.T.Helper() - varargs := []interface{}{code, format} + varargs := []any{code, format} for _, a := range values { varargs = append(varargs, a) } @@ -169,9 +177,9 @@ func (m *MockXContext) String(code int, format string, values ...any) { } // String indicates an expected call of String. -func (mr *MockXContextMockRecorder) String(code, format interface{}, values ...interface{}) *gomock.Call { +func (mr *MockXContextMockRecorder) String(code, format any, values ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{code, format}, values...) + varargs := append([]any{code, format}, values...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "String", reflect.TypeOf((*MockXContext)(nil).String), varargs...) } @@ -180,6 +188,7 @@ type MockResponser struct { goneMock.Flag ctrl *gomock.Controller recorder *MockResponserMockRecorder + isgomock struct{} } // MockResponserMockRecorder is the mock recorder for MockResponser. @@ -206,7 +215,7 @@ func (m *MockResponser) Failed(ctx XContext, err error) { } // Failed indicates an expected call of Failed. -func (mr *MockResponserMockRecorder) Failed(ctx, err interface{}) *gomock.Call { +func (mr *MockResponserMockRecorder) Failed(ctx, err any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Failed", reflect.TypeOf((*MockResponser)(nil).Failed), ctx, err) } @@ -214,7 +223,7 @@ func (mr *MockResponserMockRecorder) Failed(ctx, err interface{}) *gomock.Call { // ProcessResults mocks base method. func (m *MockResponser) ProcessResults(context XContext, writer gin.ResponseWriter, last bool, funcName string, results ...any) { m.ctrl.T.Helper() - varargs := []interface{}{context, writer, last, funcName} + varargs := []any{context, writer, last, funcName} for _, a := range results { varargs = append(varargs, a) } @@ -222,9 +231,9 @@ func (m *MockResponser) ProcessResults(context XContext, writer gin.ResponseWrit } // ProcessResults indicates an expected call of ProcessResults. -func (mr *MockResponserMockRecorder) ProcessResults(context, writer, last, funcName interface{}, results ...interface{}) *gomock.Call { +func (mr *MockResponserMockRecorder) ProcessResults(context, writer, last, funcName any, results ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{context, writer, last, funcName}, results...) + varargs := append([]any{context, writer, last, funcName}, results...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProcessResults", reflect.TypeOf((*MockResponser)(nil).ProcessResults), varargs...) } @@ -235,7 +244,7 @@ func (m *MockResponser) Success(ctx XContext, data any) { } // Success indicates an expected call of Success. -func (mr *MockResponserMockRecorder) Success(ctx, data interface{}) *gomock.Call { +func (mr *MockResponserMockRecorder) Success(ctx, data any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Success", reflect.TypeOf((*MockResponser)(nil).Success), ctx, data) } @@ -245,6 +254,7 @@ type MockHttInjector struct { goneMock.Flag ctrl *gomock.Controller recorder *MockHttInjectorMockRecorder + isgomock struct{} } // MockHttInjectorMockRecorder is the mock recorder for MockHttInjector. @@ -295,6 +305,7 @@ type MockMiddleware struct { goneMock.Flag ctrl *gomock.Controller recorder *MockMiddlewareMockRecorder + isgomock struct{} } // MockMiddlewareMockRecorder is the mock recorder for MockMiddleware. @@ -321,7 +332,7 @@ func (m *MockMiddleware) Process(ctx *gin.Context) { } // Process indicates an expected call of Process. -func (mr *MockMiddlewareMockRecorder) Process(ctx interface{}) *gomock.Call { +func (mr *MockMiddlewareMockRecorder) Process(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Process", reflect.TypeOf((*MockMiddleware)(nil).Process), ctx) } diff --git a/goner/gin/net_listener_mock_test.go b/goner/gin/net_listener_mock_test.go index f8d5ec7..39a1ea1 100644 --- a/goner/gin/net_listener_mock_test.go +++ b/goner/gin/net_listener_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: net (interfaces: Listener) +// +// Generated by this command: +// +// mockgen -package=gin net Listener +// // Package gin is a generated GoMock package. package gin @@ -8,13 +13,14 @@ import ( net "net" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockListener is a mock of Listener interface. type MockListener struct { ctrl *gomock.Controller recorder *MockListenerMockRecorder + isgomock struct{} } // MockListenerMockRecorder is the mock recorder for MockListener. diff --git a/goner/gin/proxy_test.go b/goner/gin/proxy_test.go index 0c769c5..8f56e96 100644 --- a/goner/gin/proxy_test.go +++ b/goner/gin/proxy_test.go @@ -1,7 +1,6 @@ package gin_test import ( - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/gin" @@ -9,6 +8,7 @@ import ( "github.com/gone-io/gone/goner/tracer" "github.com/pkg/errors" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "reflect" "testing" ) diff --git a/goner/gin/responer_test.go b/goner/gin/responer_test.go index a655a14..963880d 100644 --- a/goner/gin/responer_test.go +++ b/goner/gin/responer_test.go @@ -2,9 +2,9 @@ package gin import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone/internal/json" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "net/http" "strings" "testing" diff --git a/goner/gin/router_test.go b/goner/gin/router_test.go index 3c4fc2f..4803965 100644 --- a/goner/gin/router_test.go +++ b/goner/gin/router_test.go @@ -2,8 +2,8 @@ package gin import ( "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" ) diff --git a/goner/gin/server_test.go b/goner/gin/server_test.go index 4ad4c44..2264613 100644 --- a/goner/gin/server_test.go +++ b/goner/gin/server_test.go @@ -2,9 +2,9 @@ package gin import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" ) diff --git a/goner/gin/sse_test.go b/goner/gin/sse_test.go index 5746081..beebd5b 100644 --- a/goner/gin/sse_test.go +++ b/goner/gin/sse_test.go @@ -2,9 +2,9 @@ package gin import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "net/http" "testing" ) diff --git a/goner/gin/sys_middleware_test.go b/goner/gin/sys_middleware_test.go index a2f2e3c..534cb19 100644 --- a/goner/gin/sys_middleware_test.go +++ b/goner/gin/sys_middleware_test.go @@ -4,12 +4,12 @@ import ( "bytes" "fmt" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/logrus" "github.com/gone-io/gone/internal/json" "github.com/google/uuid" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "golang.org/x/time/rate" "io" "net/http" diff --git a/goner/grpc/client_test.go b/goner/grpc/client_test.go index 0849b68..aa3ab01 100644 --- a/goner/grpc/client_test.go +++ b/goner/grpc/client_test.go @@ -2,12 +2,12 @@ package gone_grpc import ( "context" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/gone-io/gone/goner/tracer" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" diff --git a/goner/grpc/gone_mock_test.go b/goner/grpc/gone_mock_test.go index 70caa39..9c680e2 100644 --- a/goner/grpc/gone_mock_test.go +++ b/goner/grpc/gone_mock_test.go @@ -1,20 +1,25 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ../../interface.go +// +// Generated by this command: +// +// mockgen -package=gone_grpc -source=../../interface.go -mock_names=Server=CmuxServer +// // Package gone_grpc is a generated GoMock package. package gone_grpc import ( - goneMock "github.com/gone-io/gone" context "context" sql "database/sql" + goneMock "github.com/gone-io/gone" net "net" reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" gone "github.com/gone-io/gone" cmux "github.com/soheilhy/cmux" + gomock "go.uber.org/mock/gomock" xorm "xorm.io/xorm" caches "xorm.io/xorm/caches" contexts "xorm.io/xorm/contexts" @@ -29,6 +34,7 @@ type MockGoner struct { goneMock.Flag ctrl *gomock.Controller recorder *MockGonerMockRecorder + isgomock struct{} } // MockGonerMockRecorder is the mock recorder for MockGoner. @@ -60,78 +66,80 @@ func (mr *MockGonerMockRecorder) goneFlag() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "goneFlag", reflect.TypeOf((*MockGoner)(nil).goneFlag)) } -// Mockidentity is a mock of identity interface. -type Mockidentity struct { +// MockGonerOption is a mock of GonerOption interface. +type MockGonerOption struct { goneMock.Flag ctrl *gomock.Controller - recorder *MockidentityMockRecorder + recorder *MockGonerOptionMockRecorder + isgomock struct{} } -// MockidentityMockRecorder is the mock recorder for Mockidentity. -type MockidentityMockRecorder struct { - mock *Mockidentity +// MockGonerOptionMockRecorder is the mock recorder for MockGonerOption. +type MockGonerOptionMockRecorder struct { + mock *MockGonerOption } -// NewMockidentity creates a new mock instance. -func NewMockidentity(ctrl *gomock.Controller) *Mockidentity { - mock := &Mockidentity{ctrl: ctrl} - mock.recorder = &MockidentityMockRecorder{mock} +// NewMockGonerOption creates a new mock instance. +func NewMockGonerOption(ctrl *gomock.Controller) *MockGonerOption { + mock := &MockGonerOption{ctrl: ctrl} + mock.recorder = &MockGonerOptionMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *Mockidentity) EXPECT() *MockidentityMockRecorder { +func (m *MockGonerOption) EXPECT() *MockGonerOptionMockRecorder { return m.recorder } -// GetId mocks base method. -func (m *Mockidentity) GetId() gone.GonerId { +// option mocks base method. +func (m *MockGonerOption) option() { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetId") - ret0, _ := ret[0].(gone.GonerId) - return ret0 + m.ctrl.Call(m, "option") } -// GetId indicates an expected call of GetId. -func (mr *MockidentityMockRecorder) GetId() *gomock.Call { +// option indicates an expected call of option. +func (mr *MockGonerOptionMockRecorder) option() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetId", reflect.TypeOf((*Mockidentity)(nil).GetId)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "option", reflect.TypeOf((*MockGonerOption)(nil).option)) } -// MockGonerOption is a mock of GonerOption interface. -type MockGonerOption struct { +// Mockidentity is a mock of identity interface. +type Mockidentity struct { goneMock.Flag ctrl *gomock.Controller - recorder *MockGonerOptionMockRecorder + recorder *MockidentityMockRecorder + isgomock struct{} } -// MockGonerOptionMockRecorder is the mock recorder for MockGonerOption. -type MockGonerOptionMockRecorder struct { - mock *MockGonerOption +// MockidentityMockRecorder is the mock recorder for Mockidentity. +type MockidentityMockRecorder struct { + mock *Mockidentity } -// NewMockGonerOption creates a new mock instance. -func NewMockGonerOption(ctrl *gomock.Controller) *MockGonerOption { - mock := &MockGonerOption{ctrl: ctrl} - mock.recorder = &MockGonerOptionMockRecorder{mock} +// NewMockidentity creates a new mock instance. +func NewMockidentity(ctrl *gomock.Controller) *Mockidentity { + mock := &Mockidentity{ctrl: ctrl} + mock.recorder = &MockidentityMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockGonerOption) EXPECT() *MockGonerOptionMockRecorder { +func (m *Mockidentity) EXPECT() *MockidentityMockRecorder { return m.recorder } -// option mocks base method. -func (m *MockGonerOption) option() { +// GetId mocks base method. +func (m *Mockidentity) GetId() gone.GonerId { m.ctrl.T.Helper() - m.ctrl.Call(m, "option") + ret := m.ctrl.Call(m, "GetId") + ret0, _ := ret[0].(gone.GonerId) + return ret0 } -// option indicates an expected call of option. -func (mr *MockGonerOptionMockRecorder) option() *gomock.Call { +// GetId indicates an expected call of GetId. +func (mr *MockidentityMockRecorder) GetId() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "option", reflect.TypeOf((*MockGonerOption)(nil).option)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetId", reflect.TypeOf((*Mockidentity)(nil).GetId)) } // MockTomb is a mock of Tomb interface. @@ -139,6 +147,7 @@ type MockTomb struct { goneMock.Flag ctrl *gomock.Controller recorder *MockTombMockRecorder + isgomock struct{} } // MockTombMockRecorder is the mock recorder for MockTomb. @@ -203,7 +212,7 @@ func (mr *MockTombMockRecorder) GetOrder() *gomock.Call { // GonerIsRevive mocks base method. func (m *MockTomb) GonerIsRevive(flags ...bool) bool { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range flags { varargs = append(varargs, a) } @@ -213,37 +222,37 @@ func (m *MockTomb) GonerIsRevive(flags ...bool) bool { } // GonerIsRevive indicates an expected call of GonerIsRevive. -func (mr *MockTombMockRecorder) GonerIsRevive(flags ...interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) GonerIsRevive(flags ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GonerIsRevive", reflect.TypeOf((*MockTomb)(nil).GonerIsRevive), flags...) } // IsDefault mocks base method. -func (m *MockTomb) IsDefault() bool { +func (m *MockTomb) IsDefault(arg0 reflect.Type) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsDefault") + ret := m.ctrl.Call(m, "IsDefault", arg0) ret0, _ := ret[0].(bool) return ret0 } // IsDefault indicates an expected call of IsDefault. -func (mr *MockTombMockRecorder) IsDefault() *gomock.Call { +func (mr *MockTombMockRecorder) IsDefault(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDefault", reflect.TypeOf((*MockTomb)(nil).IsDefault)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDefault", reflect.TypeOf((*MockTomb)(nil).IsDefault), arg0) } // SetDefault mocks base method. -func (m *MockTomb) SetDefault(isDefault bool) gone.Tomb { +func (m *MockTomb) SetDefault(arg0 reflect.Type) gone.Tomb { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetDefault", isDefault) + ret := m.ctrl.Call(m, "SetDefault", arg0) ret0, _ := ret[0].(gone.Tomb) return ret0 } // SetDefault indicates an expected call of SetDefault. -func (mr *MockTombMockRecorder) SetDefault(isDefault interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetDefault(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockTomb)(nil).SetDefault), isDefault) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockTomb)(nil).SetDefault), arg0) } // SetId mocks base method. @@ -255,7 +264,7 @@ func (m *MockTomb) SetId(arg0 gone.GonerId) gone.Tomb { } // SetId indicates an expected call of SetId. -func (mr *MockTombMockRecorder) SetId(arg0 interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetId(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetId", reflect.TypeOf((*MockTomb)(nil).SetId), arg0) } @@ -269,7 +278,7 @@ func (m *MockTomb) SetOrder(order gone.Order) gone.Tomb { } // SetOrder indicates an expected call of SetOrder. -func (mr *MockTombMockRecorder) SetOrder(order interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetOrder(order any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOrder", reflect.TypeOf((*MockTomb)(nil).SetOrder), order) } @@ -279,6 +288,7 @@ type MockCemetery struct { goneMock.Flag ctrl *gomock.Controller recorder *MockCemeteryMockRecorder + isgomock struct{} } // MockCemeteryMockRecorder is the mock recorder for MockCemetery. @@ -301,7 +311,7 @@ func (m *MockCemetery) EXPECT() *MockCemeteryMockRecorder { // Bury mocks base method. func (m *MockCemetery) Bury(arg0 gone.Goner, arg1 ...gone.GonerOption) gone.Cemetery { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -311,16 +321,16 @@ func (m *MockCemetery) Bury(arg0 gone.Goner, arg1 ...gone.GonerOption) gone.Ceme } // Bury indicates an expected call of Bury. -func (mr *MockCemeteryMockRecorder) Bury(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) Bury(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Bury", reflect.TypeOf((*MockCemetery)(nil).Bury), varargs...) } // BuryOnce mocks base method. func (m *MockCemetery) BuryOnce(goner gone.Goner, options ...gone.GonerOption) gone.Cemetery { m.ctrl.T.Helper() - varargs := []interface{}{goner} + varargs := []any{goner} for _, a := range options { varargs = append(varargs, a) } @@ -330,9 +340,9 @@ func (m *MockCemetery) BuryOnce(goner gone.Goner, options ...gone.GonerOption) g } // BuryOnce indicates an expected call of BuryOnce. -func (mr *MockCemeteryMockRecorder) BuryOnce(goner interface{}, options ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) BuryOnce(goner any, options ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{goner}, options...) + varargs := append([]any{goner}, options...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuryOnce", reflect.TypeOf((*MockCemetery)(nil).BuryOnce), varargs...) } @@ -345,7 +355,7 @@ func (m *MockCemetery) GetTomById(arg0 gone.GonerId) gone.Tomb { } // GetTomById indicates an expected call of GetTomById. -func (mr *MockCemeteryMockRecorder) GetTomById(arg0 interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) GetTomById(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTomById", reflect.TypeOf((*MockCemetery)(nil).GetTomById), arg0) } @@ -359,7 +369,7 @@ func (m *MockCemetery) GetTomByType(arg0 reflect.Type) []gone.Tomb { } // GetTomByType indicates an expected call of GetTomByType. -func (mr *MockCemeteryMockRecorder) GetTomByType(arg0 interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) GetTomByType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTomByType", reflect.TypeOf((*MockCemetery)(nil).GetTomByType), arg0) } @@ -374,7 +384,7 @@ func (m *MockCemetery) InjectFuncParameters(fn any, injectBefore func(reflect.Ty } // InjectFuncParameters indicates an expected call of InjectFuncParameters. -func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injectAfter interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injectAfter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InjectFuncParameters", reflect.TypeOf((*MockCemetery)(nil).InjectFuncParameters), fn, injectBefore, injectAfter) } @@ -382,7 +392,7 @@ func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injec // ReplaceBury mocks base method. func (m *MockCemetery) ReplaceBury(goner gone.Goner, options ...gone.GonerOption) error { m.ctrl.T.Helper() - varargs := []interface{}{goner} + varargs := []any{goner} for _, a := range options { varargs = append(varargs, a) } @@ -392,9 +402,9 @@ func (m *MockCemetery) ReplaceBury(goner gone.Goner, options ...gone.GonerOption } // ReplaceBury indicates an expected call of ReplaceBury. -func (mr *MockCemeteryMockRecorder) ReplaceBury(goner interface{}, options ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) ReplaceBury(goner any, options ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{goner}, options...) + varargs := append([]any{goner}, options...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplaceBury", reflect.TypeOf((*MockCemetery)(nil).ReplaceBury), varargs...) } @@ -422,7 +432,7 @@ func (m *MockCemetery) ReviveOne(goner any) ([]gone.Tomb, error) { } // ReviveOne indicates an expected call of ReviveOne. -func (mr *MockCemeteryMockRecorder) ReviveOne(goner interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) ReviveOne(goner any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReviveOne", reflect.TypeOf((*MockCemetery)(nil).ReviveOne), goner) } @@ -444,6 +454,7 @@ type MockHeaven struct { goneMock.Flag ctrl *gomock.Controller recorder *MockHeavenMockRecorder + isgomock struct{} } // MockHeavenMockRecorder is the mock recorder for MockHeaven. @@ -472,7 +483,7 @@ func (m *MockHeaven) AfterStart(arg0 gone.Process) gone.Heaven { } // AfterStart indicates an expected call of AfterStart. -func (mr *MockHeavenMockRecorder) AfterStart(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) AfterStart(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AfterStart", reflect.TypeOf((*MockHeaven)(nil).AfterStart), arg0) } @@ -486,7 +497,7 @@ func (m *MockHeaven) AfterStop(arg0 gone.Process) gone.Heaven { } // AfterStop indicates an expected call of AfterStop. -func (mr *MockHeavenMockRecorder) AfterStop(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) AfterStop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AfterStop", reflect.TypeOf((*MockHeaven)(nil).AfterStop), arg0) } @@ -500,7 +511,7 @@ func (m *MockHeaven) BeforeStart(arg0 gone.Process) gone.Heaven { } // BeforeStart indicates an expected call of BeforeStart. -func (mr *MockHeavenMockRecorder) BeforeStart(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) BeforeStart(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeforeStart", reflect.TypeOf((*MockHeaven)(nil).BeforeStart), arg0) } @@ -514,7 +525,7 @@ func (m *MockHeaven) BeforeStop(arg0 gone.Process) gone.Heaven { } // BeforeStop indicates an expected call of BeforeStop. -func (mr *MockHeavenMockRecorder) BeforeStop(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) BeforeStop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeforeStop", reflect.TypeOf((*MockHeaven)(nil).BeforeStop), arg0) } @@ -533,6 +544,20 @@ func (mr *MockHeavenMockRecorder) End() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "End", reflect.TypeOf((*MockHeaven)(nil).End)) } +// GetCemetery mocks base method. +func (m *MockHeaven) GetCemetery() gone.Cemetery { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetCemetery") + ret0, _ := ret[0].(gone.Cemetery) + return ret0 +} + +// GetCemetery indicates an expected call of GetCemetery. +func (mr *MockHeavenMockRecorder) GetCemetery() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCemetery", reflect.TypeOf((*MockHeaven)(nil).GetCemetery)) +} + // GetHeavenStopSignal mocks base method. func (m *MockHeaven) GetHeavenStopSignal() <-chan struct{} { m.ctrl.T.Helper() @@ -568,7 +593,7 @@ func (m *MockHeaven) SetAfterStopSignalWaitSecond(sec int) { } // SetAfterStopSignalWaitSecond indicates an expected call of SetAfterStopSignalWaitSecond. -func (mr *MockHeavenMockRecorder) SetAfterStopSignalWaitSecond(sec interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) SetAfterStopSignalWaitSecond(sec any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAfterStopSignalWaitSecond", reflect.TypeOf((*MockHeaven)(nil).SetAfterStopSignalWaitSecond), sec) } @@ -620,6 +645,7 @@ type MockProphet struct { goneMock.Flag ctrl *gomock.Controller recorder *MockProphetMockRecorder + isgomock struct{} } // MockProphetMockRecorder is the mock recorder for MockProphet. @@ -670,6 +696,7 @@ type MockProphet2 struct { goneMock.Flag ctrl *gomock.Controller recorder *MockProphet2MockRecorder + isgomock struct{} } // MockProphet2MockRecorder is the mock recorder for MockProphet2. @@ -720,6 +747,7 @@ type MockAngel struct { goneMock.Flag ctrl *gomock.Controller recorder *MockAngelMockRecorder + isgomock struct{} } // MockAngelMockRecorder is the mock recorder for MockAngel. @@ -748,7 +776,7 @@ func (m *MockAngel) Start(arg0 gone.Cemetery) error { } // Start indicates an expected call of Start. -func (mr *MockAngelMockRecorder) Start(arg0 interface{}) *gomock.Call { +func (mr *MockAngelMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockAngel)(nil).Start), arg0) } @@ -762,7 +790,7 @@ func (m *MockAngel) Stop(arg0 gone.Cemetery) error { } // Stop indicates an expected call of Stop. -func (mr *MockAngelMockRecorder) Stop(arg0 interface{}) *gomock.Call { +func (mr *MockAngelMockRecorder) Stop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockAngel)(nil).Stop), arg0) } @@ -784,6 +812,7 @@ type MockVampire struct { goneMock.Flag ctrl *gomock.Controller recorder *MockVampireMockRecorder + isgomock struct{} } // MockVampireMockRecorder is the mock recorder for MockVampire. @@ -812,7 +841,7 @@ func (m *MockVampire) Suck(conf string, v reflect.Value) gone.SuckError { } // Suck indicates an expected call of Suck. -func (mr *MockVampireMockRecorder) Suck(conf, v interface{}) *gomock.Call { +func (mr *MockVampireMockRecorder) Suck(conf, v any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Suck", reflect.TypeOf((*MockVampire)(nil).Suck), conf, v) } @@ -834,6 +863,7 @@ type MockVampire2 struct { goneMock.Flag ctrl *gomock.Controller recorder *MockVampire2MockRecorder + isgomock struct{} } // MockVampire2MockRecorder is the mock recorder for MockVampire2. @@ -862,7 +892,7 @@ func (m *MockVampire2) Suck(conf string, v reflect.Value, field reflect.StructFi } // Suck indicates an expected call of Suck. -func (mr *MockVampire2MockRecorder) Suck(conf, v, field interface{}) *gomock.Call { +func (mr *MockVampire2MockRecorder) Suck(conf, v, field any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Suck", reflect.TypeOf((*MockVampire2)(nil).Suck), conf, v, field) } @@ -884,6 +914,7 @@ type MockError struct { goneMock.Flag ctrl *gomock.Controller recorder *MockErrorMockRecorder + isgomock struct{} } // MockErrorMockRecorder is the mock recorder for MockError. @@ -931,6 +962,20 @@ func (mr *MockErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockError) Msg() string { m.ctrl.T.Helper() @@ -950,6 +995,7 @@ type MockInnerError struct { goneMock.Flag ctrl *gomock.Controller recorder *MockInnerErrorMockRecorder + isgomock struct{} } // MockInnerErrorMockRecorder is the mock recorder for MockInnerError. @@ -997,6 +1043,20 @@ func (mr *MockInnerErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockInnerError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockInnerError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockInnerErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockInnerError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockInnerError) Msg() string { m.ctrl.T.Helper() @@ -1030,6 +1090,7 @@ type MockBusinessError struct { goneMock.Flag ctrl *gomock.Controller recorder *MockBusinessErrorMockRecorder + isgomock struct{} } // MockBusinessErrorMockRecorder is the mock recorder for MockBusinessError. @@ -1091,6 +1152,20 @@ func (mr *MockBusinessErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockBusinessError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockBusinessError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockBusinessErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockBusinessError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockBusinessError) Msg() string { m.ctrl.T.Helper() @@ -1110,6 +1185,7 @@ type MockLogger struct { goneMock.Flag ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -1132,7 +1208,7 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { // Debug mocks base method. func (m *MockLogger) Debug(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1140,7 +1216,7 @@ func (m *MockLogger) Debug(args ...any) { } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), args...) } @@ -1148,7 +1224,7 @@ func (mr *MockLoggerMockRecorder) Debug(args ...interface{}) *gomock.Call { // Debugf mocks base method. func (m *MockLogger) Debugf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1156,16 +1232,16 @@ func (m *MockLogger) Debugf(format string, args ...any) { } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Debugln mocks base method. func (m *MockLogger) Debugln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1173,7 +1249,7 @@ func (m *MockLogger) Debugln(args ...any) { } // Debugln indicates an expected call of Debugln. -func (mr *MockLoggerMockRecorder) Debugln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugln", reflect.TypeOf((*MockLogger)(nil).Debugln), args...) } @@ -1181,7 +1257,7 @@ func (mr *MockLoggerMockRecorder) Debugln(args ...interface{}) *gomock.Call { // Error mocks base method. func (m *MockLogger) Error(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1189,7 +1265,7 @@ func (m *MockLogger) Error(args ...any) { } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), args...) } @@ -1197,7 +1273,7 @@ func (mr *MockLoggerMockRecorder) Error(args ...interface{}) *gomock.Call { // Errorf mocks base method. func (m *MockLogger) Errorf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1205,16 +1281,16 @@ func (m *MockLogger) Errorf(format string, args ...any) { } // Errorf indicates an expected call of Errorf. -func (mr *MockLoggerMockRecorder) Errorf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) } // Errorln mocks base method. func (m *MockLogger) Errorln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1222,7 +1298,7 @@ func (m *MockLogger) Errorln(args ...any) { } // Errorln indicates an expected call of Errorln. -func (mr *MockLoggerMockRecorder) Errorln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorln", reflect.TypeOf((*MockLogger)(nil).Errorln), args...) } @@ -1230,7 +1306,7 @@ func (mr *MockLoggerMockRecorder) Errorln(args ...interface{}) *gomock.Call { // Fatal mocks base method. func (m *MockLogger) Fatal(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1238,7 +1314,7 @@ func (m *MockLogger) Fatal(args ...any) { } // Fatal indicates an expected call of Fatal. -func (mr *MockLoggerMockRecorder) Fatal(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatal(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatal", reflect.TypeOf((*MockLogger)(nil).Fatal), args...) } @@ -1246,7 +1322,7 @@ func (mr *MockLoggerMockRecorder) Fatal(args ...interface{}) *gomock.Call { // Fatalf mocks base method. func (m *MockLogger) Fatalf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1254,16 +1330,16 @@ func (m *MockLogger) Fatalf(format string, args ...any) { } // Fatalf indicates an expected call of Fatalf. -func (mr *MockLoggerMockRecorder) Fatalf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalf", reflect.TypeOf((*MockLogger)(nil).Fatalf), varargs...) } // Fatalln mocks base method. func (m *MockLogger) Fatalln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1271,7 +1347,7 @@ func (m *MockLogger) Fatalln(args ...any) { } // Fatalln indicates an expected call of Fatalln. -func (mr *MockLoggerMockRecorder) Fatalln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalln", reflect.TypeOf((*MockLogger)(nil).Fatalln), args...) } @@ -1279,7 +1355,7 @@ func (mr *MockLoggerMockRecorder) Fatalln(args ...interface{}) *gomock.Call { // Info mocks base method. func (m *MockLogger) Info(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1287,7 +1363,7 @@ func (m *MockLogger) Info(args ...any) { } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), args...) } @@ -1295,7 +1371,7 @@ func (mr *MockLoggerMockRecorder) Info(args ...interface{}) *gomock.Call { // Infof mocks base method. func (m *MockLogger) Infof(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1303,16 +1379,16 @@ func (m *MockLogger) Infof(format string, args ...any) { } // Infof indicates an expected call of Infof. -func (mr *MockLoggerMockRecorder) Infof(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infof(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infof", reflect.TypeOf((*MockLogger)(nil).Infof), varargs...) } // Infoln mocks base method. func (m *MockLogger) Infoln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1320,7 +1396,7 @@ func (m *MockLogger) Infoln(args ...any) { } // Infoln indicates an expected call of Infoln. -func (mr *MockLoggerMockRecorder) Infoln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infoln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infoln", reflect.TypeOf((*MockLogger)(nil).Infoln), args...) } @@ -1328,7 +1404,7 @@ func (mr *MockLoggerMockRecorder) Infoln(args ...interface{}) *gomock.Call { // Panic mocks base method. func (m *MockLogger) Panic(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1336,7 +1412,7 @@ func (m *MockLogger) Panic(args ...any) { } // Panic indicates an expected call of Panic. -func (mr *MockLoggerMockRecorder) Panic(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panic(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panic", reflect.TypeOf((*MockLogger)(nil).Panic), args...) } @@ -1344,7 +1420,7 @@ func (mr *MockLoggerMockRecorder) Panic(args ...interface{}) *gomock.Call { // Panicf mocks base method. func (m *MockLogger) Panicf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1352,16 +1428,16 @@ func (m *MockLogger) Panicf(format string, args ...any) { } // Panicf indicates an expected call of Panicf. -func (mr *MockLoggerMockRecorder) Panicf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panicf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panicf", reflect.TypeOf((*MockLogger)(nil).Panicf), varargs...) } // Panicln mocks base method. func (m *MockLogger) Panicln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1369,7 +1445,7 @@ func (m *MockLogger) Panicln(args ...any) { } // Panicln indicates an expected call of Panicln. -func (mr *MockLoggerMockRecorder) Panicln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panicln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panicln", reflect.TypeOf((*MockLogger)(nil).Panicln), args...) } @@ -1377,7 +1453,7 @@ func (mr *MockLoggerMockRecorder) Panicln(args ...interface{}) *gomock.Call { // Print mocks base method. func (m *MockLogger) Print(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1385,7 +1461,7 @@ func (m *MockLogger) Print(args ...any) { } // Print indicates an expected call of Print. -func (mr *MockLoggerMockRecorder) Print(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Print(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Print", reflect.TypeOf((*MockLogger)(nil).Print), args...) } @@ -1393,7 +1469,7 @@ func (mr *MockLoggerMockRecorder) Print(args ...interface{}) *gomock.Call { // Printf mocks base method. func (m *MockLogger) Printf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1401,16 +1477,16 @@ func (m *MockLogger) Printf(format string, args ...any) { } // Printf indicates an expected call of Printf. -func (mr *MockLoggerMockRecorder) Printf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Printf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Printf", reflect.TypeOf((*MockLogger)(nil).Printf), varargs...) } // Println mocks base method. func (m *MockLogger) Println(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1418,7 +1494,7 @@ func (m *MockLogger) Println(args ...any) { } // Println indicates an expected call of Println. -func (mr *MockLoggerMockRecorder) Println(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Println(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Println", reflect.TypeOf((*MockLogger)(nil).Println), args...) } @@ -1426,7 +1502,7 @@ func (mr *MockLoggerMockRecorder) Println(args ...interface{}) *gomock.Call { // Trace mocks base method. func (m *MockLogger) Trace(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1434,7 +1510,7 @@ func (m *MockLogger) Trace(args ...any) { } // Trace indicates an expected call of Trace. -func (mr *MockLoggerMockRecorder) Trace(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Trace(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trace", reflect.TypeOf((*MockLogger)(nil).Trace), args...) } @@ -1442,7 +1518,7 @@ func (mr *MockLoggerMockRecorder) Trace(args ...interface{}) *gomock.Call { // Tracef mocks base method. func (m *MockLogger) Tracef(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1450,16 +1526,16 @@ func (m *MockLogger) Tracef(format string, args ...any) { } // Tracef indicates an expected call of Tracef. -func (mr *MockLoggerMockRecorder) Tracef(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Tracef(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Tracef", reflect.TypeOf((*MockLogger)(nil).Tracef), varargs...) } // Traceln mocks base method. func (m *MockLogger) Traceln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1467,7 +1543,7 @@ func (m *MockLogger) Traceln(args ...any) { } // Traceln indicates an expected call of Traceln. -func (mr *MockLoggerMockRecorder) Traceln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Traceln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Traceln", reflect.TypeOf((*MockLogger)(nil).Traceln), args...) } @@ -1475,7 +1551,7 @@ func (mr *MockLoggerMockRecorder) Traceln(args ...interface{}) *gomock.Call { // Warn mocks base method. func (m *MockLogger) Warn(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1483,7 +1559,7 @@ func (m *MockLogger) Warn(args ...any) { } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), args...) } @@ -1491,7 +1567,7 @@ func (mr *MockLoggerMockRecorder) Warn(args ...interface{}) *gomock.Call { // Warnf mocks base method. func (m *MockLogger) Warnf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1499,16 +1575,16 @@ func (m *MockLogger) Warnf(format string, args ...any) { } // Warnf indicates an expected call of Warnf. -func (mr *MockLoggerMockRecorder) Warnf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) } // Warnln mocks base method. func (m *MockLogger) Warnln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1516,7 +1592,7 @@ func (m *MockLogger) Warnln(args ...any) { } // Warnln indicates an expected call of Warnln. -func (mr *MockLoggerMockRecorder) Warnln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnln", reflect.TypeOf((*MockLogger)(nil).Warnln), args...) } @@ -1526,6 +1602,7 @@ type MockTracer struct { goneMock.Flag ctrl *gomock.Controller recorder *MockTracerMockRecorder + isgomock struct{} } // MockTracerMockRecorder is the mock recorder for MockTracer. @@ -1566,7 +1643,7 @@ func (m *MockTracer) Go(fn func()) { } // Go indicates an expected call of Go. -func (mr *MockTracerMockRecorder) Go(fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) Go(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Go", reflect.TypeOf((*MockTracer)(nil).Go), fn) } @@ -1590,7 +1667,7 @@ func (m *MockTracer) RecoverSetTraceId(traceId string, fn func()) { } // RecoverSetTraceId indicates an expected call of RecoverSetTraceId. -func (mr *MockTracerMockRecorder) RecoverSetTraceId(traceId, fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) RecoverSetTraceId(traceId, fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecoverSetTraceId", reflect.TypeOf((*MockTracer)(nil).RecoverSetTraceId), traceId, fn) } @@ -1602,7 +1679,7 @@ func (m *MockTracer) SetTraceId(traceId string, fn func()) { } // SetTraceId indicates an expected call of SetTraceId. -func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTraceId", reflect.TypeOf((*MockTracer)(nil).SetTraceId), traceId, fn) } @@ -1612,6 +1689,7 @@ type MockXormEngine struct { goneMock.Flag ctrl *gomock.Controller recorder *MockXormEngineMockRecorder + isgomock struct{} } // MockXormEngineMockRecorder is the mock recorder for MockXormEngine. @@ -1638,7 +1716,7 @@ func (m *MockXormEngine) AddHook(hook contexts.Hook) { } // AddHook indicates an expected call of AddHook. -func (mr *MockXormEngineMockRecorder) AddHook(hook interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) AddHook(hook any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHook", reflect.TypeOf((*MockXormEngine)(nil).AddHook), hook) } @@ -1652,7 +1730,7 @@ func (m *MockXormEngine) Alias(alias string) *xorm.Session { } // Alias indicates an expected call of Alias. -func (mr *MockXormEngineMockRecorder) Alias(alias interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Alias(alias any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Alias", reflect.TypeOf((*MockXormEngine)(nil).Alias), alias) } @@ -1674,7 +1752,7 @@ func (mr *MockXormEngineMockRecorder) AllCols() *gomock.Call { // Asc mocks base method. func (m *MockXormEngine) Asc(colNames ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range colNames { varargs = append(varargs, a) } @@ -1684,13 +1762,13 @@ func (m *MockXormEngine) Asc(colNames ...string) *xorm.Session { } // Asc indicates an expected call of Asc. -func (mr *MockXormEngineMockRecorder) Asc(colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Asc(colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Asc", reflect.TypeOf((*MockXormEngine)(nil).Asc), colNames...) } // Before mocks base method. -func (m *MockXormEngine) Before(arg0 func(interface{})) *xorm.Session { +func (m *MockXormEngine) Before(arg0 func(any)) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Before", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -1698,7 +1776,7 @@ func (m *MockXormEngine) Before(arg0 func(interface{})) *xorm.Session { } // Before indicates an expected call of Before. -func (mr *MockXormEngineMockRecorder) Before(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Before(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Before", reflect.TypeOf((*MockXormEngine)(nil).Before), arg0) } @@ -1712,7 +1790,7 @@ func (m *MockXormEngine) BufferSize(size int) *xorm.Session { } // BufferSize indicates an expected call of BufferSize. -func (mr *MockXormEngineMockRecorder) BufferSize(size interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) BufferSize(size any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BufferSize", reflect.TypeOf((*MockXormEngine)(nil).BufferSize), size) } @@ -1726,15 +1804,15 @@ func (m *MockXormEngine) Charset(charset string) *xorm.Session { } // Charset indicates an expected call of Charset. -func (mr *MockXormEngineMockRecorder) Charset(charset interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Charset(charset any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Charset", reflect.TypeOf((*MockXormEngine)(nil).Charset), charset) } // ClearCache mocks base method. -func (m *MockXormEngine) ClearCache(arg0 ...interface{}) error { +func (m *MockXormEngine) ClearCache(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1744,7 +1822,7 @@ func (m *MockXormEngine) ClearCache(arg0 ...interface{}) error { } // ClearCache indicates an expected call of ClearCache. -func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearCache", reflect.TypeOf((*MockXormEngine)(nil).ClearCache), arg0...) } @@ -1752,7 +1830,7 @@ func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Ca // Cols mocks base method. func (m *MockXormEngine) Cols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -1762,7 +1840,7 @@ func (m *MockXormEngine) Cols(columns ...string) *xorm.Session { } // Cols indicates an expected call of Cols. -func (mr *MockXormEngineMockRecorder) Cols(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Cols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cols", reflect.TypeOf((*MockXormEngine)(nil).Cols), columns...) } @@ -1776,15 +1854,15 @@ func (m *MockXormEngine) Context(arg0 context.Context) *xorm.Session { } // Context indicates an expected call of Context. -func (mr *MockXormEngineMockRecorder) Context(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Context(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockXormEngine)(nil).Context), arg0) } // Count mocks base method. -func (m *MockXormEngine) Count(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Count(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1795,13 +1873,13 @@ func (m *MockXormEngine) Count(arg0 ...interface{}) (int64, error) { } // Count indicates an expected call of Count. -func (mr *MockXormEngineMockRecorder) Count(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Count(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Count", reflect.TypeOf((*MockXormEngine)(nil).Count), arg0...) } // CreateIndexes mocks base method. -func (m *MockXormEngine) CreateIndexes(bean interface{}) error { +func (m *MockXormEngine) CreateIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateIndexes", bean) ret0, _ := ret[0].(error) @@ -1809,15 +1887,15 @@ func (m *MockXormEngine) CreateIndexes(bean interface{}) error { } // CreateIndexes indicates an expected call of CreateIndexes. -func (mr *MockXormEngineMockRecorder) CreateIndexes(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateIndexes", reflect.TypeOf((*MockXormEngine)(nil).CreateIndexes), bean) } // CreateTables mocks base method. -func (m *MockXormEngine) CreateTables(arg0 ...interface{}) error { +func (m *MockXormEngine) CreateTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1827,13 +1905,13 @@ func (m *MockXormEngine) CreateTables(arg0 ...interface{}) error { } // CreateTables indicates an expected call of CreateTables. -func (mr *MockXormEngineMockRecorder) CreateTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTables", reflect.TypeOf((*MockXormEngine)(nil).CreateTables), arg0...) } // CreateUniques mocks base method. -func (m *MockXormEngine) CreateUniques(bean interface{}) error { +func (m *MockXormEngine) CreateUniques(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateUniques", bean) ret0, _ := ret[0].(error) @@ -1841,7 +1919,7 @@ func (m *MockXormEngine) CreateUniques(bean interface{}) error { } // CreateUniques indicates an expected call of CreateUniques. -func (mr *MockXormEngineMockRecorder) CreateUniques(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateUniques(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUniques", reflect.TypeOf((*MockXormEngine)(nil).CreateUniques), bean) } @@ -1877,9 +1955,9 @@ func (mr *MockXormEngineMockRecorder) DBVersion() *gomock.Call { } // Decr mocks base method. -func (m *MockXormEngine) Decr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXormEngine) Decr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -1889,16 +1967,16 @@ func (m *MockXormEngine) Decr(column string, arg ...interface{}) *xorm.Session { } // Decr indicates an expected call of Decr. -func (mr *MockXormEngineMockRecorder) Decr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Decr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockXormEngine)(nil).Decr), varargs...) } // Delete mocks base method. -func (m *MockXormEngine) Delete(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Delete(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1909,7 +1987,7 @@ func (m *MockXormEngine) Delete(arg0 ...interface{}) (int64, error) { } // Delete indicates an expected call of Delete. -func (mr *MockXormEngineMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Delete(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockXormEngine)(nil).Delete), arg0...) } @@ -1917,7 +1995,7 @@ func (mr *MockXormEngineMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { // Desc mocks base method. func (m *MockXormEngine) Desc(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1927,7 +2005,7 @@ func (m *MockXormEngine) Desc(arg0 ...string) *xorm.Session { } // Desc indicates an expected call of Desc. -func (mr *MockXormEngineMockRecorder) Desc(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Desc(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Desc", reflect.TypeOf((*MockXormEngine)(nil).Desc), arg0...) } @@ -1949,7 +2027,7 @@ func (mr *MockXormEngineMockRecorder) Dialect() *gomock.Call { // Distinct mocks base method. func (m *MockXormEngine) Distinct(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -1959,7 +2037,7 @@ func (m *MockXormEngine) Distinct(columns ...string) *xorm.Session { } // Distinct indicates an expected call of Distinct. -func (mr *MockXormEngineMockRecorder) Distinct(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Distinct(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Distinct", reflect.TypeOf((*MockXormEngine)(nil).Distinct), columns...) } @@ -1979,7 +2057,7 @@ func (mr *MockXormEngineMockRecorder) DriverName() *gomock.Call { } // DropIndexes mocks base method. -func (m *MockXormEngine) DropIndexes(bean interface{}) error { +func (m *MockXormEngine) DropIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DropIndexes", bean) ret0, _ := ret[0].(error) @@ -1987,15 +2065,15 @@ func (m *MockXormEngine) DropIndexes(bean interface{}) error { } // DropIndexes indicates an expected call of DropIndexes. -func (mr *MockXormEngineMockRecorder) DropIndexes(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DropIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropIndexes", reflect.TypeOf((*MockXormEngine)(nil).DropIndexes), bean) } // DropTables mocks base method. -func (m *MockXormEngine) DropTables(arg0 ...interface{}) error { +func (m *MockXormEngine) DropTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2005,7 +2083,7 @@ func (m *MockXormEngine) DropTables(arg0 ...interface{}) error { } // DropTables indicates an expected call of DropTables. -func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropTables", reflect.TypeOf((*MockXormEngine)(nil).DropTables), arg0...) } @@ -2013,7 +2091,7 @@ func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...interface{}) *gomock.Ca // DumpAllToFile mocks base method. func (m *MockXormEngine) DumpAllToFile(fp string, tp ...schemas.DBType) error { m.ctrl.T.Helper() - varargs := []interface{}{fp} + varargs := []any{fp} for _, a := range tp { varargs = append(varargs, a) } @@ -2023,9 +2101,9 @@ func (m *MockXormEngine) DumpAllToFile(fp string, tp ...schemas.DBType) error { } // DumpAllToFile indicates an expected call of DumpAllToFile. -func (mr *MockXormEngineMockRecorder) DumpAllToFile(fp interface{}, tp ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DumpAllToFile(fp any, tp ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{fp}, tp...) + varargs := append([]any{fp}, tp...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DumpAllToFile", reflect.TypeOf((*MockXormEngine)(nil).DumpAllToFile), varargs...) } @@ -2036,15 +2114,15 @@ func (m *MockXormEngine) EnableSessionID(arg0 bool) { } // EnableSessionID indicates an expected call of EnableSessionID. -func (mr *MockXormEngineMockRecorder) EnableSessionID(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) EnableSessionID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableSessionID", reflect.TypeOf((*MockXormEngine)(nil).EnableSessionID), arg0) } // Exec mocks base method. -func (m *MockXormEngine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { +func (m *MockXormEngine) Exec(sqlOrArgs ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2055,15 +2133,15 @@ func (m *MockXormEngine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockXormEngineMockRecorder) Exec(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Exec(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockXormEngine)(nil).Exec), sqlOrArgs...) } // Exist mocks base method. -func (m *MockXormEngine) Exist(bean ...interface{}) (bool, error) { +func (m *MockXormEngine) Exist(bean ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range bean { varargs = append(varargs, a) } @@ -2074,15 +2152,15 @@ func (m *MockXormEngine) Exist(bean ...interface{}) (bool, error) { } // Exist indicates an expected call of Exist. -func (mr *MockXormEngineMockRecorder) Exist(bean ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Exist(bean ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exist", reflect.TypeOf((*MockXormEngine)(nil).Exist), bean...) } // Find mocks base method. -func (m *MockXormEngine) Find(arg0 interface{}, arg1 ...interface{}) error { +func (m *MockXormEngine) Find(arg0 any, arg1 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2092,16 +2170,16 @@ func (m *MockXormEngine) Find(arg0 interface{}, arg1 ...interface{}) error { } // Find indicates an expected call of Find. -func (mr *MockXormEngineMockRecorder) Find(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Find(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockXormEngine)(nil).Find), varargs...) } // FindAndCount mocks base method. -func (m *MockXormEngine) FindAndCount(arg0 interface{}, arg1 ...interface{}) (int64, error) { +func (m *MockXormEngine) FindAndCount(arg0 any, arg1 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2112,16 +2190,16 @@ func (m *MockXormEngine) FindAndCount(arg0 interface{}, arg1 ...interface{}) (in } // FindAndCount indicates an expected call of FindAndCount. -func (mr *MockXormEngineMockRecorder) FindAndCount(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) FindAndCount(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindAndCount", reflect.TypeOf((*MockXormEngine)(nil).FindAndCount), varargs...) } // Get mocks base method. -func (m *MockXormEngine) Get(arg0 ...interface{}) (bool, error) { +func (m *MockXormEngine) Get(arg0 ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2132,7 +2210,7 @@ func (m *MockXormEngine) Get(arg0 ...interface{}) (bool, error) { } // Get indicates an expected call of Get. -func (mr *MockXormEngineMockRecorder) Get(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Get(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockXormEngine)(nil).Get), arg0...) } @@ -2146,7 +2224,7 @@ func (m *MockXormEngine) GetCacher(arg0 string) caches.Cacher { } // GetCacher indicates an expected call of GetCacher. -func (mr *MockXormEngineMockRecorder) GetCacher(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) GetCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCacher", reflect.TypeOf((*MockXormEngine)(nil).GetCacher), arg0) } @@ -2244,13 +2322,13 @@ func (m *MockXormEngine) GroupBy(keys string) *xorm.Session { } // GroupBy indicates an expected call of GroupBy. -func (mr *MockXormEngineMockRecorder) GroupBy(keys interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) GroupBy(keys any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupBy", reflect.TypeOf((*MockXormEngine)(nil).GroupBy), keys) } // ID mocks base method. -func (m *MockXormEngine) ID(arg0 interface{}) *xorm.Session { +func (m *MockXormEngine) ID(arg0 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -2258,7 +2336,7 @@ func (m *MockXormEngine) ID(arg0 interface{}) *xorm.Session { } // ID indicates an expected call of ID. -func (mr *MockXormEngineMockRecorder) ID(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockXormEngine)(nil).ID), arg0) } @@ -2273,15 +2351,15 @@ func (m *MockXormEngine) ImportFile(fp string) ([]sql.Result, error) { } // ImportFile indicates an expected call of ImportFile. -func (mr *MockXormEngineMockRecorder) ImportFile(fp interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ImportFile(fp any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImportFile", reflect.TypeOf((*MockXormEngine)(nil).ImportFile), fp) } // In mocks base method. -func (m *MockXormEngine) In(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) In(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2291,16 +2369,16 @@ func (m *MockXormEngine) In(arg0 string, arg1 ...interface{}) *xorm.Session { } // In indicates an expected call of In. -func (mr *MockXormEngineMockRecorder) In(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) In(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "In", reflect.TypeOf((*MockXormEngine)(nil).In), varargs...) } // Incr mocks base method. -func (m *MockXormEngine) Incr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXormEngine) Incr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -2310,16 +2388,16 @@ func (m *MockXormEngine) Incr(column string, arg ...interface{}) *xorm.Session { } // Incr indicates an expected call of Incr. -func (mr *MockXormEngineMockRecorder) Incr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Incr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockXormEngine)(nil).Incr), varargs...) } // Insert mocks base method. -func (m *MockXormEngine) Insert(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Insert(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2330,13 +2408,13 @@ func (m *MockXormEngine) Insert(arg0 ...interface{}) (int64, error) { } // Insert indicates an expected call of Insert. -func (mr *MockXormEngineMockRecorder) Insert(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Insert(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockXormEngine)(nil).Insert), arg0...) } // InsertOne mocks base method. -func (m *MockXormEngine) InsertOne(arg0 interface{}) (int64, error) { +func (m *MockXormEngine) InsertOne(arg0 any) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertOne", arg0) ret0, _ := ret[0].(int64) @@ -2345,13 +2423,13 @@ func (m *MockXormEngine) InsertOne(arg0 interface{}) (int64, error) { } // InsertOne indicates an expected call of InsertOne. -func (mr *MockXormEngineMockRecorder) InsertOne(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) InsertOne(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertOne", reflect.TypeOf((*MockXormEngine)(nil).InsertOne), arg0) } // IsTableEmpty mocks base method. -func (m *MockXormEngine) IsTableEmpty(bean interface{}) (bool, error) { +func (m *MockXormEngine) IsTableEmpty(bean any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableEmpty", bean) ret0, _ := ret[0].(bool) @@ -2360,13 +2438,13 @@ func (m *MockXormEngine) IsTableEmpty(bean interface{}) (bool, error) { } // IsTableEmpty indicates an expected call of IsTableEmpty. -func (mr *MockXormEngineMockRecorder) IsTableEmpty(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) IsTableEmpty(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableEmpty", reflect.TypeOf((*MockXormEngine)(nil).IsTableEmpty), bean) } // IsTableExist mocks base method. -func (m *MockXormEngine) IsTableExist(beanOrTableName interface{}) (bool, error) { +func (m *MockXormEngine) IsTableExist(beanOrTableName any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableExist", beanOrTableName) ret0, _ := ret[0].(bool) @@ -2375,13 +2453,13 @@ func (m *MockXormEngine) IsTableExist(beanOrTableName interface{}) (bool, error) } // IsTableExist indicates an expected call of IsTableExist. -func (mr *MockXormEngineMockRecorder) IsTableExist(beanOrTableName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) IsTableExist(beanOrTableName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableExist", reflect.TypeOf((*MockXormEngine)(nil).IsTableExist), beanOrTableName) } // Iterate mocks base method. -func (m *MockXormEngine) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { +func (m *MockXormEngine) Iterate(arg0 any, arg1 xorm.IterFunc) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -2389,15 +2467,15 @@ func (m *MockXormEngine) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { } // Iterate indicates an expected call of Iterate. -func (mr *MockXormEngineMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Iterate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockXormEngine)(nil).Iterate), arg0, arg1) } // Join mocks base method. -func (m *MockXormEngine) Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *xorm.Session { +func (m *MockXormEngine) Join(joinOperator string, tablename any, condition string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{joinOperator, tablename, condition} + varargs := []any{joinOperator, tablename, condition} for _, a := range args { varargs = append(varargs, a) } @@ -2407,16 +2485,16 @@ func (m *MockXormEngine) Join(joinOperator string, tablename interface{}, condit } // Join indicates an expected call of Join. -func (mr *MockXormEngineMockRecorder) Join(joinOperator, tablename, condition interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Join(joinOperator, tablename, condition any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{joinOperator, tablename, condition}, args...) + varargs := append([]any{joinOperator, tablename, condition}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Join", reflect.TypeOf((*MockXormEngine)(nil).Join), varargs...) } // Limit mocks base method. func (m *MockXormEngine) Limit(arg0 int, arg1 ...int) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2426,14 +2504,14 @@ func (m *MockXormEngine) Limit(arg0 int, arg1 ...int) *xorm.Session { } // Limit indicates an expected call of Limit. -func (mr *MockXormEngineMockRecorder) Limit(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Limit(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Limit", reflect.TypeOf((*MockXormEngine)(nil).Limit), varargs...) } // MapCacher mocks base method. -func (m *MockXormEngine) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { +func (m *MockXormEngine) MapCacher(arg0 any, arg1 caches.Cacher) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MapCacher", arg0, arg1) ret0, _ := ret[0].(error) @@ -2441,7 +2519,7 @@ func (m *MockXormEngine) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { } // MapCacher indicates an expected call of MapCacher. -func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MapCacher", reflect.TypeOf((*MockXormEngine)(nil).MapCacher), arg0, arg1) } @@ -2449,7 +2527,7 @@ func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock. // MustCols mocks base method. func (m *MockXormEngine) MustCols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -2459,7 +2537,7 @@ func (m *MockXormEngine) MustCols(columns ...string) *xorm.Session { } // MustCols indicates an expected call of MustCols. -func (mr *MockXormEngineMockRecorder) MustCols(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) MustCols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MustCols", reflect.TypeOf((*MockXormEngine)(nil).MustCols), columns...) } @@ -2481,7 +2559,7 @@ func (mr *MockXormEngineMockRecorder) NewSession() *gomock.Call { // NoAutoCondition mocks base method. func (m *MockXormEngine) NoAutoCondition(arg0 ...bool) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2491,7 +2569,7 @@ func (m *MockXormEngine) NoAutoCondition(arg0 ...bool) *xorm.Session { } // NoAutoCondition indicates an expected call of NoAutoCondition. -func (mr *MockXormEngineMockRecorder) NoAutoCondition(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) NoAutoCondition(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NoAutoCondition", reflect.TypeOf((*MockXormEngine)(nil).NoAutoCondition), arg0...) } @@ -2511,9 +2589,9 @@ func (mr *MockXormEngineMockRecorder) NoAutoTime() *gomock.Call { } // NotIn mocks base method. -func (m *MockXormEngine) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) NotIn(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2523,16 +2601,16 @@ func (m *MockXormEngine) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { } // NotIn indicates an expected call of NotIn. -func (mr *MockXormEngineMockRecorder) NotIn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) NotIn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotIn", reflect.TypeOf((*MockXormEngine)(nil).NotIn), varargs...) } // Nullable mocks base method. func (m *MockXormEngine) Nullable(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2542,7 +2620,7 @@ func (m *MockXormEngine) Nullable(arg0 ...string) *xorm.Session { } // Nullable indicates an expected call of Nullable. -func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Nullable", reflect.TypeOf((*MockXormEngine)(nil).Nullable), arg0...) } @@ -2550,7 +2628,7 @@ func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call // Omit mocks base method. func (m *MockXormEngine) Omit(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -2560,15 +2638,15 @@ func (m *MockXormEngine) Omit(columns ...string) *xorm.Session { } // Omit indicates an expected call of Omit. -func (mr *MockXormEngineMockRecorder) Omit(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Omit(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Omit", reflect.TypeOf((*MockXormEngine)(nil).Omit), columns...) } // OrderBy mocks base method. -func (m *MockXormEngine) OrderBy(order interface{}, args ...interface{}) *xorm.Session { +func (m *MockXormEngine) OrderBy(order any, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{order} + varargs := []any{order} for _, a := range args { varargs = append(varargs, a) } @@ -2578,9 +2656,9 @@ func (m *MockXormEngine) OrderBy(order interface{}, args ...interface{}) *xorm.S } // OrderBy indicates an expected call of OrderBy. -func (mr *MockXormEngineMockRecorder) OrderBy(order interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) OrderBy(order any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{order}, args...) + varargs := append([]any{order}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OrderBy", reflect.TypeOf((*MockXormEngine)(nil).OrderBy), varargs...) } @@ -2613,9 +2691,9 @@ func (mr *MockXormEngineMockRecorder) Prepare() *gomock.Call { } // Query mocks base method. -func (m *MockXormEngine) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) { +func (m *MockXormEngine) Query(sqlOrArgs ...any) ([]map[string][]byte, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2626,34 +2704,34 @@ func (m *MockXormEngine) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, e } // Query indicates an expected call of Query. -func (mr *MockXormEngineMockRecorder) Query(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Query(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockXormEngine)(nil).Query), sqlOrArgs...) } // QueryInterface mocks base method. -func (m *MockXormEngine) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) { +func (m *MockXormEngine) QueryInterface(sqlOrArgs ...any) ([]map[string]any, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryInterface", varargs...) - ret0, _ := ret[0].([]map[string]interface{}) + ret0, _ := ret[0].([]map[string]any) ret1, _ := ret[1].(error) return ret0, ret1 } // QueryInterface indicates an expected call of QueryInterface. -func (mr *MockXormEngineMockRecorder) QueryInterface(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) QueryInterface(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryInterface", reflect.TypeOf((*MockXormEngine)(nil).QueryInterface), sqlOrArgs...) } // QueryString mocks base method. -func (m *MockXormEngine) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) { +func (m *MockXormEngine) QueryString(sqlOrArgs ...any) ([]map[string]string, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2664,7 +2742,7 @@ func (m *MockXormEngine) QueryString(sqlOrArgs ...interface{}) ([]map[string]str } // QueryString indicates an expected call of QueryString. -func (mr *MockXormEngineMockRecorder) QueryString(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) QueryString(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryString", reflect.TypeOf((*MockXormEngine)(nil).QueryString), sqlOrArgs...) } @@ -2678,13 +2756,13 @@ func (m *MockXormEngine) Quote(arg0 string) string { } // Quote indicates an expected call of Quote. -func (mr *MockXormEngineMockRecorder) Quote(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Quote(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Quote", reflect.TypeOf((*MockXormEngine)(nil).Quote), arg0) } // Rows mocks base method. -func (m *MockXormEngine) Rows(bean interface{}) (*xorm.Rows, error) { +func (m *MockXormEngine) Rows(bean any) (*xorm.Rows, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Rows", bean) ret0, _ := ret[0].(*xorm.Rows) @@ -2693,15 +2771,15 @@ func (m *MockXormEngine) Rows(bean interface{}) (*xorm.Rows, error) { } // Rows indicates an expected call of Rows. -func (mr *MockXormEngineMockRecorder) Rows(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Rows(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rows", reflect.TypeOf((*MockXormEngine)(nil).Rows), bean) } // SQL mocks base method. -func (m *MockXormEngine) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) SQL(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2711,9 +2789,9 @@ func (m *MockXormEngine) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Sessio } // SQL indicates an expected call of SQL. -func (mr *MockXormEngineMockRecorder) SQL(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SQL(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SQL", reflect.TypeOf((*MockXormEngine)(nil).SQL), varargs...) } @@ -2726,7 +2804,7 @@ func (m *MockXormEngine) Select(arg0 string) *xorm.Session { } // Select indicates an expected call of Select. -func (mr *MockXormEngineMockRecorder) Select(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Select(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Select", reflect.TypeOf((*MockXormEngine)(nil).Select), arg0) } @@ -2738,7 +2816,7 @@ func (m *MockXormEngine) SetCacher(arg0 string, arg1 caches.Cacher) { } // SetCacher indicates an expected call of SetCacher. -func (mr *MockXormEngineMockRecorder) SetCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCacher", reflect.TypeOf((*MockXormEngine)(nil).SetCacher), arg0, arg1) } @@ -2750,7 +2828,7 @@ func (m *MockXormEngine) SetColumnMapper(arg0 names.Mapper) { } // SetColumnMapper indicates an expected call of SetColumnMapper. -func (mr *MockXormEngineMockRecorder) SetColumnMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetColumnMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColumnMapper", reflect.TypeOf((*MockXormEngine)(nil).SetColumnMapper), arg0) } @@ -2762,7 +2840,7 @@ func (m *MockXormEngine) SetConnMaxLifetime(arg0 time.Duration) { } // SetConnMaxLifetime indicates an expected call of SetConnMaxLifetime. -func (mr *MockXormEngineMockRecorder) SetConnMaxLifetime(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetConnMaxLifetime(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetConnMaxLifetime", reflect.TypeOf((*MockXormEngine)(nil).SetConnMaxLifetime), arg0) } @@ -2774,13 +2852,13 @@ func (m *MockXormEngine) SetDefaultCacher(arg0 caches.Cacher) { } // SetDefaultCacher indicates an expected call of SetDefaultCacher. -func (mr *MockXormEngineMockRecorder) SetDefaultCacher(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetDefaultCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefaultCacher", reflect.TypeOf((*MockXormEngine)(nil).SetDefaultCacher), arg0) } // SetExpr mocks base method. -func (m *MockXormEngine) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { +func (m *MockXormEngine) SetExpr(arg0 string, arg1 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetExpr", arg0, arg1) ret0, _ := ret[0].(*xorm.Session) @@ -2788,7 +2866,7 @@ func (m *MockXormEngine) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { } // SetExpr indicates an expected call of SetExpr. -func (mr *MockXormEngineMockRecorder) SetExpr(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetExpr(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExpr", reflect.TypeOf((*MockXormEngine)(nil).SetExpr), arg0, arg1) } @@ -2800,19 +2878,19 @@ func (m *MockXormEngine) SetLogLevel(arg0 log.LogLevel) { } // SetLogLevel indicates an expected call of SetLogLevel. -func (mr *MockXormEngineMockRecorder) SetLogLevel(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetLogLevel(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogLevel", reflect.TypeOf((*MockXormEngine)(nil).SetLogLevel), arg0) } // SetLogger mocks base method. -func (m *MockXormEngine) SetLogger(logger interface{}) { +func (m *MockXormEngine) SetLogger(logger any) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetLogger", logger) } // SetLogger indicates an expected call of SetLogger. -func (mr *MockXormEngineMockRecorder) SetLogger(logger interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetLogger(logger any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogger", reflect.TypeOf((*MockXormEngine)(nil).SetLogger), logger) } @@ -2824,7 +2902,7 @@ func (m *MockXormEngine) SetMapper(arg0 names.Mapper) { } // SetMapper indicates an expected call of SetMapper. -func (mr *MockXormEngineMockRecorder) SetMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMapper", reflect.TypeOf((*MockXormEngine)(nil).SetMapper), arg0) } @@ -2836,7 +2914,7 @@ func (m *MockXormEngine) SetMaxIdleConns(arg0 int) { } // SetMaxIdleConns indicates an expected call of SetMaxIdleConns. -func (mr *MockXormEngineMockRecorder) SetMaxIdleConns(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMaxIdleConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxIdleConns", reflect.TypeOf((*MockXormEngine)(nil).SetMaxIdleConns), arg0) } @@ -2848,7 +2926,7 @@ func (m *MockXormEngine) SetMaxOpenConns(arg0 int) { } // SetMaxOpenConns indicates an expected call of SetMaxOpenConns. -func (mr *MockXormEngineMockRecorder) SetMaxOpenConns(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMaxOpenConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxOpenConns", reflect.TypeOf((*MockXormEngine)(nil).SetMaxOpenConns), arg0) } @@ -2860,7 +2938,7 @@ func (m *MockXormEngine) SetQuotePolicy(arg0 dialects.QuotePolicy) { } // SetQuotePolicy indicates an expected call of SetQuotePolicy. -func (mr *MockXormEngineMockRecorder) SetQuotePolicy(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetQuotePolicy(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQuotePolicy", reflect.TypeOf((*MockXormEngine)(nil).SetQuotePolicy), arg0) } @@ -2872,7 +2950,7 @@ func (m *MockXormEngine) SetSchema(arg0 string) { } // SetSchema indicates an expected call of SetSchema. -func (mr *MockXormEngineMockRecorder) SetSchema(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetSchema(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSchema", reflect.TypeOf((*MockXormEngine)(nil).SetSchema), arg0) } @@ -2884,7 +2962,7 @@ func (m *MockXormEngine) SetTZDatabase(tz *time.Location) { } // SetTZDatabase indicates an expected call of SetTZDatabase. -func (mr *MockXormEngineMockRecorder) SetTZDatabase(tz interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTZDatabase(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZDatabase", reflect.TypeOf((*MockXormEngine)(nil).SetTZDatabase), tz) } @@ -2896,7 +2974,7 @@ func (m *MockXormEngine) SetTZLocation(tz *time.Location) { } // SetTZLocation indicates an expected call of SetTZLocation. -func (mr *MockXormEngineMockRecorder) SetTZLocation(tz interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTZLocation(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZLocation", reflect.TypeOf((*MockXormEngine)(nil).SetTZLocation), tz) } @@ -2908,7 +2986,7 @@ func (m *MockXormEngine) SetTableMapper(arg0 names.Mapper) { } // SetTableMapper indicates an expected call of SetTableMapper. -func (mr *MockXormEngineMockRecorder) SetTableMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTableMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTableMapper", reflect.TypeOf((*MockXormEngine)(nil).SetTableMapper), arg0) } @@ -2920,7 +2998,7 @@ func (m *MockXormEngine) SetTagIdentifier(arg0 string) { } // SetTagIdentifier indicates an expected call of SetTagIdentifier. -func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTagIdentifier", reflect.TypeOf((*MockXormEngine)(nil).SetTagIdentifier), arg0) } @@ -2928,7 +3006,7 @@ func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock // ShowSQL mocks base method. func (m *MockXormEngine) ShowSQL(show ...bool) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range show { varargs = append(varargs, a) } @@ -2936,7 +3014,7 @@ func (m *MockXormEngine) ShowSQL(show ...bool) { } // ShowSQL indicates an expected call of ShowSQL. -func (mr *MockXormEngineMockRecorder) ShowSQL(show ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ShowSQL(show ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowSQL", reflect.TypeOf((*MockXormEngine)(nil).ShowSQL), show...) } @@ -2944,7 +3022,7 @@ func (mr *MockXormEngineMockRecorder) ShowSQL(show ...interface{}) *gomock.Call // Sqlx mocks base method. func (m *MockXormEngine) Sqlx(sql string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{sql} + varargs := []any{sql} for _, a := range args { varargs = append(varargs, a) } @@ -2954,9 +3032,9 @@ func (m *MockXormEngine) Sqlx(sql string, args ...any) *xorm.Session { } // Sqlx indicates an expected call of Sqlx. -func (mr *MockXormEngineMockRecorder) Sqlx(sql interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sqlx(sql any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{sql}, args...) + varargs := append([]any{sql}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sqlx", reflect.TypeOf((*MockXormEngine)(nil).Sqlx), varargs...) } @@ -2969,13 +3047,13 @@ func (m *MockXormEngine) StoreEngine(storeEngine string) *xorm.Session { } // StoreEngine indicates an expected call of StoreEngine. -func (mr *MockXormEngineMockRecorder) StoreEngine(storeEngine interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) StoreEngine(storeEngine any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreEngine", reflect.TypeOf((*MockXormEngine)(nil).StoreEngine), storeEngine) } // Sum mocks base method. -func (m *MockXormEngine) Sum(bean interface{}, colName string) (float64, error) { +func (m *MockXormEngine) Sum(bean any, colName string) (float64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sum", bean, colName) ret0, _ := ret[0].(float64) @@ -2984,13 +3062,13 @@ func (m *MockXormEngine) Sum(bean interface{}, colName string) (float64, error) } // Sum indicates an expected call of Sum. -func (mr *MockXormEngineMockRecorder) Sum(bean, colName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sum(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockXormEngine)(nil).Sum), bean, colName) } // SumInt mocks base method. -func (m *MockXormEngine) SumInt(bean interface{}, colName string) (int64, error) { +func (m *MockXormEngine) SumInt(bean any, colName string) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SumInt", bean, colName) ret0, _ := ret[0].(int64) @@ -2999,15 +3077,15 @@ func (m *MockXormEngine) SumInt(bean interface{}, colName string) (int64, error) } // SumInt indicates an expected call of SumInt. -func (mr *MockXormEngineMockRecorder) SumInt(bean, colName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SumInt(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumInt", reflect.TypeOf((*MockXormEngine)(nil).SumInt), bean, colName) } // Sums mocks base method. -func (m *MockXormEngine) Sums(bean interface{}, colNames ...string) ([]float64, error) { +func (m *MockXormEngine) Sums(bean any, colNames ...string) ([]float64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -3018,16 +3096,16 @@ func (m *MockXormEngine) Sums(bean interface{}, colNames ...string) ([]float64, } // Sums indicates an expected call of Sums. -func (mr *MockXormEngineMockRecorder) Sums(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sums(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sums", reflect.TypeOf((*MockXormEngine)(nil).Sums), varargs...) } // SumsInt mocks base method. -func (m *MockXormEngine) SumsInt(bean interface{}, colNames ...string) ([]int64, error) { +func (m *MockXormEngine) SumsInt(bean any, colNames ...string) ([]int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -3038,16 +3116,16 @@ func (m *MockXormEngine) SumsInt(bean interface{}, colNames ...string) ([]int64, } // SumsInt indicates an expected call of SumsInt. -func (mr *MockXormEngineMockRecorder) SumsInt(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SumsInt(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumsInt", reflect.TypeOf((*MockXormEngine)(nil).SumsInt), varargs...) } // Sync mocks base method. -func (m *MockXormEngine) Sync(arg0 ...interface{}) error { +func (m *MockXormEngine) Sync(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3057,15 +3135,15 @@ func (m *MockXormEngine) Sync(arg0 ...interface{}) error { } // Sync indicates an expected call of Sync. -func (mr *MockXormEngineMockRecorder) Sync(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sync(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockXormEngine)(nil).Sync), arg0...) } // Sync2 mocks base method. -func (m *MockXormEngine) Sync2(arg0 ...interface{}) error { +func (m *MockXormEngine) Sync2(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3075,13 +3153,13 @@ func (m *MockXormEngine) Sync2(arg0 ...interface{}) error { } // Sync2 indicates an expected call of Sync2. -func (mr *MockXormEngineMockRecorder) Sync2(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sync2(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync2", reflect.TypeOf((*MockXormEngine)(nil).Sync2), arg0...) } // Table mocks base method. -func (m *MockXormEngine) Table(tableNameOrBean interface{}) *xorm.Session { +func (m *MockXormEngine) Table(tableNameOrBean any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Table", tableNameOrBean) ret0, _ := ret[0].(*xorm.Session) @@ -3089,13 +3167,13 @@ func (m *MockXormEngine) Table(tableNameOrBean interface{}) *xorm.Session { } // Table indicates an expected call of Table. -func (mr *MockXormEngineMockRecorder) Table(tableNameOrBean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Table(tableNameOrBean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Table", reflect.TypeOf((*MockXormEngine)(nil).Table), tableNameOrBean) } // TableInfo mocks base method. -func (m *MockXormEngine) TableInfo(bean interface{}) (*schemas.Table, error) { +func (m *MockXormEngine) TableInfo(bean any) (*schemas.Table, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TableInfo", bean) ret0, _ := ret[0].(*schemas.Table) @@ -3104,15 +3182,15 @@ func (m *MockXormEngine) TableInfo(bean interface{}) (*schemas.Table, error) { } // TableInfo indicates an expected call of TableInfo. -func (mr *MockXormEngineMockRecorder) TableInfo(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) TableInfo(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableInfo", reflect.TypeOf((*MockXormEngine)(nil).TableInfo), bean) } // TableName mocks base method. -func (m *MockXormEngine) TableName(arg0 interface{}, arg1 ...bool) string { +func (m *MockXormEngine) TableName(arg0 any, arg1 ...bool) string { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -3122,9 +3200,9 @@ func (m *MockXormEngine) TableName(arg0 interface{}, arg1 ...bool) string { } // TableName indicates an expected call of TableName. -func (mr *MockXormEngineMockRecorder) TableName(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) TableName(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableName", reflect.TypeOf((*MockXormEngine)(nil).TableName), varargs...) } @@ -3137,7 +3215,7 @@ func (m *MockXormEngine) Transaction(fn func(xorm.Interface) error) error { } // Transaction indicates an expected call of Transaction. -func (mr *MockXormEngineMockRecorder) Transaction(fn interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Transaction(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transaction", reflect.TypeOf((*MockXormEngine)(nil).Transaction), fn) } @@ -3149,7 +3227,7 @@ func (m *MockXormEngine) UnMapType(arg0 reflect.Type) { } // UnMapType indicates an expected call of UnMapType. -func (mr *MockXormEngineMockRecorder) UnMapType(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) UnMapType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnMapType", reflect.TypeOf((*MockXormEngine)(nil).UnMapType), arg0) } @@ -3169,9 +3247,9 @@ func (mr *MockXormEngineMockRecorder) Unscoped() *gomock.Call { } // Update mocks base method. -func (m *MockXormEngine) Update(bean interface{}, condiBeans ...interface{}) (int64, error) { +func (m *MockXormEngine) Update(bean any, condiBeans ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range condiBeans { varargs = append(varargs, a) } @@ -3182,16 +3260,16 @@ func (m *MockXormEngine) Update(bean interface{}, condiBeans ...interface{}) (in } // Update indicates an expected call of Update. -func (mr *MockXormEngineMockRecorder) Update(bean interface{}, condiBeans ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Update(bean any, condiBeans ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, condiBeans...) + varargs := append([]any{bean}, condiBeans...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockXormEngine)(nil).Update), varargs...) } // UseBool mocks base method. func (m *MockXormEngine) UseBool(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3201,15 +3279,15 @@ func (m *MockXormEngine) UseBool(arg0 ...string) *xorm.Session { } // UseBool indicates an expected call of UseBool. -func (mr *MockXormEngineMockRecorder) UseBool(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) UseBool(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseBool", reflect.TypeOf((*MockXormEngine)(nil).UseBool), arg0...) } // Where mocks base method. -func (m *MockXormEngine) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) Where(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -3219,9 +3297,9 @@ func (m *MockXormEngine) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Sess } // Where indicates an expected call of Where. -func (mr *MockXormEngineMockRecorder) Where(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Where(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Where", reflect.TypeOf((*MockXormEngine)(nil).Where), varargs...) } @@ -3230,6 +3308,7 @@ type MockCMuxServer struct { goneMock.Flag ctrl *gomock.Controller recorder *MockCMuxServerMockRecorder + isgomock struct{} } // MockCMuxServerMockRecorder is the mock recorder for MockCMuxServer. @@ -3266,7 +3345,7 @@ func (mr *MockCMuxServerMockRecorder) GetAddress() *gomock.Call { // Match mocks base method. func (m *MockCMuxServer) Match(matcher ...cmux.Matcher) net.Listener { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range matcher { varargs = append(varargs, a) } @@ -3276,7 +3355,7 @@ func (m *MockCMuxServer) Match(matcher ...cmux.Matcher) net.Listener { } // Match indicates an expected call of Match. -func (mr *MockCMuxServerMockRecorder) Match(matcher ...interface{}) *gomock.Call { +func (mr *MockCMuxServerMockRecorder) Match(matcher ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Match", reflect.TypeOf((*MockCMuxServer)(nil).Match), matcher...) } @@ -3284,7 +3363,7 @@ func (mr *MockCMuxServerMockRecorder) Match(matcher ...interface{}) *gomock.Call // MatchWithWriters mocks base method. func (m *MockCMuxServer) MatchWithWriters(matcher ...cmux.MatchWriter) net.Listener { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range matcher { varargs = append(varargs, a) } @@ -3294,7 +3373,7 @@ func (m *MockCMuxServer) MatchWithWriters(matcher ...cmux.MatchWriter) net.Liste } // MatchWithWriters indicates an expected call of MatchWithWriters. -func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...interface{}) *gomock.Call { +func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MatchWithWriters", reflect.TypeOf((*MockCMuxServer)(nil).MatchWithWriters), matcher...) } @@ -3304,6 +3383,7 @@ type MockConfigure struct { goneMock.Flag ctrl *gomock.Controller recorder *MockConfigureMockRecorder + isgomock struct{} } // MockConfigureMockRecorder is the mock recorder for MockConfigure. @@ -3332,7 +3412,46 @@ func (m *MockConfigure) Get(key string, v any, defaultVal string) error { } // Get indicates an expected call of Get. -func (mr *MockConfigureMockRecorder) Get(key, v, defaultVal interface{}) *gomock.Call { +func (mr *MockConfigureMockRecorder) Get(key, v, defaultVal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockConfigure)(nil).Get), key, v, defaultVal) } + +// MockNamedGoner is a mock of NamedGoner interface. +type MockNamedGoner struct { + goneMock.Flag + ctrl *gomock.Controller + recorder *MockNamedGonerMockRecorder + isgomock struct{} +} + +// MockNamedGonerMockRecorder is the mock recorder for MockNamedGoner. +type MockNamedGonerMockRecorder struct { + mock *MockNamedGoner +} + +// NewMockNamedGoner creates a new mock instance. +func NewMockNamedGoner(ctrl *gomock.Controller) *MockNamedGoner { + mock := &MockNamedGoner{ctrl: ctrl} + mock.recorder = &MockNamedGonerMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockNamedGoner) EXPECT() *MockNamedGonerMockRecorder { + return m.recorder +} + +// GetGonerId mocks base method. +func (m *MockNamedGoner) GetGonerId() gone.GonerId { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetGonerId") + ret0, _ := ret[0].(gone.GonerId) + return ret0 +} + +// GetGonerId indicates an expected call of GetGonerId. +func (mr *MockNamedGonerMockRecorder) GetGonerId() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGonerId", reflect.TypeOf((*MockNamedGoner)(nil).GetGonerId)) +} diff --git a/goner/grpc/mock_test.go b/goner/grpc/mock_test.go index ac74a48..890716f 100644 --- a/goner/grpc/mock_test.go +++ b/goner/grpc/mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interface.go +// +// Generated by this command: +// +// mockgen -package=gone_grpc -self_package=github.com/gone-io/gone/goner/grpc -source=interface.go -destination=mock_test.go +// // Package gone_grpc is a generated GoMock package. package gone_grpc @@ -7,7 +12,7 @@ package gone_grpc import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" ) @@ -15,6 +20,7 @@ import ( type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder + isgomock struct{} } // MockClientMockRecorder is the mock recorder for MockClient. @@ -55,7 +61,7 @@ func (m *MockClient) Stub(conn *grpc.ClientConn) { } // Stub indicates an expected call of Stub. -func (mr *MockClientMockRecorder) Stub(conn interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Stub(conn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stub", reflect.TypeOf((*MockClient)(nil).Stub), conn) } @@ -64,6 +70,7 @@ func (mr *MockClientMockRecorder) Stub(conn interface{}) *gomock.Call { type MockService struct { ctrl *gomock.Controller recorder *MockServiceMockRecorder + isgomock struct{} } // MockServiceMockRecorder is the mock recorder for MockService. @@ -90,7 +97,7 @@ func (m *MockService) RegisterGrpcServer(server *grpc.Server) { } // RegisterGrpcServer indicates an expected call of RegisterGrpcServer. -func (mr *MockServiceMockRecorder) RegisterGrpcServer(server interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) RegisterGrpcServer(server any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterGrpcServer", reflect.TypeOf((*MockService)(nil).RegisterGrpcServer), server) } diff --git a/goner/grpc/net_listener_mock_test.go b/goner/grpc/net_listener_mock_test.go index db38106..fff263c 100644 --- a/goner/grpc/net_listener_mock_test.go +++ b/goner/grpc/net_listener_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: net (interfaces: Listener) +// +// Generated by this command: +// +// mockgen -package=gone_grpc net Listener +// // Package gone_grpc is a generated GoMock package. package gone_grpc @@ -8,13 +13,14 @@ import ( net "net" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockListener is a mock of Listener interface. type MockListener struct { ctrl *gomock.Controller recorder *MockListenerMockRecorder + isgomock struct{} } // MockListenerMockRecorder is the mock recorder for MockListener. diff --git a/goner/grpc/server_test.go b/goner/grpc/server_test.go index 4df16b1..192746b 100644 --- a/goner/grpc/server_test.go +++ b/goner/grpc/server_test.go @@ -3,12 +3,12 @@ package gone_grpc import ( "context" "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/gone-io/gone/goner/tracer" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "google.golang.org/grpc" "google.golang.org/grpc/metadata" "testing" diff --git a/goner/redis/locker_test.go b/goner/redis/locker_test.go index 76eff15..8425ad0 100644 --- a/goner/redis/locker_test.go +++ b/goner/redis/locker_test.go @@ -2,12 +2,12 @@ package redis import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/gone-io/gone/goner/tracer" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" "time" ) diff --git a/goner/redis/mock_test.go b/goner/redis/mock_test.go index 6bb0b0b..f429dcf 100644 --- a/goner/redis/mock_test.go +++ b/goner/redis/mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interface.go +// +// Generated by this command: +// +// mockgen -package=redis -self_package=github.com/gone-io/gone/goner/redis -source=interface.go -destination=mock_test.go +// // Package redis is a generated GoMock package. package redis @@ -8,14 +13,15 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" redis "github.com/gomodule/redigo/redis" + gomock "go.uber.org/mock/gomock" ) // MockCache is a mock of Cache interface. type MockCache struct { ctrl *gomock.Controller recorder *MockCacheMockRecorder + isgomock struct{} } // MockCacheMockRecorder is the mock recorder for MockCache. @@ -44,24 +50,24 @@ func (m *MockCache) Get(key string, value any) error { } // Get indicates an expected call of Get. -func (mr *MockCacheMockRecorder) Get(key, value interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Get(key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockCache)(nil).Get), key, value) } // Keys mocks base method. -func (m *MockCache) Keys(key string) ([]string, error) { +func (m *MockCache) Keys(pattern string) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Keys", key) + ret := m.ctrl.Call(m, "Keys", pattern) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // Keys indicates an expected call of Keys. -func (mr *MockCacheMockRecorder) Keys(key interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Keys(pattern any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Keys", reflect.TypeOf((*MockCache)(nil).Keys), key) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Keys", reflect.TypeOf((*MockCache)(nil).Keys), pattern) } // Prefix mocks base method. @@ -81,7 +87,7 @@ func (mr *MockCacheMockRecorder) Prefix() *gomock.Call { // Put mocks base method. func (m *MockCache) Put(key string, value any, ttl ...time.Duration) error { m.ctrl.T.Helper() - varargs := []interface{}{key, value} + varargs := []any{key, value} for _, a := range ttl { varargs = append(varargs, a) } @@ -91,9 +97,9 @@ func (m *MockCache) Put(key string, value any, ttl ...time.Duration) error { } // Put indicates an expected call of Put. -func (mr *MockCacheMockRecorder) Put(key, value interface{}, ttl ...interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Put(key, value any, ttl ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{key, value}, ttl...) + varargs := append([]any{key, value}, ttl...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Put", reflect.TypeOf((*MockCache)(nil).Put), varargs...) } @@ -106,7 +112,7 @@ func (m *MockCache) Remove(key string) error { } // Remove indicates an expected call of Remove. -func (mr *MockCacheMockRecorder) Remove(key interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Remove(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Remove", reflect.TypeOf((*MockCache)(nil).Remove), key) } @@ -114,7 +120,7 @@ func (mr *MockCacheMockRecorder) Remove(key interface{}) *gomock.Call { // Set mocks base method. func (m *MockCache) Set(key string, value any, ttl ...time.Duration) error { m.ctrl.T.Helper() - varargs := []interface{}{key, value} + varargs := []any{key, value} for _, a := range ttl { varargs = append(varargs, a) } @@ -124,9 +130,9 @@ func (m *MockCache) Set(key string, value any, ttl ...time.Duration) error { } // Set indicates an expected call of Set. -func (mr *MockCacheMockRecorder) Set(key, value interface{}, ttl ...interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Set(key, value any, ttl ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{key, value}, ttl...) + varargs := append([]any{key, value}, ttl...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockCache)(nil).Set), varargs...) } @@ -134,6 +140,7 @@ func (mr *MockCacheMockRecorder) Set(key, value interface{}, ttl ...interface{}) type MockKey struct { ctrl *gomock.Controller recorder *MockKeyMockRecorder + isgomock struct{} } // MockKeyMockRecorder is the mock recorder for MockKey. @@ -162,7 +169,7 @@ func (m *MockKey) Del(key string) error { } // Del indicates an expected call of Del. -func (mr *MockKeyMockRecorder) Del(key interface{}) *gomock.Call { +func (mr *MockKeyMockRecorder) Del(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Del", reflect.TypeOf((*MockKey)(nil).Del), key) } @@ -176,7 +183,7 @@ func (m *MockKey) Expire(key string, ttl time.Duration) error { } // Expire indicates an expected call of Expire. -func (mr *MockKeyMockRecorder) Expire(key, ttl interface{}) *gomock.Call { +func (mr *MockKeyMockRecorder) Expire(key, ttl any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Expire", reflect.TypeOf((*MockKey)(nil).Expire), key, ttl) } @@ -190,7 +197,7 @@ func (m *MockKey) ExpireAt(key string, time time.Time) error { } // ExpireAt indicates an expected call of ExpireAt. -func (mr *MockKeyMockRecorder) ExpireAt(key, time interface{}) *gomock.Call { +func (mr *MockKeyMockRecorder) ExpireAt(key, time any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExpireAt", reflect.TypeOf((*MockKey)(nil).ExpireAt), key, time) } @@ -205,24 +212,24 @@ func (m *MockKey) Incr(field string, increment int64) (int64, error) { } // Incr indicates an expected call of Incr. -func (mr *MockKeyMockRecorder) Incr(field, increment interface{}) *gomock.Call { +func (mr *MockKeyMockRecorder) Incr(field, increment any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockKey)(nil).Incr), field, increment) } // Keys mocks base method. -func (m *MockKey) Keys(key string) ([]string, error) { +func (m *MockKey) Keys(pattern string) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Keys", key) + ret := m.ctrl.Call(m, "Keys", pattern) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // Keys indicates an expected call of Keys. -func (mr *MockKeyMockRecorder) Keys(key interface{}) *gomock.Call { +func (mr *MockKeyMockRecorder) Keys(pattern any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Keys", reflect.TypeOf((*MockKey)(nil).Keys), key) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Keys", reflect.TypeOf((*MockKey)(nil).Keys), pattern) } // Prefix mocks base method. @@ -249,7 +256,7 @@ func (m *MockKey) Ttl(key string) (time.Duration, error) { } // Ttl indicates an expected call of Ttl. -func (mr *MockKeyMockRecorder) Ttl(key interface{}) *gomock.Call { +func (mr *MockKeyMockRecorder) Ttl(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ttl", reflect.TypeOf((*MockKey)(nil).Ttl), key) } @@ -258,6 +265,7 @@ func (mr *MockKeyMockRecorder) Ttl(key interface{}) *gomock.Call { type MockHash struct { ctrl *gomock.Controller recorder *MockHashMockRecorder + isgomock struct{} } // MockHashMockRecorder is the mock recorder for MockHash. @@ -286,13 +294,13 @@ func (m *MockHash) Del(field string) error { } // Del indicates an expected call of Del. -func (mr *MockHashMockRecorder) Del(field interface{}) *gomock.Call { +func (mr *MockHashMockRecorder) Del(field any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Del", reflect.TypeOf((*MockHash)(nil).Del), field) } // Get mocks base method. -func (m *MockHash) Get(field string, v interface{}) error { +func (m *MockHash) Get(field string, v any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Get", field, v) ret0, _ := ret[0].(error) @@ -300,7 +308,7 @@ func (m *MockHash) Get(field string, v interface{}) error { } // Get indicates an expected call of Get. -func (mr *MockHashMockRecorder) Get(field, v interface{}) *gomock.Call { +func (mr *MockHashMockRecorder) Get(field, v any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockHash)(nil).Get), field, v) } @@ -315,7 +323,7 @@ func (m *MockHash) Incr(field string, increment int64) (int64, error) { } // Incr indicates an expected call of Incr. -func (mr *MockHashMockRecorder) Incr(field, increment interface{}) *gomock.Call { +func (mr *MockHashMockRecorder) Incr(field, increment any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockHash)(nil).Incr), field, increment) } @@ -329,13 +337,13 @@ func (m *MockHash) Scan(arg0 func(string, []byte)) error { } // Scan indicates an expected call of Scan. -func (mr *MockHashMockRecorder) Scan(arg0 interface{}) *gomock.Call { +func (mr *MockHashMockRecorder) Scan(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockHash)(nil).Scan), arg0) } // Set mocks base method. -func (m *MockHash) Set(field string, v interface{}) error { +func (m *MockHash) Set(field string, v any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Set", field, v) ret0, _ := ret[0].(error) @@ -343,7 +351,7 @@ func (m *MockHash) Set(field string, v interface{}) error { } // Set indicates an expected call of Set. -func (mr *MockHashMockRecorder) Set(field, v interface{}) *gomock.Call { +func (mr *MockHashMockRecorder) Set(field, v any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockHash)(nil).Set), field, v) } @@ -352,6 +360,7 @@ func (mr *MockHashMockRecorder) Set(field, v interface{}) *gomock.Call { type MockLocker struct { ctrl *gomock.Controller recorder *MockLockerMockRecorder + isgomock struct{} } // MockLockerMockRecorder is the mock recorder for MockLocker. @@ -380,7 +389,7 @@ func (m *MockLocker) LockAndDo(key string, fn func(), lockTime, checkPeriod time } // LockAndDo indicates an expected call of LockAndDo. -func (mr *MockLockerMockRecorder) LockAndDo(key, fn, lockTime, checkPeriod interface{}) *gomock.Call { +func (mr *MockLockerMockRecorder) LockAndDo(key, fn, lockTime, checkPeriod any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LockAndDo", reflect.TypeOf((*MockLocker)(nil).LockAndDo), key, fn, lockTime, checkPeriod) } @@ -395,7 +404,7 @@ func (m *MockLocker) TryLock(key string, ttl time.Duration) (Unlock, error) { } // TryLock indicates an expected call of TryLock. -func (mr *MockLockerMockRecorder) TryLock(key, ttl interface{}) *gomock.Call { +func (mr *MockLockerMockRecorder) TryLock(key, ttl any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryLock", reflect.TypeOf((*MockLocker)(nil).TryLock), key, ttl) } @@ -404,6 +413,7 @@ func (mr *MockLockerMockRecorder) TryLock(key, ttl interface{}) *gomock.Call { type MockPool struct { ctrl *gomock.Controller recorder *MockPoolMockRecorder + isgomock struct{} } // MockPoolMockRecorder is the mock recorder for MockPool. @@ -430,7 +440,7 @@ func (m *MockPool) Close(conn redis.Conn) { } // Close indicates an expected call of Close. -func (mr *MockPoolMockRecorder) Close(conn interface{}) *gomock.Call { +func (mr *MockPoolMockRecorder) Close(conn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockPool)(nil).Close), conn) } diff --git a/goner/redis/redis_Conn_mock_test.go b/goner/redis/redis_Conn_mock_test.go index 282680c..6094ed2 100644 --- a/goner/redis/redis_Conn_mock_test.go +++ b/goner/redis/redis_Conn_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/gomodule/redigo/redis (interfaces: Conn) +// +// Generated by this command: +// +// mockgen -package=redis github.com/gomodule/redigo/redis Conn +// // Package redis is a generated GoMock package. package redis @@ -7,13 +12,14 @@ package redis import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockConn is a mock of Conn interface. type MockConn struct { ctrl *gomock.Controller recorder *MockConnMockRecorder + isgomock struct{} } // MockConnMockRecorder is the mock recorder for MockConn. @@ -48,22 +54,22 @@ func (mr *MockConnMockRecorder) Close() *gomock.Call { } // Do mocks base method. -func (m *MockConn) Do(arg0 string, arg1 ...interface{}) (interface{}, error) { +func (m *MockConn) Do(commandName string, args ...any) (any, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{commandName} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Do", varargs...) - ret0, _ := ret[0].(interface{}) + ret0, _ := ret[0].(any) ret1, _ := ret[1].(error) return ret0, ret1 } // Do indicates an expected call of Do. -func (mr *MockConnMockRecorder) Do(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) Do(commandName any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{commandName}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Do", reflect.TypeOf((*MockConn)(nil).Do), varargs...) } @@ -96,10 +102,10 @@ func (mr *MockConnMockRecorder) Flush() *gomock.Call { } // Receive mocks base method. -func (m *MockConn) Receive() (interface{}, error) { +func (m *MockConn) Receive() (any, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Receive") - ret0, _ := ret[0].(interface{}) + ret0, _ := ret[0].(any) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -111,10 +117,10 @@ func (mr *MockConnMockRecorder) Receive() *gomock.Call { } // Send mocks base method. -func (m *MockConn) Send(arg0 string, arg1 ...interface{}) error { +func (m *MockConn) Send(commandName string, args ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{commandName} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Send", varargs...) @@ -123,8 +129,8 @@ func (m *MockConn) Send(arg0 string, arg1 ...interface{}) error { } // Send indicates an expected call of Send. -func (mr *MockConnMockRecorder) Send(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockConnMockRecorder) Send(commandName any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{commandName}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Send", reflect.TypeOf((*MockConn)(nil).Send), varargs...) } diff --git a/goner/schedule/mock_test.go b/goner/schedule/mock_test.go index ef284a1..6258c0f 100644 --- a/goner/schedule/mock_test.go +++ b/goner/schedule/mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interface.go +// +// Generated by this command: +// +// mockgen -package=schedule -self_package=github.com/gone-io/gone/goner/schedule -source=interface.go +// // Package schedule is a generated GoMock package. package schedule @@ -8,7 +13,7 @@ import ( goneMock "github.com/gone-io/gone" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockScheduler is a mock of Scheduler interface. @@ -16,6 +21,7 @@ type MockScheduler struct { goneMock.Flag ctrl *gomock.Controller recorder *MockSchedulerMockRecorder + isgomock struct{} } // MockSchedulerMockRecorder is the mock recorder for MockScheduler. @@ -42,7 +48,7 @@ func (m *MockScheduler) Cron(run RunFuncOnceAt) { } // Cron indicates an expected call of Cron. -func (mr *MockSchedulerMockRecorder) Cron(run interface{}) *gomock.Call { +func (mr *MockSchedulerMockRecorder) Cron(run any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cron", reflect.TypeOf((*MockScheduler)(nil).Cron), run) } @@ -52,6 +58,7 @@ type MockSchedule struct { goneMock.Flag ctrl *gomock.Controller recorder *MockScheduleMockRecorder + isgomock struct{} } // MockScheduleMockRecorder is the mock recorder for MockSchedule. diff --git a/goner/schedule/schedule_test.go b/goner/schedule/schedule_test.go index ef64f5d..fd9f744 100644 --- a/goner/schedule/schedule_test.go +++ b/goner/schedule/schedule_test.go @@ -1,13 +1,13 @@ package schedule import ( - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/gone-io/gone/goner/redis" "github.com/gone-io/gone/goner/tracer" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "sync" "testing" "time" diff --git a/goner/urllib/req_RoundTripper_mock_test.go b/goner/urllib/req_RoundTripper_mock_test.go index e00fc3d..626b49c 100644 --- a/goner/urllib/req_RoundTripper_mock_test.go +++ b/goner/urllib/req_RoundTripper_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/imroc/req/v3 (interfaces: RoundTripper) +// +// Generated by this command: +// +// mockgen -package=urllib github.com/imroc/req/v3 RoundTripper +// // Package urllib is a generated GoMock package. package urllib @@ -7,14 +12,15 @@ package urllib import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" req "github.com/imroc/req/v3" + gomock "go.uber.org/mock/gomock" ) // MockRoundTripper is a mock of RoundTripper interface. type MockRoundTripper struct { ctrl *gomock.Controller recorder *MockRoundTripperMockRecorder + isgomock struct{} } // MockRoundTripperMockRecorder is the mock recorder for MockRoundTripper. @@ -44,7 +50,7 @@ func (m *MockRoundTripper) RoundTrip(arg0 *req.Request) (*req.Response, error) { } // RoundTrip indicates an expected call of RoundTrip. -func (mr *MockRoundTripperMockRecorder) RoundTrip(arg0 interface{}) *gomock.Call { +func (mr *MockRoundTripperMockRecorder) RoundTrip(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RoundTrip", reflect.TypeOf((*MockRoundTripper)(nil).RoundTrip), arg0) } diff --git a/goner/urllib/req_test.go b/goner/urllib/req_test.go index 4bc4c77..c63b1c2 100644 --- a/goner/urllib/req_test.go +++ b/goner/urllib/req_test.go @@ -1,13 +1,13 @@ package urllib import ( - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/gone-io/gone/goner/tracer" "github.com/imroc/req/v3" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" ) diff --git a/goner/xorm/engine_mock_test.go b/goner/xorm/engine_mock_test.go index a11766c..10df122 100644 --- a/goner/xorm/engine_mock_test.go +++ b/goner/xorm/engine_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: xorm.io/xorm (interfaces: EngineInterface) +// +// Generated by this command: +// +// mockgen -package xorm -destination=./engine_mock_test.go xorm.io/xorm EngineInterface +// // Package xorm is a generated GoMock package. package xorm @@ -10,7 +15,7 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" xorm "xorm.io/xorm" caches "xorm.io/xorm/caches" contexts "xorm.io/xorm/contexts" @@ -24,6 +29,7 @@ import ( type MockEngineInterface struct { ctrl *gomock.Controller recorder *MockEngineInterfaceMockRecorder + isgomock struct{} } // MockEngineInterfaceMockRecorder is the mock recorder for MockEngineInterface. @@ -44,29 +50,29 @@ func (m *MockEngineInterface) EXPECT() *MockEngineInterfaceMockRecorder { } // AddHook mocks base method. -func (m *MockEngineInterface) AddHook(arg0 contexts.Hook) { +func (m *MockEngineInterface) AddHook(hook contexts.Hook) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddHook", arg0) + m.ctrl.Call(m, "AddHook", hook) } // AddHook indicates an expected call of AddHook. -func (mr *MockEngineInterfaceMockRecorder) AddHook(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) AddHook(hook any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHook", reflect.TypeOf((*MockEngineInterface)(nil).AddHook), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHook", reflect.TypeOf((*MockEngineInterface)(nil).AddHook), hook) } // Alias mocks base method. -func (m *MockEngineInterface) Alias(arg0 string) *xorm.Session { +func (m *MockEngineInterface) Alias(alias string) *xorm.Session { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Alias", arg0) + ret := m.ctrl.Call(m, "Alias", alias) ret0, _ := ret[0].(*xorm.Session) return ret0 } // Alias indicates an expected call of Alias. -func (mr *MockEngineInterfaceMockRecorder) Alias(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Alias(alias any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Alias", reflect.TypeOf((*MockEngineInterface)(nil).Alias), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Alias", reflect.TypeOf((*MockEngineInterface)(nil).Alias), alias) } // AllCols mocks base method. @@ -84,10 +90,10 @@ func (mr *MockEngineInterfaceMockRecorder) AllCols() *gomock.Call { } // Asc mocks base method. -func (m *MockEngineInterface) Asc(arg0 ...string) *xorm.Session { +func (m *MockEngineInterface) Asc(colNames ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range colNames { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Asc", varargs...) @@ -96,13 +102,13 @@ func (m *MockEngineInterface) Asc(arg0 ...string) *xorm.Session { } // Asc indicates an expected call of Asc. -func (mr *MockEngineInterfaceMockRecorder) Asc(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Asc(colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Asc", reflect.TypeOf((*MockEngineInterface)(nil).Asc), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Asc", reflect.TypeOf((*MockEngineInterface)(nil).Asc), colNames...) } // Before mocks base method. -func (m *MockEngineInterface) Before(arg0 func(interface{})) *xorm.Session { +func (m *MockEngineInterface) Before(arg0 func(any)) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Before", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -110,43 +116,43 @@ func (m *MockEngineInterface) Before(arg0 func(interface{})) *xorm.Session { } // Before indicates an expected call of Before. -func (mr *MockEngineInterfaceMockRecorder) Before(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Before(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Before", reflect.TypeOf((*MockEngineInterface)(nil).Before), arg0) } // BufferSize mocks base method. -func (m *MockEngineInterface) BufferSize(arg0 int) *xorm.Session { +func (m *MockEngineInterface) BufferSize(size int) *xorm.Session { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BufferSize", arg0) + ret := m.ctrl.Call(m, "BufferSize", size) ret0, _ := ret[0].(*xorm.Session) return ret0 } // BufferSize indicates an expected call of BufferSize. -func (mr *MockEngineInterfaceMockRecorder) BufferSize(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) BufferSize(size any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BufferSize", reflect.TypeOf((*MockEngineInterface)(nil).BufferSize), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BufferSize", reflect.TypeOf((*MockEngineInterface)(nil).BufferSize), size) } // Charset mocks base method. -func (m *MockEngineInterface) Charset(arg0 string) *xorm.Session { +func (m *MockEngineInterface) Charset(charset string) *xorm.Session { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Charset", arg0) + ret := m.ctrl.Call(m, "Charset", charset) ret0, _ := ret[0].(*xorm.Session) return ret0 } // Charset indicates an expected call of Charset. -func (mr *MockEngineInterfaceMockRecorder) Charset(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Charset(charset any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Charset", reflect.TypeOf((*MockEngineInterface)(nil).Charset), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Charset", reflect.TypeOf((*MockEngineInterface)(nil).Charset), charset) } // ClearCache mocks base method. -func (m *MockEngineInterface) ClearCache(arg0 ...interface{}) error { +func (m *MockEngineInterface) ClearCache(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -156,16 +162,16 @@ func (m *MockEngineInterface) ClearCache(arg0 ...interface{}) error { } // ClearCache indicates an expected call of ClearCache. -func (mr *MockEngineInterfaceMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) ClearCache(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearCache", reflect.TypeOf((*MockEngineInterface)(nil).ClearCache), arg0...) } // Cols mocks base method. -func (m *MockEngineInterface) Cols(arg0 ...string) *xorm.Session { +func (m *MockEngineInterface) Cols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range columns { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Cols", varargs...) @@ -174,9 +180,9 @@ func (m *MockEngineInterface) Cols(arg0 ...string) *xorm.Session { } // Cols indicates an expected call of Cols. -func (mr *MockEngineInterfaceMockRecorder) Cols(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Cols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cols", reflect.TypeOf((*MockEngineInterface)(nil).Cols), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cols", reflect.TypeOf((*MockEngineInterface)(nil).Cols), columns...) } // Context mocks base method. @@ -188,15 +194,15 @@ func (m *MockEngineInterface) Context(arg0 context.Context) *xorm.Session { } // Context indicates an expected call of Context. -func (mr *MockEngineInterfaceMockRecorder) Context(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Context(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockEngineInterface)(nil).Context), arg0) } // Count mocks base method. -func (m *MockEngineInterface) Count(arg0 ...interface{}) (int64, error) { +func (m *MockEngineInterface) Count(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -207,29 +213,29 @@ func (m *MockEngineInterface) Count(arg0 ...interface{}) (int64, error) { } // Count indicates an expected call of Count. -func (mr *MockEngineInterfaceMockRecorder) Count(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Count(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Count", reflect.TypeOf((*MockEngineInterface)(nil).Count), arg0...) } // CreateIndexes mocks base method. -func (m *MockEngineInterface) CreateIndexes(arg0 interface{}) error { +func (m *MockEngineInterface) CreateIndexes(bean any) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateIndexes", arg0) + ret := m.ctrl.Call(m, "CreateIndexes", bean) ret0, _ := ret[0].(error) return ret0 } // CreateIndexes indicates an expected call of CreateIndexes. -func (mr *MockEngineInterfaceMockRecorder) CreateIndexes(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) CreateIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateIndexes", reflect.TypeOf((*MockEngineInterface)(nil).CreateIndexes), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateIndexes", reflect.TypeOf((*MockEngineInterface)(nil).CreateIndexes), bean) } // CreateTables mocks base method. -func (m *MockEngineInterface) CreateTables(arg0 ...interface{}) error { +func (m *MockEngineInterface) CreateTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -239,23 +245,23 @@ func (m *MockEngineInterface) CreateTables(arg0 ...interface{}) error { } // CreateTables indicates an expected call of CreateTables. -func (mr *MockEngineInterfaceMockRecorder) CreateTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) CreateTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTables", reflect.TypeOf((*MockEngineInterface)(nil).CreateTables), arg0...) } // CreateUniques mocks base method. -func (m *MockEngineInterface) CreateUniques(arg0 interface{}) error { +func (m *MockEngineInterface) CreateUniques(bean any) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateUniques", arg0) + ret := m.ctrl.Call(m, "CreateUniques", bean) ret0, _ := ret[0].(error) return ret0 } // CreateUniques indicates an expected call of CreateUniques. -func (mr *MockEngineInterfaceMockRecorder) CreateUniques(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) CreateUniques(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUniques", reflect.TypeOf((*MockEngineInterface)(nil).CreateUniques), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUniques", reflect.TypeOf((*MockEngineInterface)(nil).CreateUniques), bean) } // DBMetas mocks base method. @@ -289,10 +295,10 @@ func (mr *MockEngineInterfaceMockRecorder) DBVersion() *gomock.Call { } // Decr mocks base method. -func (m *MockEngineInterface) Decr(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) Decr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{column} + for _, a := range arg { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Decr", varargs...) @@ -301,16 +307,16 @@ func (m *MockEngineInterface) Decr(arg0 string, arg1 ...interface{}) *xorm.Sessi } // Decr indicates an expected call of Decr. -func (mr *MockEngineInterfaceMockRecorder) Decr(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Decr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockEngineInterface)(nil).Decr), varargs...) } // Delete mocks base method. -func (m *MockEngineInterface) Delete(arg0 ...interface{}) (int64, error) { +func (m *MockEngineInterface) Delete(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -321,7 +327,7 @@ func (m *MockEngineInterface) Delete(arg0 ...interface{}) (int64, error) { } // Delete indicates an expected call of Delete. -func (mr *MockEngineInterfaceMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Delete(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockEngineInterface)(nil).Delete), arg0...) } @@ -329,7 +335,7 @@ func (mr *MockEngineInterfaceMockRecorder) Delete(arg0 ...interface{}) *gomock.C // Desc mocks base method. func (m *MockEngineInterface) Desc(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -339,7 +345,7 @@ func (m *MockEngineInterface) Desc(arg0 ...string) *xorm.Session { } // Desc indicates an expected call of Desc. -func (mr *MockEngineInterfaceMockRecorder) Desc(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Desc(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Desc", reflect.TypeOf((*MockEngineInterface)(nil).Desc), arg0...) } @@ -359,10 +365,10 @@ func (mr *MockEngineInterfaceMockRecorder) Dialect() *gomock.Call { } // Distinct mocks base method. -func (m *MockEngineInterface) Distinct(arg0 ...string) *xorm.Session { +func (m *MockEngineInterface) Distinct(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range columns { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Distinct", varargs...) @@ -371,9 +377,9 @@ func (m *MockEngineInterface) Distinct(arg0 ...string) *xorm.Session { } // Distinct indicates an expected call of Distinct. -func (mr *MockEngineInterfaceMockRecorder) Distinct(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Distinct(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Distinct", reflect.TypeOf((*MockEngineInterface)(nil).Distinct), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Distinct", reflect.TypeOf((*MockEngineInterface)(nil).Distinct), columns...) } // DriverName mocks base method. @@ -391,23 +397,23 @@ func (mr *MockEngineInterfaceMockRecorder) DriverName() *gomock.Call { } // DropIndexes mocks base method. -func (m *MockEngineInterface) DropIndexes(arg0 interface{}) error { +func (m *MockEngineInterface) DropIndexes(bean any) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DropIndexes", arg0) + ret := m.ctrl.Call(m, "DropIndexes", bean) ret0, _ := ret[0].(error) return ret0 } // DropIndexes indicates an expected call of DropIndexes. -func (mr *MockEngineInterfaceMockRecorder) DropIndexes(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) DropIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropIndexes", reflect.TypeOf((*MockEngineInterface)(nil).DropIndexes), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropIndexes", reflect.TypeOf((*MockEngineInterface)(nil).DropIndexes), bean) } // DropTables mocks base method. -func (m *MockEngineInterface) DropTables(arg0 ...interface{}) error { +func (m *MockEngineInterface) DropTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -417,16 +423,16 @@ func (m *MockEngineInterface) DropTables(arg0 ...interface{}) error { } // DropTables indicates an expected call of DropTables. -func (mr *MockEngineInterfaceMockRecorder) DropTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) DropTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropTables", reflect.TypeOf((*MockEngineInterface)(nil).DropTables), arg0...) } // DumpAllToFile mocks base method. -func (m *MockEngineInterface) DumpAllToFile(arg0 string, arg1 ...schemas.DBType) error { +func (m *MockEngineInterface) DumpAllToFile(fp string, tp ...schemas.DBType) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{fp} + for _, a := range tp { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "DumpAllToFile", varargs...) @@ -435,9 +441,9 @@ func (m *MockEngineInterface) DumpAllToFile(arg0 string, arg1 ...schemas.DBType) } // DumpAllToFile indicates an expected call of DumpAllToFile. -func (mr *MockEngineInterfaceMockRecorder) DumpAllToFile(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) DumpAllToFile(fp any, tp ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{fp}, tp...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DumpAllToFile", reflect.TypeOf((*MockEngineInterface)(nil).DumpAllToFile), varargs...) } @@ -448,16 +454,16 @@ func (m *MockEngineInterface) EnableSessionID(arg0 bool) { } // EnableSessionID indicates an expected call of EnableSessionID. -func (mr *MockEngineInterfaceMockRecorder) EnableSessionID(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) EnableSessionID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableSessionID", reflect.TypeOf((*MockEngineInterface)(nil).EnableSessionID), arg0) } // Exec mocks base method. -func (m *MockEngineInterface) Exec(arg0 ...interface{}) (sql.Result, error) { +func (m *MockEngineInterface) Exec(sqlOrArgs ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -467,16 +473,16 @@ func (m *MockEngineInterface) Exec(arg0 ...interface{}) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockEngineInterfaceMockRecorder) Exec(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Exec(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockEngineInterface)(nil).Exec), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockEngineInterface)(nil).Exec), sqlOrArgs...) } // Exist mocks base method. -func (m *MockEngineInterface) Exist(arg0 ...interface{}) (bool, error) { +func (m *MockEngineInterface) Exist(bean ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range bean { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exist", varargs...) @@ -486,15 +492,15 @@ func (m *MockEngineInterface) Exist(arg0 ...interface{}) (bool, error) { } // Exist indicates an expected call of Exist. -func (mr *MockEngineInterfaceMockRecorder) Exist(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Exist(bean ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exist", reflect.TypeOf((*MockEngineInterface)(nil).Exist), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exist", reflect.TypeOf((*MockEngineInterface)(nil).Exist), bean...) } // Find mocks base method. -func (m *MockEngineInterface) Find(arg0 interface{}, arg1 ...interface{}) error { +func (m *MockEngineInterface) Find(arg0 any, arg1 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -504,16 +510,16 @@ func (m *MockEngineInterface) Find(arg0 interface{}, arg1 ...interface{}) error } // Find indicates an expected call of Find. -func (mr *MockEngineInterfaceMockRecorder) Find(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Find(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockEngineInterface)(nil).Find), varargs...) } // FindAndCount mocks base method. -func (m *MockEngineInterface) FindAndCount(arg0 interface{}, arg1 ...interface{}) (int64, error) { +func (m *MockEngineInterface) FindAndCount(arg0 any, arg1 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -524,16 +530,16 @@ func (m *MockEngineInterface) FindAndCount(arg0 interface{}, arg1 ...interface{} } // FindAndCount indicates an expected call of FindAndCount. -func (mr *MockEngineInterfaceMockRecorder) FindAndCount(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) FindAndCount(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindAndCount", reflect.TypeOf((*MockEngineInterface)(nil).FindAndCount), varargs...) } // Get mocks base method. -func (m *MockEngineInterface) Get(arg0 ...interface{}) (bool, error) { +func (m *MockEngineInterface) Get(arg0 ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -544,7 +550,7 @@ func (m *MockEngineInterface) Get(arg0 ...interface{}) (bool, error) { } // Get indicates an expected call of Get. -func (mr *MockEngineInterfaceMockRecorder) Get(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Get(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockEngineInterface)(nil).Get), arg0...) } @@ -558,7 +564,7 @@ func (m *MockEngineInterface) GetCacher(arg0 string) caches.Cacher { } // GetCacher indicates an expected call of GetCacher. -func (mr *MockEngineInterfaceMockRecorder) GetCacher(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) GetCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCacher", reflect.TypeOf((*MockEngineInterface)(nil).GetCacher), arg0) } @@ -634,21 +640,21 @@ func (mr *MockEngineInterfaceMockRecorder) GetTableMapper() *gomock.Call { } // GroupBy mocks base method. -func (m *MockEngineInterface) GroupBy(arg0 string) *xorm.Session { +func (m *MockEngineInterface) GroupBy(keys string) *xorm.Session { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GroupBy", arg0) + ret := m.ctrl.Call(m, "GroupBy", keys) ret0, _ := ret[0].(*xorm.Session) return ret0 } // GroupBy indicates an expected call of GroupBy. -func (mr *MockEngineInterfaceMockRecorder) GroupBy(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) GroupBy(keys any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupBy", reflect.TypeOf((*MockEngineInterface)(nil).GroupBy), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupBy", reflect.TypeOf((*MockEngineInterface)(nil).GroupBy), keys) } // ID mocks base method. -func (m *MockEngineInterface) ID(arg0 interface{}) *xorm.Session { +func (m *MockEngineInterface) ID(arg0 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -656,30 +662,30 @@ func (m *MockEngineInterface) ID(arg0 interface{}) *xorm.Session { } // ID indicates an expected call of ID. -func (mr *MockEngineInterfaceMockRecorder) ID(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) ID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockEngineInterface)(nil).ID), arg0) } // ImportFile mocks base method. -func (m *MockEngineInterface) ImportFile(arg0 string) ([]sql.Result, error) { +func (m *MockEngineInterface) ImportFile(fp string) ([]sql.Result, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ImportFile", arg0) + ret := m.ctrl.Call(m, "ImportFile", fp) ret0, _ := ret[0].([]sql.Result) ret1, _ := ret[1].(error) return ret0, ret1 } // ImportFile indicates an expected call of ImportFile. -func (mr *MockEngineInterfaceMockRecorder) ImportFile(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) ImportFile(fp any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImportFile", reflect.TypeOf((*MockEngineInterface)(nil).ImportFile), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImportFile", reflect.TypeOf((*MockEngineInterface)(nil).ImportFile), fp) } // In mocks base method. -func (m *MockEngineInterface) In(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) In(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -689,17 +695,17 @@ func (m *MockEngineInterface) In(arg0 string, arg1 ...interface{}) *xorm.Session } // In indicates an expected call of In. -func (mr *MockEngineInterfaceMockRecorder) In(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) In(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "In", reflect.TypeOf((*MockEngineInterface)(nil).In), varargs...) } // Incr mocks base method. -func (m *MockEngineInterface) Incr(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) Incr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{column} + for _, a := range arg { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Incr", varargs...) @@ -708,16 +714,16 @@ func (m *MockEngineInterface) Incr(arg0 string, arg1 ...interface{}) *xorm.Sessi } // Incr indicates an expected call of Incr. -func (mr *MockEngineInterfaceMockRecorder) Incr(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Incr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockEngineInterface)(nil).Incr), varargs...) } // Insert mocks base method. -func (m *MockEngineInterface) Insert(arg0 ...interface{}) (int64, error) { +func (m *MockEngineInterface) Insert(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -728,13 +734,13 @@ func (m *MockEngineInterface) Insert(arg0 ...interface{}) (int64, error) { } // Insert indicates an expected call of Insert. -func (mr *MockEngineInterfaceMockRecorder) Insert(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Insert(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockEngineInterface)(nil).Insert), arg0...) } // InsertOne mocks base method. -func (m *MockEngineInterface) InsertOne(arg0 interface{}) (int64, error) { +func (m *MockEngineInterface) InsertOne(arg0 any) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertOne", arg0) ret0, _ := ret[0].(int64) @@ -743,43 +749,43 @@ func (m *MockEngineInterface) InsertOne(arg0 interface{}) (int64, error) { } // InsertOne indicates an expected call of InsertOne. -func (mr *MockEngineInterfaceMockRecorder) InsertOne(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) InsertOne(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertOne", reflect.TypeOf((*MockEngineInterface)(nil).InsertOne), arg0) } // IsTableEmpty mocks base method. -func (m *MockEngineInterface) IsTableEmpty(arg0 interface{}) (bool, error) { +func (m *MockEngineInterface) IsTableEmpty(bean any) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsTableEmpty", arg0) + ret := m.ctrl.Call(m, "IsTableEmpty", bean) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // IsTableEmpty indicates an expected call of IsTableEmpty. -func (mr *MockEngineInterfaceMockRecorder) IsTableEmpty(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) IsTableEmpty(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableEmpty", reflect.TypeOf((*MockEngineInterface)(nil).IsTableEmpty), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableEmpty", reflect.TypeOf((*MockEngineInterface)(nil).IsTableEmpty), bean) } // IsTableExist mocks base method. -func (m *MockEngineInterface) IsTableExist(arg0 interface{}) (bool, error) { +func (m *MockEngineInterface) IsTableExist(beanOrTableName any) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsTableExist", arg0) + ret := m.ctrl.Call(m, "IsTableExist", beanOrTableName) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // IsTableExist indicates an expected call of IsTableExist. -func (mr *MockEngineInterfaceMockRecorder) IsTableExist(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) IsTableExist(beanOrTableName any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableExist", reflect.TypeOf((*MockEngineInterface)(nil).IsTableExist), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableExist", reflect.TypeOf((*MockEngineInterface)(nil).IsTableExist), beanOrTableName) } // Iterate mocks base method. -func (m *MockEngineInterface) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { +func (m *MockEngineInterface) Iterate(arg0 any, arg1 xorm.IterFunc) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -787,16 +793,16 @@ func (m *MockEngineInterface) Iterate(arg0 interface{}, arg1 xorm.IterFunc) erro } // Iterate indicates an expected call of Iterate. -func (mr *MockEngineInterfaceMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Iterate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockEngineInterface)(nil).Iterate), arg0, arg1) } // Join mocks base method. -func (m *MockEngineInterface) Join(arg0 string, arg1 interface{}, arg2 string, arg3 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) Join(joinOperator string, tablename any, condition string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{joinOperator, tablename, condition} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Join", varargs...) @@ -805,16 +811,16 @@ func (m *MockEngineInterface) Join(arg0 string, arg1 interface{}, arg2 string, a } // Join indicates an expected call of Join. -func (mr *MockEngineInterfaceMockRecorder) Join(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Join(joinOperator, tablename, condition any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{joinOperator, tablename, condition}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Join", reflect.TypeOf((*MockEngineInterface)(nil).Join), varargs...) } // Limit mocks base method. func (m *MockEngineInterface) Limit(arg0 int, arg1 ...int) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -824,14 +830,14 @@ func (m *MockEngineInterface) Limit(arg0 int, arg1 ...int) *xorm.Session { } // Limit indicates an expected call of Limit. -func (mr *MockEngineInterfaceMockRecorder) Limit(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Limit(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Limit", reflect.TypeOf((*MockEngineInterface)(nil).Limit), varargs...) } // MapCacher mocks base method. -func (m *MockEngineInterface) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { +func (m *MockEngineInterface) MapCacher(arg0 any, arg1 caches.Cacher) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MapCacher", arg0, arg1) ret0, _ := ret[0].(error) @@ -839,16 +845,16 @@ func (m *MockEngineInterface) MapCacher(arg0 interface{}, arg1 caches.Cacher) er } // MapCacher indicates an expected call of MapCacher. -func (mr *MockEngineInterfaceMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) MapCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MapCacher", reflect.TypeOf((*MockEngineInterface)(nil).MapCacher), arg0, arg1) } // MustCols mocks base method. -func (m *MockEngineInterface) MustCols(arg0 ...string) *xorm.Session { +func (m *MockEngineInterface) MustCols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range columns { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "MustCols", varargs...) @@ -857,9 +863,9 @@ func (m *MockEngineInterface) MustCols(arg0 ...string) *xorm.Session { } // MustCols indicates an expected call of MustCols. -func (mr *MockEngineInterfaceMockRecorder) MustCols(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) MustCols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MustCols", reflect.TypeOf((*MockEngineInterface)(nil).MustCols), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MustCols", reflect.TypeOf((*MockEngineInterface)(nil).MustCols), columns...) } // NewSession mocks base method. @@ -879,7 +885,7 @@ func (mr *MockEngineInterfaceMockRecorder) NewSession() *gomock.Call { // NoAutoCondition mocks base method. func (m *MockEngineInterface) NoAutoCondition(arg0 ...bool) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -889,7 +895,7 @@ func (m *MockEngineInterface) NoAutoCondition(arg0 ...bool) *xorm.Session { } // NoAutoCondition indicates an expected call of NoAutoCondition. -func (mr *MockEngineInterfaceMockRecorder) NoAutoCondition(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) NoAutoCondition(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NoAutoCondition", reflect.TypeOf((*MockEngineInterface)(nil).NoAutoCondition), arg0...) } @@ -909,9 +915,9 @@ func (mr *MockEngineInterfaceMockRecorder) NoAutoTime() *gomock.Call { } // NotIn mocks base method. -func (m *MockEngineInterface) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) NotIn(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -921,16 +927,16 @@ func (m *MockEngineInterface) NotIn(arg0 string, arg1 ...interface{}) *xorm.Sess } // NotIn indicates an expected call of NotIn. -func (mr *MockEngineInterfaceMockRecorder) NotIn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) NotIn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotIn", reflect.TypeOf((*MockEngineInterface)(nil).NotIn), varargs...) } // Nullable mocks base method. func (m *MockEngineInterface) Nullable(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -940,16 +946,16 @@ func (m *MockEngineInterface) Nullable(arg0 ...string) *xorm.Session { } // Nullable indicates an expected call of Nullable. -func (mr *MockEngineInterfaceMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Nullable(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Nullable", reflect.TypeOf((*MockEngineInterface)(nil).Nullable), arg0...) } // Omit mocks base method. -func (m *MockEngineInterface) Omit(arg0 ...string) *xorm.Session { +func (m *MockEngineInterface) Omit(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range columns { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Omit", varargs...) @@ -958,16 +964,16 @@ func (m *MockEngineInterface) Omit(arg0 ...string) *xorm.Session { } // Omit indicates an expected call of Omit. -func (mr *MockEngineInterfaceMockRecorder) Omit(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Omit(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Omit", reflect.TypeOf((*MockEngineInterface)(nil).Omit), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Omit", reflect.TypeOf((*MockEngineInterface)(nil).Omit), columns...) } // OrderBy mocks base method. -func (m *MockEngineInterface) OrderBy(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) OrderBy(order any, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{order} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "OrderBy", varargs...) @@ -976,9 +982,9 @@ func (m *MockEngineInterface) OrderBy(arg0 interface{}, arg1 ...interface{}) *xo } // OrderBy indicates an expected call of OrderBy. -func (mr *MockEngineInterfaceMockRecorder) OrderBy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) OrderBy(order any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{order}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OrderBy", reflect.TypeOf((*MockEngineInterface)(nil).OrderBy), varargs...) } @@ -1011,10 +1017,10 @@ func (mr *MockEngineInterfaceMockRecorder) Prepare() *gomock.Call { } // Query mocks base method. -func (m *MockEngineInterface) Query(arg0 ...interface{}) ([]map[string][]byte, error) { +func (m *MockEngineInterface) Query(sqlOrArgs ...any) ([]map[string][]byte, error) { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Query", varargs...) @@ -1024,35 +1030,35 @@ func (m *MockEngineInterface) Query(arg0 ...interface{}) ([]map[string][]byte, e } // Query indicates an expected call of Query. -func (mr *MockEngineInterfaceMockRecorder) Query(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Query(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockEngineInterface)(nil).Query), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockEngineInterface)(nil).Query), sqlOrArgs...) } // QueryInterface mocks base method. -func (m *MockEngineInterface) QueryInterface(arg0 ...interface{}) ([]map[string]interface{}, error) { +func (m *MockEngineInterface) QueryInterface(sqlOrArgs ...any) ([]map[string]any, error) { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryInterface", varargs...) - ret0, _ := ret[0].([]map[string]interface{}) + ret0, _ := ret[0].([]map[string]any) ret1, _ := ret[1].(error) return ret0, ret1 } // QueryInterface indicates an expected call of QueryInterface. -func (mr *MockEngineInterfaceMockRecorder) QueryInterface(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) QueryInterface(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryInterface", reflect.TypeOf((*MockEngineInterface)(nil).QueryInterface), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryInterface", reflect.TypeOf((*MockEngineInterface)(nil).QueryInterface), sqlOrArgs...) } // QueryString mocks base method. -func (m *MockEngineInterface) QueryString(arg0 ...interface{}) ([]map[string]string, error) { +func (m *MockEngineInterface) QueryString(sqlOrArgs ...any) ([]map[string]string, error) { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryString", varargs...) @@ -1062,9 +1068,9 @@ func (m *MockEngineInterface) QueryString(arg0 ...interface{}) ([]map[string]str } // QueryString indicates an expected call of QueryString. -func (mr *MockEngineInterfaceMockRecorder) QueryString(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) QueryString(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryString", reflect.TypeOf((*MockEngineInterface)(nil).QueryString), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryString", reflect.TypeOf((*MockEngineInterface)(nil).QueryString), sqlOrArgs...) } // Quote mocks base method. @@ -1076,30 +1082,30 @@ func (m *MockEngineInterface) Quote(arg0 string) string { } // Quote indicates an expected call of Quote. -func (mr *MockEngineInterfaceMockRecorder) Quote(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Quote(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Quote", reflect.TypeOf((*MockEngineInterface)(nil).Quote), arg0) } // Rows mocks base method. -func (m *MockEngineInterface) Rows(arg0 interface{}) (*xorm.Rows, error) { +func (m *MockEngineInterface) Rows(bean any) (*xorm.Rows, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Rows", arg0) + ret := m.ctrl.Call(m, "Rows", bean) ret0, _ := ret[0].(*xorm.Rows) ret1, _ := ret[1].(error) return ret0, ret1 } // Rows indicates an expected call of Rows. -func (mr *MockEngineInterfaceMockRecorder) Rows(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Rows(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rows", reflect.TypeOf((*MockEngineInterface)(nil).Rows), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rows", reflect.TypeOf((*MockEngineInterface)(nil).Rows), bean) } // SQL mocks base method. -func (m *MockEngineInterface) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) SQL(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -1109,9 +1115,9 @@ func (m *MockEngineInterface) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.S } // SQL indicates an expected call of SQL. -func (mr *MockEngineInterfaceMockRecorder) SQL(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SQL(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SQL", reflect.TypeOf((*MockEngineInterface)(nil).SQL), varargs...) } @@ -1124,7 +1130,7 @@ func (m *MockEngineInterface) Select(arg0 string) *xorm.Session { } // Select indicates an expected call of Select. -func (mr *MockEngineInterfaceMockRecorder) Select(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Select(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Select", reflect.TypeOf((*MockEngineInterface)(nil).Select), arg0) } @@ -1136,7 +1142,7 @@ func (m *MockEngineInterface) SetCacher(arg0 string, arg1 caches.Cacher) { } // SetCacher indicates an expected call of SetCacher. -func (mr *MockEngineInterfaceMockRecorder) SetCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCacher", reflect.TypeOf((*MockEngineInterface)(nil).SetCacher), arg0, arg1) } @@ -1148,7 +1154,7 @@ func (m *MockEngineInterface) SetColumnMapper(arg0 names.Mapper) { } // SetColumnMapper indicates an expected call of SetColumnMapper. -func (mr *MockEngineInterfaceMockRecorder) SetColumnMapper(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetColumnMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColumnMapper", reflect.TypeOf((*MockEngineInterface)(nil).SetColumnMapper), arg0) } @@ -1160,7 +1166,7 @@ func (m *MockEngineInterface) SetConnMaxLifetime(arg0 time.Duration) { } // SetConnMaxLifetime indicates an expected call of SetConnMaxLifetime. -func (mr *MockEngineInterfaceMockRecorder) SetConnMaxLifetime(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetConnMaxLifetime(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetConnMaxLifetime", reflect.TypeOf((*MockEngineInterface)(nil).SetConnMaxLifetime), arg0) } @@ -1172,13 +1178,13 @@ func (m *MockEngineInterface) SetDefaultCacher(arg0 caches.Cacher) { } // SetDefaultCacher indicates an expected call of SetDefaultCacher. -func (mr *MockEngineInterfaceMockRecorder) SetDefaultCacher(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetDefaultCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefaultCacher", reflect.TypeOf((*MockEngineInterface)(nil).SetDefaultCacher), arg0) } // SetExpr mocks base method. -func (m *MockEngineInterface) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { +func (m *MockEngineInterface) SetExpr(arg0 string, arg1 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetExpr", arg0, arg1) ret0, _ := ret[0].(*xorm.Session) @@ -1186,7 +1192,7 @@ func (m *MockEngineInterface) SetExpr(arg0 string, arg1 interface{}) *xorm.Sessi } // SetExpr indicates an expected call of SetExpr. -func (mr *MockEngineInterfaceMockRecorder) SetExpr(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetExpr(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExpr", reflect.TypeOf((*MockEngineInterface)(nil).SetExpr), arg0, arg1) } @@ -1198,21 +1204,21 @@ func (m *MockEngineInterface) SetLogLevel(arg0 log.LogLevel) { } // SetLogLevel indicates an expected call of SetLogLevel. -func (mr *MockEngineInterfaceMockRecorder) SetLogLevel(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetLogLevel(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogLevel", reflect.TypeOf((*MockEngineInterface)(nil).SetLogLevel), arg0) } // SetLogger mocks base method. -func (m *MockEngineInterface) SetLogger(arg0 interface{}) { +func (m *MockEngineInterface) SetLogger(logger any) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetLogger", arg0) + m.ctrl.Call(m, "SetLogger", logger) } // SetLogger indicates an expected call of SetLogger. -func (mr *MockEngineInterfaceMockRecorder) SetLogger(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetLogger(logger any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogger", reflect.TypeOf((*MockEngineInterface)(nil).SetLogger), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogger", reflect.TypeOf((*MockEngineInterface)(nil).SetLogger), logger) } // SetMapper mocks base method. @@ -1222,7 +1228,7 @@ func (m *MockEngineInterface) SetMapper(arg0 names.Mapper) { } // SetMapper indicates an expected call of SetMapper. -func (mr *MockEngineInterfaceMockRecorder) SetMapper(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMapper", reflect.TypeOf((*MockEngineInterface)(nil).SetMapper), arg0) } @@ -1234,7 +1240,7 @@ func (m *MockEngineInterface) SetMaxIdleConns(arg0 int) { } // SetMaxIdleConns indicates an expected call of SetMaxIdleConns. -func (mr *MockEngineInterfaceMockRecorder) SetMaxIdleConns(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetMaxIdleConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxIdleConns", reflect.TypeOf((*MockEngineInterface)(nil).SetMaxIdleConns), arg0) } @@ -1246,7 +1252,7 @@ func (m *MockEngineInterface) SetMaxOpenConns(arg0 int) { } // SetMaxOpenConns indicates an expected call of SetMaxOpenConns. -func (mr *MockEngineInterfaceMockRecorder) SetMaxOpenConns(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetMaxOpenConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxOpenConns", reflect.TypeOf((*MockEngineInterface)(nil).SetMaxOpenConns), arg0) } @@ -1258,7 +1264,7 @@ func (m *MockEngineInterface) SetQuotePolicy(arg0 dialects.QuotePolicy) { } // SetQuotePolicy indicates an expected call of SetQuotePolicy. -func (mr *MockEngineInterfaceMockRecorder) SetQuotePolicy(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetQuotePolicy(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQuotePolicy", reflect.TypeOf((*MockEngineInterface)(nil).SetQuotePolicy), arg0) } @@ -1270,33 +1276,33 @@ func (m *MockEngineInterface) SetSchema(arg0 string) { } // SetSchema indicates an expected call of SetSchema. -func (mr *MockEngineInterfaceMockRecorder) SetSchema(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetSchema(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSchema", reflect.TypeOf((*MockEngineInterface)(nil).SetSchema), arg0) } // SetTZDatabase mocks base method. -func (m *MockEngineInterface) SetTZDatabase(arg0 *time.Location) { +func (m *MockEngineInterface) SetTZDatabase(tz *time.Location) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetTZDatabase", arg0) + m.ctrl.Call(m, "SetTZDatabase", tz) } // SetTZDatabase indicates an expected call of SetTZDatabase. -func (mr *MockEngineInterfaceMockRecorder) SetTZDatabase(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetTZDatabase(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZDatabase", reflect.TypeOf((*MockEngineInterface)(nil).SetTZDatabase), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZDatabase", reflect.TypeOf((*MockEngineInterface)(nil).SetTZDatabase), tz) } // SetTZLocation mocks base method. -func (m *MockEngineInterface) SetTZLocation(arg0 *time.Location) { +func (m *MockEngineInterface) SetTZLocation(tz *time.Location) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetTZLocation", arg0) + m.ctrl.Call(m, "SetTZLocation", tz) } // SetTZLocation indicates an expected call of SetTZLocation. -func (mr *MockEngineInterfaceMockRecorder) SetTZLocation(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetTZLocation(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZLocation", reflect.TypeOf((*MockEngineInterface)(nil).SetTZLocation), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZLocation", reflect.TypeOf((*MockEngineInterface)(nil).SetTZLocation), tz) } // SetTableMapper mocks base method. @@ -1306,7 +1312,7 @@ func (m *MockEngineInterface) SetTableMapper(arg0 names.Mapper) { } // SetTableMapper indicates an expected call of SetTableMapper. -func (mr *MockEngineInterfaceMockRecorder) SetTableMapper(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetTableMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTableMapper", reflect.TypeOf((*MockEngineInterface)(nil).SetTableMapper), arg0) } @@ -1318,76 +1324,76 @@ func (m *MockEngineInterface) SetTagIdentifier(arg0 string) { } // SetTagIdentifier indicates an expected call of SetTagIdentifier. -func (mr *MockEngineInterfaceMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SetTagIdentifier(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTagIdentifier", reflect.TypeOf((*MockEngineInterface)(nil).SetTagIdentifier), arg0) } // ShowSQL mocks base method. -func (m *MockEngineInterface) ShowSQL(arg0 ...bool) { +func (m *MockEngineInterface) ShowSQL(show ...bool) { m.ctrl.T.Helper() - varargs := []interface{}{} - for _, a := range arg0 { + varargs := []any{} + for _, a := range show { varargs = append(varargs, a) } m.ctrl.Call(m, "ShowSQL", varargs...) } // ShowSQL indicates an expected call of ShowSQL. -func (mr *MockEngineInterfaceMockRecorder) ShowSQL(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) ShowSQL(show ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowSQL", reflect.TypeOf((*MockEngineInterface)(nil).ShowSQL), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowSQL", reflect.TypeOf((*MockEngineInterface)(nil).ShowSQL), show...) } // StoreEngine mocks base method. -func (m *MockEngineInterface) StoreEngine(arg0 string) *xorm.Session { +func (m *MockEngineInterface) StoreEngine(storeEngine string) *xorm.Session { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StoreEngine", arg0) + ret := m.ctrl.Call(m, "StoreEngine", storeEngine) ret0, _ := ret[0].(*xorm.Session) return ret0 } // StoreEngine indicates an expected call of StoreEngine. -func (mr *MockEngineInterfaceMockRecorder) StoreEngine(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) StoreEngine(storeEngine any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreEngine", reflect.TypeOf((*MockEngineInterface)(nil).StoreEngine), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreEngine", reflect.TypeOf((*MockEngineInterface)(nil).StoreEngine), storeEngine) } // Sum mocks base method. -func (m *MockEngineInterface) Sum(arg0 interface{}, arg1 string) (float64, error) { +func (m *MockEngineInterface) Sum(bean any, colName string) (float64, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Sum", arg0, arg1) + ret := m.ctrl.Call(m, "Sum", bean, colName) ret0, _ := ret[0].(float64) ret1, _ := ret[1].(error) return ret0, ret1 } // Sum indicates an expected call of Sum. -func (mr *MockEngineInterfaceMockRecorder) Sum(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Sum(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockEngineInterface)(nil).Sum), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockEngineInterface)(nil).Sum), bean, colName) } // SumInt mocks base method. -func (m *MockEngineInterface) SumInt(arg0 interface{}, arg1 string) (int64, error) { +func (m *MockEngineInterface) SumInt(bean any, colName string) (int64, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SumInt", arg0, arg1) + ret := m.ctrl.Call(m, "SumInt", bean, colName) ret0, _ := ret[0].(int64) ret1, _ := ret[1].(error) return ret0, ret1 } // SumInt indicates an expected call of SumInt. -func (mr *MockEngineInterfaceMockRecorder) SumInt(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SumInt(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumInt", reflect.TypeOf((*MockEngineInterface)(nil).SumInt), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumInt", reflect.TypeOf((*MockEngineInterface)(nil).SumInt), bean, colName) } // Sums mocks base method. -func (m *MockEngineInterface) Sums(arg0 interface{}, arg1 ...string) ([]float64, error) { +func (m *MockEngineInterface) Sums(bean any, colNames ...string) ([]float64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{bean} + for _, a := range colNames { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Sums", varargs...) @@ -1397,17 +1403,17 @@ func (m *MockEngineInterface) Sums(arg0 interface{}, arg1 ...string) ([]float64, } // Sums indicates an expected call of Sums. -func (mr *MockEngineInterfaceMockRecorder) Sums(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Sums(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sums", reflect.TypeOf((*MockEngineInterface)(nil).Sums), varargs...) } // SumsInt mocks base method. -func (m *MockEngineInterface) SumsInt(arg0 interface{}, arg1 ...string) ([]int64, error) { +func (m *MockEngineInterface) SumsInt(bean any, colNames ...string) ([]int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{bean} + for _, a := range colNames { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "SumsInt", varargs...) @@ -1417,16 +1423,16 @@ func (m *MockEngineInterface) SumsInt(arg0 interface{}, arg1 ...string) ([]int64 } // SumsInt indicates an expected call of SumsInt. -func (mr *MockEngineInterfaceMockRecorder) SumsInt(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) SumsInt(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumsInt", reflect.TypeOf((*MockEngineInterface)(nil).SumsInt), varargs...) } // Sync mocks base method. -func (m *MockEngineInterface) Sync(arg0 ...interface{}) error { +func (m *MockEngineInterface) Sync(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1436,15 +1442,15 @@ func (m *MockEngineInterface) Sync(arg0 ...interface{}) error { } // Sync indicates an expected call of Sync. -func (mr *MockEngineInterfaceMockRecorder) Sync(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Sync(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockEngineInterface)(nil).Sync), arg0...) } // Sync2 mocks base method. -func (m *MockEngineInterface) Sync2(arg0 ...interface{}) error { +func (m *MockEngineInterface) Sync2(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1454,44 +1460,44 @@ func (m *MockEngineInterface) Sync2(arg0 ...interface{}) error { } // Sync2 indicates an expected call of Sync2. -func (mr *MockEngineInterfaceMockRecorder) Sync2(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Sync2(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync2", reflect.TypeOf((*MockEngineInterface)(nil).Sync2), arg0...) } // Table mocks base method. -func (m *MockEngineInterface) Table(arg0 interface{}) *xorm.Session { +func (m *MockEngineInterface) Table(tableNameOrBean any) *xorm.Session { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Table", arg0) + ret := m.ctrl.Call(m, "Table", tableNameOrBean) ret0, _ := ret[0].(*xorm.Session) return ret0 } // Table indicates an expected call of Table. -func (mr *MockEngineInterfaceMockRecorder) Table(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Table(tableNameOrBean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Table", reflect.TypeOf((*MockEngineInterface)(nil).Table), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Table", reflect.TypeOf((*MockEngineInterface)(nil).Table), tableNameOrBean) } // TableInfo mocks base method. -func (m *MockEngineInterface) TableInfo(arg0 interface{}) (*schemas.Table, error) { +func (m *MockEngineInterface) TableInfo(bean any) (*schemas.Table, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TableInfo", arg0) + ret := m.ctrl.Call(m, "TableInfo", bean) ret0, _ := ret[0].(*schemas.Table) ret1, _ := ret[1].(error) return ret0, ret1 } // TableInfo indicates an expected call of TableInfo. -func (mr *MockEngineInterfaceMockRecorder) TableInfo(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) TableInfo(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableInfo", reflect.TypeOf((*MockEngineInterface)(nil).TableInfo), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableInfo", reflect.TypeOf((*MockEngineInterface)(nil).TableInfo), bean) } // TableName mocks base method. -func (m *MockEngineInterface) TableName(arg0 interface{}, arg1 ...bool) string { +func (m *MockEngineInterface) TableName(arg0 any, arg1 ...bool) string { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -1501,9 +1507,9 @@ func (m *MockEngineInterface) TableName(arg0 interface{}, arg1 ...bool) string { } // TableName indicates an expected call of TableName. -func (mr *MockEngineInterfaceMockRecorder) TableName(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) TableName(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableName", reflect.TypeOf((*MockEngineInterface)(nil).TableName), varargs...) } @@ -1514,7 +1520,7 @@ func (m *MockEngineInterface) UnMapType(arg0 reflect.Type) { } // UnMapType indicates an expected call of UnMapType. -func (mr *MockEngineInterfaceMockRecorder) UnMapType(arg0 interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) UnMapType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnMapType", reflect.TypeOf((*MockEngineInterface)(nil).UnMapType), arg0) } @@ -1534,10 +1540,10 @@ func (mr *MockEngineInterfaceMockRecorder) Unscoped() *gomock.Call { } // Update mocks base method. -func (m *MockEngineInterface) Update(arg0 interface{}, arg1 ...interface{}) (int64, error) { +func (m *MockEngineInterface) Update(bean any, condiBeans ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{bean} + for _, a := range condiBeans { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Update", varargs...) @@ -1547,16 +1553,16 @@ func (m *MockEngineInterface) Update(arg0 interface{}, arg1 ...interface{}) (int } // Update indicates an expected call of Update. -func (mr *MockEngineInterfaceMockRecorder) Update(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Update(bean any, condiBeans ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{bean}, condiBeans...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockEngineInterface)(nil).Update), varargs...) } // UseBool mocks base method. func (m *MockEngineInterface) UseBool(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1566,15 +1572,15 @@ func (m *MockEngineInterface) UseBool(arg0 ...string) *xorm.Session { } // UseBool indicates an expected call of UseBool. -func (mr *MockEngineInterfaceMockRecorder) UseBool(arg0 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) UseBool(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseBool", reflect.TypeOf((*MockEngineInterface)(nil).UseBool), arg0...) } // Where mocks base method. -func (m *MockEngineInterface) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockEngineInterface) Where(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -1584,8 +1590,8 @@ func (m *MockEngineInterface) Where(arg0 interface{}, arg1 ...interface{}) *xorm } // Where indicates an expected call of Where. -func (mr *MockEngineInterfaceMockRecorder) Where(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockEngineInterfaceMockRecorder) Where(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Where", reflect.TypeOf((*MockEngineInterface)(nil).Where), varargs...) } diff --git a/goner/xorm/implement.go b/goner/xorm/implement.go index 7c97af8..0332aa5 100644 --- a/goner/xorm/implement.go +++ b/goner/xorm/implement.go @@ -16,7 +16,7 @@ func newEngine(driverName string, dataSourceName string) (xorm.EngineInterface, return xorm.NewEngine(driverName, dataSourceName) } -//go:generate mockgen -package xorm xorm.io/xorm EngineInterface > ./engine_mock_test.go +//go:generate mockgen -package xorm -destination=./engine_mock_test.go xorm.io/xorm EngineInterface type engine struct { gone.Flag xorm.EngineInterface diff --git a/goner/xorm/implement_test.go b/goner/xorm/implement_test.go index 1384c59..a440601 100644 --- a/goner/xorm/implement_test.go +++ b/goner/xorm/implement_test.go @@ -2,11 +2,11 @@ package xorm import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" "xorm.io/xorm" ) diff --git a/goner/xorm/session_mock_test.go b/goner/xorm/session_mock_test.go index fec0cd1..e694871 100644 --- a/goner/xorm/session_mock_test.go +++ b/goner/xorm/session_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: transaction.go +// +// Generated by this command: +// +// mockgen -package xorm -destination=./session_mock_test.go -source transaction.go XInterface +// // Package xorm is a generated GoMock package. package xorm @@ -8,7 +13,7 @@ import ( sql "database/sql" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" xorm "xorm.io/xorm" ) @@ -16,6 +21,7 @@ import ( type MockXInterface struct { ctrl *gomock.Controller recorder *MockXInterfaceMockRecorder + isgomock struct{} } // MockXInterfaceMockRecorder is the mock recorder for MockXInterface. @@ -44,7 +50,7 @@ func (m *MockXInterface) Alias(alias string) *xorm.Session { } // Alias indicates an expected call of Alias. -func (mr *MockXInterfaceMockRecorder) Alias(alias interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Alias(alias any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Alias", reflect.TypeOf((*MockXInterface)(nil).Alias), alias) } @@ -66,7 +72,7 @@ func (mr *MockXInterfaceMockRecorder) AllCols() *gomock.Call { // Asc mocks base method. func (m *MockXInterface) Asc(colNames ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range colNames { varargs = append(varargs, a) } @@ -76,7 +82,7 @@ func (m *MockXInterface) Asc(colNames ...string) *xorm.Session { } // Asc indicates an expected call of Asc. -func (mr *MockXInterfaceMockRecorder) Asc(colNames ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Asc(colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Asc", reflect.TypeOf((*MockXInterface)(nil).Asc), colNames...) } @@ -104,7 +110,7 @@ func (m *MockXInterface) BufferSize(size int) *xorm.Session { } // BufferSize indicates an expected call of BufferSize. -func (mr *MockXInterfaceMockRecorder) BufferSize(size interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) BufferSize(size any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BufferSize", reflect.TypeOf((*MockXInterface)(nil).BufferSize), size) } @@ -126,7 +132,7 @@ func (mr *MockXInterfaceMockRecorder) Close() *gomock.Call { // Cols mocks base method. func (m *MockXInterface) Cols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -136,7 +142,7 @@ func (m *MockXInterface) Cols(columns ...string) *xorm.Session { } // Cols indicates an expected call of Cols. -func (mr *MockXInterfaceMockRecorder) Cols(columns ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Cols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cols", reflect.TypeOf((*MockXInterface)(nil).Cols), columns...) } @@ -156,9 +162,9 @@ func (mr *MockXInterfaceMockRecorder) Commit() *gomock.Call { } // Count mocks base method. -func (m *MockXInterface) Count(arg0 ...interface{}) (int64, error) { +func (m *MockXInterface) Count(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -169,13 +175,13 @@ func (m *MockXInterface) Count(arg0 ...interface{}) (int64, error) { } // Count indicates an expected call of Count. -func (mr *MockXInterfaceMockRecorder) Count(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Count(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Count", reflect.TypeOf((*MockXInterface)(nil).Count), arg0...) } // CreateIndexes mocks base method. -func (m *MockXInterface) CreateIndexes(bean interface{}) error { +func (m *MockXInterface) CreateIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateIndexes", bean) ret0, _ := ret[0].(error) @@ -183,13 +189,13 @@ func (m *MockXInterface) CreateIndexes(bean interface{}) error { } // CreateIndexes indicates an expected call of CreateIndexes. -func (mr *MockXInterfaceMockRecorder) CreateIndexes(bean interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) CreateIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateIndexes", reflect.TypeOf((*MockXInterface)(nil).CreateIndexes), bean) } // CreateUniques mocks base method. -func (m *MockXInterface) CreateUniques(bean interface{}) error { +func (m *MockXInterface) CreateUniques(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateUniques", bean) ret0, _ := ret[0].(error) @@ -197,15 +203,15 @@ func (m *MockXInterface) CreateUniques(bean interface{}) error { } // CreateUniques indicates an expected call of CreateUniques. -func (mr *MockXInterfaceMockRecorder) CreateUniques(bean interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) CreateUniques(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUniques", reflect.TypeOf((*MockXInterface)(nil).CreateUniques), bean) } // Decr mocks base method. -func (m *MockXInterface) Decr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXInterface) Decr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -215,16 +221,16 @@ func (m *MockXInterface) Decr(column string, arg ...interface{}) *xorm.Session { } // Decr indicates an expected call of Decr. -func (mr *MockXInterfaceMockRecorder) Decr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Decr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockXInterface)(nil).Decr), varargs...) } // Delete mocks base method. -func (m *MockXInterface) Delete(arg0 ...interface{}) (int64, error) { +func (m *MockXInterface) Delete(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -235,7 +241,7 @@ func (m *MockXInterface) Delete(arg0 ...interface{}) (int64, error) { } // Delete indicates an expected call of Delete. -func (mr *MockXInterfaceMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Delete(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockXInterface)(nil).Delete), arg0...) } @@ -243,7 +249,7 @@ func (mr *MockXInterfaceMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { // Desc mocks base method. func (m *MockXInterface) Desc(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -253,7 +259,7 @@ func (m *MockXInterface) Desc(arg0 ...string) *xorm.Session { } // Desc indicates an expected call of Desc. -func (mr *MockXInterfaceMockRecorder) Desc(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Desc(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Desc", reflect.TypeOf((*MockXInterface)(nil).Desc), arg0...) } @@ -261,7 +267,7 @@ func (mr *MockXInterfaceMockRecorder) Desc(arg0 ...interface{}) *gomock.Call { // Distinct mocks base method. func (m *MockXInterface) Distinct(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -271,13 +277,13 @@ func (m *MockXInterface) Distinct(columns ...string) *xorm.Session { } // Distinct indicates an expected call of Distinct. -func (mr *MockXInterfaceMockRecorder) Distinct(columns ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Distinct(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Distinct", reflect.TypeOf((*MockXInterface)(nil).Distinct), columns...) } // DropIndexes mocks base method. -func (m *MockXInterface) DropIndexes(bean interface{}) error { +func (m *MockXInterface) DropIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DropIndexes", bean) ret0, _ := ret[0].(error) @@ -285,15 +291,15 @@ func (m *MockXInterface) DropIndexes(bean interface{}) error { } // DropIndexes indicates an expected call of DropIndexes. -func (mr *MockXInterfaceMockRecorder) DropIndexes(bean interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) DropIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropIndexes", reflect.TypeOf((*MockXInterface)(nil).DropIndexes), bean) } // Exec mocks base method. -func (m *MockXInterface) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { +func (m *MockXInterface) Exec(sqlOrArgs ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -304,15 +310,15 @@ func (m *MockXInterface) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockXInterfaceMockRecorder) Exec(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Exec(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockXInterface)(nil).Exec), sqlOrArgs...) } // Exist mocks base method. -func (m *MockXInterface) Exist(bean ...interface{}) (bool, error) { +func (m *MockXInterface) Exist(bean ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range bean { varargs = append(varargs, a) } @@ -323,15 +329,15 @@ func (m *MockXInterface) Exist(bean ...interface{}) (bool, error) { } // Exist indicates an expected call of Exist. -func (mr *MockXInterfaceMockRecorder) Exist(bean ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Exist(bean ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exist", reflect.TypeOf((*MockXInterface)(nil).Exist), bean...) } // Find mocks base method. -func (m *MockXInterface) Find(arg0 interface{}, arg1 ...interface{}) error { +func (m *MockXInterface) Find(arg0 any, arg1 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -341,16 +347,16 @@ func (m *MockXInterface) Find(arg0 interface{}, arg1 ...interface{}) error { } // Find indicates an expected call of Find. -func (mr *MockXInterfaceMockRecorder) Find(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Find(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockXInterface)(nil).Find), varargs...) } // FindAndCount mocks base method. -func (m *MockXInterface) FindAndCount(arg0 interface{}, arg1 ...interface{}) (int64, error) { +func (m *MockXInterface) FindAndCount(arg0 any, arg1 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -361,16 +367,16 @@ func (m *MockXInterface) FindAndCount(arg0 interface{}, arg1 ...interface{}) (in } // FindAndCount indicates an expected call of FindAndCount. -func (mr *MockXInterfaceMockRecorder) FindAndCount(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) FindAndCount(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindAndCount", reflect.TypeOf((*MockXInterface)(nil).FindAndCount), varargs...) } // Get mocks base method. -func (m *MockXInterface) Get(arg0 ...interface{}) (bool, error) { +func (m *MockXInterface) Get(arg0 ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -381,7 +387,7 @@ func (m *MockXInterface) Get(arg0 ...interface{}) (bool, error) { } // Get indicates an expected call of Get. -func (mr *MockXInterfaceMockRecorder) Get(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Get(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockXInterface)(nil).Get), arg0...) } @@ -395,13 +401,13 @@ func (m *MockXInterface) GroupBy(keys string) *xorm.Session { } // GroupBy indicates an expected call of GroupBy. -func (mr *MockXInterfaceMockRecorder) GroupBy(keys interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) GroupBy(keys any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupBy", reflect.TypeOf((*MockXInterface)(nil).GroupBy), keys) } // ID mocks base method. -func (m *MockXInterface) ID(arg0 interface{}) *xorm.Session { +func (m *MockXInterface) ID(arg0 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -409,15 +415,15 @@ func (m *MockXInterface) ID(arg0 interface{}) *xorm.Session { } // ID indicates an expected call of ID. -func (mr *MockXInterfaceMockRecorder) ID(arg0 interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) ID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockXInterface)(nil).ID), arg0) } // In mocks base method. -func (m *MockXInterface) In(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXInterface) In(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -427,16 +433,16 @@ func (m *MockXInterface) In(arg0 string, arg1 ...interface{}) *xorm.Session { } // In indicates an expected call of In. -func (mr *MockXInterfaceMockRecorder) In(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) In(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "In", reflect.TypeOf((*MockXInterface)(nil).In), varargs...) } // Incr mocks base method. -func (m *MockXInterface) Incr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXInterface) Incr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -446,16 +452,16 @@ func (m *MockXInterface) Incr(column string, arg ...interface{}) *xorm.Session { } // Incr indicates an expected call of Incr. -func (mr *MockXInterfaceMockRecorder) Incr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Incr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockXInterface)(nil).Incr), varargs...) } // Insert mocks base method. -func (m *MockXInterface) Insert(arg0 ...interface{}) (int64, error) { +func (m *MockXInterface) Insert(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -466,13 +472,13 @@ func (m *MockXInterface) Insert(arg0 ...interface{}) (int64, error) { } // Insert indicates an expected call of Insert. -func (mr *MockXInterfaceMockRecorder) Insert(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Insert(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockXInterface)(nil).Insert), arg0...) } // InsertOne mocks base method. -func (m *MockXInterface) InsertOne(arg0 interface{}) (int64, error) { +func (m *MockXInterface) InsertOne(arg0 any) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertOne", arg0) ret0, _ := ret[0].(int64) @@ -481,13 +487,13 @@ func (m *MockXInterface) InsertOne(arg0 interface{}) (int64, error) { } // InsertOne indicates an expected call of InsertOne. -func (mr *MockXInterfaceMockRecorder) InsertOne(arg0 interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) InsertOne(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertOne", reflect.TypeOf((*MockXInterface)(nil).InsertOne), arg0) } // IsTableEmpty mocks base method. -func (m *MockXInterface) IsTableEmpty(bean interface{}) (bool, error) { +func (m *MockXInterface) IsTableEmpty(bean any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableEmpty", bean) ret0, _ := ret[0].(bool) @@ -496,13 +502,13 @@ func (m *MockXInterface) IsTableEmpty(bean interface{}) (bool, error) { } // IsTableEmpty indicates an expected call of IsTableEmpty. -func (mr *MockXInterfaceMockRecorder) IsTableEmpty(bean interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) IsTableEmpty(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableEmpty", reflect.TypeOf((*MockXInterface)(nil).IsTableEmpty), bean) } // IsTableExist mocks base method. -func (m *MockXInterface) IsTableExist(beanOrTableName interface{}) (bool, error) { +func (m *MockXInterface) IsTableExist(beanOrTableName any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableExist", beanOrTableName) ret0, _ := ret[0].(bool) @@ -511,13 +517,13 @@ func (m *MockXInterface) IsTableExist(beanOrTableName interface{}) (bool, error) } // IsTableExist indicates an expected call of IsTableExist. -func (mr *MockXInterfaceMockRecorder) IsTableExist(beanOrTableName interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) IsTableExist(beanOrTableName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableExist", reflect.TypeOf((*MockXInterface)(nil).IsTableExist), beanOrTableName) } // Iterate mocks base method. -func (m *MockXInterface) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { +func (m *MockXInterface) Iterate(arg0 any, arg1 xorm.IterFunc) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -525,15 +531,15 @@ func (m *MockXInterface) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { } // Iterate indicates an expected call of Iterate. -func (mr *MockXInterfaceMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Iterate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockXInterface)(nil).Iterate), arg0, arg1) } // Join mocks base method. -func (m *MockXInterface) Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *xorm.Session { +func (m *MockXInterface) Join(joinOperator string, tablename any, condition string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{joinOperator, tablename, condition} + varargs := []any{joinOperator, tablename, condition} for _, a := range args { varargs = append(varargs, a) } @@ -543,16 +549,16 @@ func (m *MockXInterface) Join(joinOperator string, tablename interface{}, condit } // Join indicates an expected call of Join. -func (mr *MockXInterfaceMockRecorder) Join(joinOperator, tablename, condition interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Join(joinOperator, tablename, condition any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{joinOperator, tablename, condition}, args...) + varargs := append([]any{joinOperator, tablename, condition}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Join", reflect.TypeOf((*MockXInterface)(nil).Join), varargs...) } // Limit mocks base method. func (m *MockXInterface) Limit(arg0 int, arg1 ...int) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -562,16 +568,16 @@ func (m *MockXInterface) Limit(arg0 int, arg1 ...int) *xorm.Session { } // Limit indicates an expected call of Limit. -func (mr *MockXInterfaceMockRecorder) Limit(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Limit(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Limit", reflect.TypeOf((*MockXInterface)(nil).Limit), varargs...) } // MustCols mocks base method. func (m *MockXInterface) MustCols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -581,7 +587,7 @@ func (m *MockXInterface) MustCols(columns ...string) *xorm.Session { } // MustCols indicates an expected call of MustCols. -func (mr *MockXInterfaceMockRecorder) MustCols(columns ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) MustCols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MustCols", reflect.TypeOf((*MockXInterface)(nil).MustCols), columns...) } @@ -589,7 +595,7 @@ func (mr *MockXInterfaceMockRecorder) MustCols(columns ...interface{}) *gomock.C // NoAutoCondition mocks base method. func (m *MockXInterface) NoAutoCondition(arg0 ...bool) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -599,15 +605,15 @@ func (m *MockXInterface) NoAutoCondition(arg0 ...bool) *xorm.Session { } // NoAutoCondition indicates an expected call of NoAutoCondition. -func (mr *MockXInterfaceMockRecorder) NoAutoCondition(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) NoAutoCondition(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NoAutoCondition", reflect.TypeOf((*MockXInterface)(nil).NoAutoCondition), arg0...) } // NotIn mocks base method. -func (m *MockXInterface) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXInterface) NotIn(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -617,16 +623,16 @@ func (m *MockXInterface) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { } // NotIn indicates an expected call of NotIn. -func (mr *MockXInterfaceMockRecorder) NotIn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) NotIn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotIn", reflect.TypeOf((*MockXInterface)(nil).NotIn), varargs...) } // Nullable mocks base method. func (m *MockXInterface) Nullable(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -636,7 +642,7 @@ func (m *MockXInterface) Nullable(arg0 ...string) *xorm.Session { } // Nullable indicates an expected call of Nullable. -func (mr *MockXInterfaceMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Nullable(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Nullable", reflect.TypeOf((*MockXInterface)(nil).Nullable), arg0...) } @@ -644,7 +650,7 @@ func (mr *MockXInterfaceMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call // Omit mocks base method. func (m *MockXInterface) Omit(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -654,15 +660,15 @@ func (m *MockXInterface) Omit(columns ...string) *xorm.Session { } // Omit indicates an expected call of Omit. -func (mr *MockXInterfaceMockRecorder) Omit(columns ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Omit(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Omit", reflect.TypeOf((*MockXInterface)(nil).Omit), columns...) } // OrderBy mocks base method. -func (m *MockXInterface) OrderBy(order interface{}, args ...interface{}) *xorm.Session { +func (m *MockXInterface) OrderBy(order any, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{order} + varargs := []any{order} for _, a := range args { varargs = append(varargs, a) } @@ -672,9 +678,9 @@ func (m *MockXInterface) OrderBy(order interface{}, args ...interface{}) *xorm.S } // OrderBy indicates an expected call of OrderBy. -func (mr *MockXInterfaceMockRecorder) OrderBy(order interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) OrderBy(order any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{order}, args...) + varargs := append([]any{order}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OrderBy", reflect.TypeOf((*MockXInterface)(nil).OrderBy), varargs...) } @@ -693,9 +699,9 @@ func (mr *MockXInterfaceMockRecorder) Ping() *gomock.Call { } // Query mocks base method. -func (m *MockXInterface) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) { +func (m *MockXInterface) Query(sqlOrArgs ...any) ([]map[string][]byte, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -706,34 +712,34 @@ func (m *MockXInterface) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, e } // Query indicates an expected call of Query. -func (mr *MockXInterfaceMockRecorder) Query(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Query(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockXInterface)(nil).Query), sqlOrArgs...) } // QueryInterface mocks base method. -func (m *MockXInterface) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) { +func (m *MockXInterface) QueryInterface(sqlOrArgs ...any) ([]map[string]any, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryInterface", varargs...) - ret0, _ := ret[0].([]map[string]interface{}) + ret0, _ := ret[0].([]map[string]any) ret1, _ := ret[1].(error) return ret0, ret1 } // QueryInterface indicates an expected call of QueryInterface. -func (mr *MockXInterfaceMockRecorder) QueryInterface(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) QueryInterface(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryInterface", reflect.TypeOf((*MockXInterface)(nil).QueryInterface), sqlOrArgs...) } // QueryString mocks base method. -func (m *MockXInterface) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) { +func (m *MockXInterface) QueryString(sqlOrArgs ...any) ([]map[string]string, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -744,7 +750,7 @@ func (m *MockXInterface) QueryString(sqlOrArgs ...interface{}) ([]map[string]str } // QueryString indicates an expected call of QueryString. -func (mr *MockXInterfaceMockRecorder) QueryString(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) QueryString(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryString", reflect.TypeOf((*MockXInterface)(nil).QueryString), sqlOrArgs...) } @@ -764,7 +770,7 @@ func (mr *MockXInterfaceMockRecorder) Rollback() *gomock.Call { } // Rows mocks base method. -func (m *MockXInterface) Rows(bean interface{}) (*xorm.Rows, error) { +func (m *MockXInterface) Rows(bean any) (*xorm.Rows, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Rows", bean) ret0, _ := ret[0].(*xorm.Rows) @@ -773,15 +779,15 @@ func (m *MockXInterface) Rows(bean interface{}) (*xorm.Rows, error) { } // Rows indicates an expected call of Rows. -func (mr *MockXInterfaceMockRecorder) Rows(bean interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Rows(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rows", reflect.TypeOf((*MockXInterface)(nil).Rows), bean) } // SQL mocks base method. -func (m *MockXInterface) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXInterface) SQL(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -791,9 +797,9 @@ func (m *MockXInterface) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Sessio } // SQL indicates an expected call of SQL. -func (mr *MockXInterfaceMockRecorder) SQL(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) SQL(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SQL", reflect.TypeOf((*MockXInterface)(nil).SQL), varargs...) } @@ -806,13 +812,13 @@ func (m *MockXInterface) Select(arg0 string) *xorm.Session { } // Select indicates an expected call of Select. -func (mr *MockXInterfaceMockRecorder) Select(arg0 interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Select(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Select", reflect.TypeOf((*MockXInterface)(nil).Select), arg0) } // SetExpr mocks base method. -func (m *MockXInterface) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { +func (m *MockXInterface) SetExpr(arg0 string, arg1 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetExpr", arg0, arg1) ret0, _ := ret[0].(*xorm.Session) @@ -820,13 +826,13 @@ func (m *MockXInterface) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { } // SetExpr indicates an expected call of SetExpr. -func (mr *MockXInterfaceMockRecorder) SetExpr(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) SetExpr(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExpr", reflect.TypeOf((*MockXInterface)(nil).SetExpr), arg0, arg1) } // Sum mocks base method. -func (m *MockXInterface) Sum(bean interface{}, colName string) (float64, error) { +func (m *MockXInterface) Sum(bean any, colName string) (float64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sum", bean, colName) ret0, _ := ret[0].(float64) @@ -835,13 +841,13 @@ func (m *MockXInterface) Sum(bean interface{}, colName string) (float64, error) } // Sum indicates an expected call of Sum. -func (mr *MockXInterfaceMockRecorder) Sum(bean, colName interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Sum(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockXInterface)(nil).Sum), bean, colName) } // SumInt mocks base method. -func (m *MockXInterface) SumInt(bean interface{}, colName string) (int64, error) { +func (m *MockXInterface) SumInt(bean any, colName string) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SumInt", bean, colName) ret0, _ := ret[0].(int64) @@ -850,15 +856,15 @@ func (m *MockXInterface) SumInt(bean interface{}, colName string) (int64, error) } // SumInt indicates an expected call of SumInt. -func (mr *MockXInterfaceMockRecorder) SumInt(bean, colName interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) SumInt(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumInt", reflect.TypeOf((*MockXInterface)(nil).SumInt), bean, colName) } // Sums mocks base method. -func (m *MockXInterface) Sums(bean interface{}, colNames ...string) ([]float64, error) { +func (m *MockXInterface) Sums(bean any, colNames ...string) ([]float64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -869,16 +875,16 @@ func (m *MockXInterface) Sums(bean interface{}, colNames ...string) ([]float64, } // Sums indicates an expected call of Sums. -func (mr *MockXInterfaceMockRecorder) Sums(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Sums(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sums", reflect.TypeOf((*MockXInterface)(nil).Sums), varargs...) } // SumsInt mocks base method. -func (m *MockXInterface) SumsInt(bean interface{}, colNames ...string) ([]int64, error) { +func (m *MockXInterface) SumsInt(bean any, colNames ...string) ([]int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -889,14 +895,14 @@ func (m *MockXInterface) SumsInt(bean interface{}, colNames ...string) ([]int64, } // SumsInt indicates an expected call of SumsInt. -func (mr *MockXInterfaceMockRecorder) SumsInt(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) SumsInt(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumsInt", reflect.TypeOf((*MockXInterface)(nil).SumsInt), varargs...) } // Table mocks base method. -func (m *MockXInterface) Table(tableNameOrBean interface{}) *xorm.Session { +func (m *MockXInterface) Table(tableNameOrBean any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Table", tableNameOrBean) ret0, _ := ret[0].(*xorm.Session) @@ -904,7 +910,7 @@ func (m *MockXInterface) Table(tableNameOrBean interface{}) *xorm.Session { } // Table indicates an expected call of Table. -func (mr *MockXInterfaceMockRecorder) Table(tableNameOrBean interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Table(tableNameOrBean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Table", reflect.TypeOf((*MockXInterface)(nil).Table), tableNameOrBean) } @@ -924,9 +930,9 @@ func (mr *MockXInterfaceMockRecorder) Unscoped() *gomock.Call { } // Update mocks base method. -func (m *MockXInterface) Update(bean interface{}, condiBeans ...interface{}) (int64, error) { +func (m *MockXInterface) Update(bean any, condiBeans ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range condiBeans { varargs = append(varargs, a) } @@ -937,16 +943,16 @@ func (m *MockXInterface) Update(bean interface{}, condiBeans ...interface{}) (in } // Update indicates an expected call of Update. -func (mr *MockXInterfaceMockRecorder) Update(bean interface{}, condiBeans ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Update(bean any, condiBeans ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, condiBeans...) + varargs := append([]any{bean}, condiBeans...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockXInterface)(nil).Update), varargs...) } // UseBool mocks base method. func (m *MockXInterface) UseBool(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -956,15 +962,15 @@ func (m *MockXInterface) UseBool(arg0 ...string) *xorm.Session { } // UseBool indicates an expected call of UseBool. -func (mr *MockXInterfaceMockRecorder) UseBool(arg0 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) UseBool(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseBool", reflect.TypeOf((*MockXInterface)(nil).UseBool), arg0...) } // Where mocks base method. -func (m *MockXInterface) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXInterface) Where(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -974,8 +980,8 @@ func (m *MockXInterface) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Sess } // Where indicates an expected call of Where. -func (mr *MockXInterfaceMockRecorder) Where(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXInterfaceMockRecorder) Where(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Where", reflect.TypeOf((*MockXInterface)(nil).Where), varargs...) } diff --git a/goner/xorm/transaction.go b/goner/xorm/transaction.go index 08cf047..0618406 100644 --- a/goner/xorm/transaction.go +++ b/goner/xorm/transaction.go @@ -12,7 +12,7 @@ import ( var sessionMap = sync.Map{} -//go:generate mockgen -package xorm -source transaction.go XInterface > session_mock_test.go +//go:generate mockgen -package xorm -destination=./session_mock_test.go -source transaction.go XInterface type XInterface interface { xorm.Interface driver.Tx diff --git a/goner/xorm/transaction_test.go b/goner/xorm/transaction_test.go index 6336c28..f581090 100644 --- a/goner/xorm/transaction_test.go +++ b/goner/xorm/transaction_test.go @@ -2,11 +2,11 @@ package xorm import ( "errors" - "github.com/golang/mock/gomock" "github.com/gone-io/gone" "github.com/gone-io/gone/goner/config" "github.com/gone-io/gone/goner/logrus" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" "xorm.io/xorm" ) diff --git a/heaven_test.go b/heaven_test.go index fcbe6c9..0c3eb95 100644 --- a/heaven_test.go +++ b/heaven_test.go @@ -2,8 +2,8 @@ package gone import ( "errors" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "testing" ) diff --git a/mock_test.go b/mock_test.go index d717d90..adfe0d2 100644 --- a/mock_test.go +++ b/mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interface.go +// +// Generated by this command: +// +// mockgen -package=gone -self_package=github.com/gone-io/gone -source=interface.go -destination=mock_test.go +// // Package gone is a generated GoMock package. package gone @@ -11,8 +16,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" cmux "github.com/soheilhy/cmux" + gomock "go.uber.org/mock/gomock" xorm "xorm.io/xorm" caches "xorm.io/xorm/caches" contexts "xorm.io/xorm/contexts" @@ -26,6 +31,7 @@ import ( type MockGoner struct { ctrl *gomock.Controller recorder *MockGonerMockRecorder + isgomock struct{} } // MockGonerMockRecorder is the mock recorder for MockGoner. @@ -57,10 +63,47 @@ func (mr *MockGonerMockRecorder) goneFlag() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "goneFlag", reflect.TypeOf((*MockGoner)(nil).goneFlag)) } +// MockGonerOption is a mock of GonerOption interface. +type MockGonerOption struct { + ctrl *gomock.Controller + recorder *MockGonerOptionMockRecorder + isgomock struct{} +} + +// MockGonerOptionMockRecorder is the mock recorder for MockGonerOption. +type MockGonerOptionMockRecorder struct { + mock *MockGonerOption +} + +// NewMockGonerOption creates a new mock instance. +func NewMockGonerOption(ctrl *gomock.Controller) *MockGonerOption { + mock := &MockGonerOption{ctrl: ctrl} + mock.recorder = &MockGonerOptionMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockGonerOption) EXPECT() *MockGonerOptionMockRecorder { + return m.recorder +} + +// option mocks base method. +func (m *MockGonerOption) option() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "option") +} + +// option indicates an expected call of option. +func (mr *MockGonerOptionMockRecorder) option() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "option", reflect.TypeOf((*MockGonerOption)(nil).option)) +} + // Mockidentity is a mock of identity interface. type Mockidentity struct { ctrl *gomock.Controller recorder *MockidentityMockRecorder + isgomock struct{} } // MockidentityMockRecorder is the mock recorder for Mockidentity. @@ -94,45 +137,11 @@ func (mr *MockidentityMockRecorder) GetId() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetId", reflect.TypeOf((*Mockidentity)(nil).GetId)) } -// MockGonerOption is a mock of GonerOption interface. -type MockGonerOption struct { - ctrl *gomock.Controller - recorder *MockGonerOptionMockRecorder -} - -// MockGonerOptionMockRecorder is the mock recorder for MockGonerOption. -type MockGonerOptionMockRecorder struct { - mock *MockGonerOption -} - -// NewMockGonerOption creates a new mock instance. -func NewMockGonerOption(ctrl *gomock.Controller) *MockGonerOption { - mock := &MockGonerOption{ctrl: ctrl} - mock.recorder = &MockGonerOptionMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockGonerOption) EXPECT() *MockGonerOptionMockRecorder { - return m.recorder -} - -// option mocks base method. -func (m *MockGonerOption) option() { - m.ctrl.T.Helper() - m.ctrl.Call(m, "option") -} - -// option indicates an expected call of option. -func (mr *MockGonerOptionMockRecorder) option() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "option", reflect.TypeOf((*MockGonerOption)(nil).option)) -} - // MockTomb is a mock of Tomb interface. type MockTomb struct { ctrl *gomock.Controller recorder *MockTombMockRecorder + isgomock struct{} } // MockTombMockRecorder is the mock recorder for MockTomb. @@ -197,7 +206,7 @@ func (mr *MockTombMockRecorder) GetOrder() *gomock.Call { // GonerIsRevive mocks base method. func (m *MockTomb) GonerIsRevive(flags ...bool) bool { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range flags { varargs = append(varargs, a) } @@ -207,37 +216,37 @@ func (m *MockTomb) GonerIsRevive(flags ...bool) bool { } // GonerIsRevive indicates an expected call of GonerIsRevive. -func (mr *MockTombMockRecorder) GonerIsRevive(flags ...interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) GonerIsRevive(flags ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GonerIsRevive", reflect.TypeOf((*MockTomb)(nil).GonerIsRevive), flags...) } // IsDefault mocks base method. -func (m *MockTomb) IsDefault() bool { +func (m *MockTomb) IsDefault(arg0 reflect.Type) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsDefault") + ret := m.ctrl.Call(m, "IsDefault", arg0) ret0, _ := ret[0].(bool) return ret0 } // IsDefault indicates an expected call of IsDefault. -func (mr *MockTombMockRecorder) IsDefault() *gomock.Call { +func (mr *MockTombMockRecorder) IsDefault(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDefault", reflect.TypeOf((*MockTomb)(nil).IsDefault)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDefault", reflect.TypeOf((*MockTomb)(nil).IsDefault), arg0) } // SetDefault mocks base method. -func (m *MockTomb) SetDefault(isDefault bool) Tomb { +func (m *MockTomb) SetDefault(arg0 reflect.Type) Tomb { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetDefault", isDefault) + ret := m.ctrl.Call(m, "SetDefault", arg0) ret0, _ := ret[0].(Tomb) return ret0 } // SetDefault indicates an expected call of SetDefault. -func (mr *MockTombMockRecorder) SetDefault(isDefault interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetDefault(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockTomb)(nil).SetDefault), isDefault) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockTomb)(nil).SetDefault), arg0) } // SetId mocks base method. @@ -249,7 +258,7 @@ func (m *MockTomb) SetId(arg0 GonerId) Tomb { } // SetId indicates an expected call of SetId. -func (mr *MockTombMockRecorder) SetId(arg0 interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetId(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetId", reflect.TypeOf((*MockTomb)(nil).SetId), arg0) } @@ -263,7 +272,7 @@ func (m *MockTomb) SetOrder(order Order) Tomb { } // SetOrder indicates an expected call of SetOrder. -func (mr *MockTombMockRecorder) SetOrder(order interface{}) *gomock.Call { +func (mr *MockTombMockRecorder) SetOrder(order any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOrder", reflect.TypeOf((*MockTomb)(nil).SetOrder), order) } @@ -272,6 +281,7 @@ func (mr *MockTombMockRecorder) SetOrder(order interface{}) *gomock.Call { type MockCemetery struct { ctrl *gomock.Controller recorder *MockCemeteryMockRecorder + isgomock struct{} } // MockCemeteryMockRecorder is the mock recorder for MockCemetery. @@ -294,7 +304,7 @@ func (m *MockCemetery) EXPECT() *MockCemeteryMockRecorder { // Bury mocks base method. func (m *MockCemetery) Bury(arg0 Goner, arg1 ...GonerOption) Cemetery { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -304,16 +314,16 @@ func (m *MockCemetery) Bury(arg0 Goner, arg1 ...GonerOption) Cemetery { } // Bury indicates an expected call of Bury. -func (mr *MockCemeteryMockRecorder) Bury(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) Bury(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Bury", reflect.TypeOf((*MockCemetery)(nil).Bury), varargs...) } // BuryOnce mocks base method. func (m *MockCemetery) BuryOnce(goner Goner, options ...GonerOption) Cemetery { m.ctrl.T.Helper() - varargs := []interface{}{goner} + varargs := []any{goner} for _, a := range options { varargs = append(varargs, a) } @@ -323,9 +333,9 @@ func (m *MockCemetery) BuryOnce(goner Goner, options ...GonerOption) Cemetery { } // BuryOnce indicates an expected call of BuryOnce. -func (mr *MockCemeteryMockRecorder) BuryOnce(goner interface{}, options ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) BuryOnce(goner any, options ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{goner}, options...) + varargs := append([]any{goner}, options...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuryOnce", reflect.TypeOf((*MockCemetery)(nil).BuryOnce), varargs...) } @@ -338,7 +348,7 @@ func (m *MockCemetery) GetTomById(arg0 GonerId) Tomb { } // GetTomById indicates an expected call of GetTomById. -func (mr *MockCemeteryMockRecorder) GetTomById(arg0 interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) GetTomById(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTomById", reflect.TypeOf((*MockCemetery)(nil).GetTomById), arg0) } @@ -352,7 +362,7 @@ func (m *MockCemetery) GetTomByType(arg0 reflect.Type) []Tomb { } // GetTomByType indicates an expected call of GetTomByType. -func (mr *MockCemeteryMockRecorder) GetTomByType(arg0 interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) GetTomByType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTomByType", reflect.TypeOf((*MockCemetery)(nil).GetTomByType), arg0) } @@ -367,7 +377,7 @@ func (m *MockCemetery) InjectFuncParameters(fn any, injectBefore func(reflect.Ty } // InjectFuncParameters indicates an expected call of InjectFuncParameters. -func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injectAfter interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injectAfter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InjectFuncParameters", reflect.TypeOf((*MockCemetery)(nil).InjectFuncParameters), fn, injectBefore, injectAfter) } @@ -375,7 +385,7 @@ func (mr *MockCemeteryMockRecorder) InjectFuncParameters(fn, injectBefore, injec // ReplaceBury mocks base method. func (m *MockCemetery) ReplaceBury(goner Goner, options ...GonerOption) error { m.ctrl.T.Helper() - varargs := []interface{}{goner} + varargs := []any{goner} for _, a := range options { varargs = append(varargs, a) } @@ -385,9 +395,9 @@ func (m *MockCemetery) ReplaceBury(goner Goner, options ...GonerOption) error { } // ReplaceBury indicates an expected call of ReplaceBury. -func (mr *MockCemeteryMockRecorder) ReplaceBury(goner interface{}, options ...interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) ReplaceBury(goner any, options ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{goner}, options...) + varargs := append([]any{goner}, options...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplaceBury", reflect.TypeOf((*MockCemetery)(nil).ReplaceBury), varargs...) } @@ -415,7 +425,7 @@ func (m *MockCemetery) ReviveOne(goner any) ([]Tomb, error) { } // ReviveOne indicates an expected call of ReviveOne. -func (mr *MockCemeteryMockRecorder) ReviveOne(goner interface{}) *gomock.Call { +func (mr *MockCemeteryMockRecorder) ReviveOne(goner any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReviveOne", reflect.TypeOf((*MockCemetery)(nil).ReviveOne), goner) } @@ -436,6 +446,7 @@ func (mr *MockCemeteryMockRecorder) goneFlag() *gomock.Call { type MockHeaven struct { ctrl *gomock.Controller recorder *MockHeavenMockRecorder + isgomock struct{} } // MockHeavenMockRecorder is the mock recorder for MockHeaven. @@ -464,7 +475,7 @@ func (m *MockHeaven) AfterStart(arg0 Process) Heaven { } // AfterStart indicates an expected call of AfterStart. -func (mr *MockHeavenMockRecorder) AfterStart(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) AfterStart(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AfterStart", reflect.TypeOf((*MockHeaven)(nil).AfterStart), arg0) } @@ -478,7 +489,7 @@ func (m *MockHeaven) AfterStop(arg0 Process) Heaven { } // AfterStop indicates an expected call of AfterStop. -func (mr *MockHeavenMockRecorder) AfterStop(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) AfterStop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AfterStop", reflect.TypeOf((*MockHeaven)(nil).AfterStop), arg0) } @@ -492,7 +503,7 @@ func (m *MockHeaven) BeforeStart(arg0 Process) Heaven { } // BeforeStart indicates an expected call of BeforeStart. -func (mr *MockHeavenMockRecorder) BeforeStart(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) BeforeStart(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeforeStart", reflect.TypeOf((*MockHeaven)(nil).BeforeStart), arg0) } @@ -506,7 +517,7 @@ func (m *MockHeaven) BeforeStop(arg0 Process) Heaven { } // BeforeStop indicates an expected call of BeforeStop. -func (mr *MockHeavenMockRecorder) BeforeStop(arg0 interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) BeforeStop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeforeStop", reflect.TypeOf((*MockHeaven)(nil).BeforeStop), arg0) } @@ -525,6 +536,20 @@ func (mr *MockHeavenMockRecorder) End() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "End", reflect.TypeOf((*MockHeaven)(nil).End)) } +// GetCemetery mocks base method. +func (m *MockHeaven) GetCemetery() Cemetery { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetCemetery") + ret0, _ := ret[0].(Cemetery) + return ret0 +} + +// GetCemetery indicates an expected call of GetCemetery. +func (mr *MockHeavenMockRecorder) GetCemetery() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCemetery", reflect.TypeOf((*MockHeaven)(nil).GetCemetery)) +} + // GetHeavenStopSignal mocks base method. func (m *MockHeaven) GetHeavenStopSignal() <-chan struct{} { m.ctrl.T.Helper() @@ -560,7 +585,7 @@ func (m *MockHeaven) SetAfterStopSignalWaitSecond(sec int) { } // SetAfterStopSignalWaitSecond indicates an expected call of SetAfterStopSignalWaitSecond. -func (mr *MockHeavenMockRecorder) SetAfterStopSignalWaitSecond(sec interface{}) *gomock.Call { +func (mr *MockHeavenMockRecorder) SetAfterStopSignalWaitSecond(sec any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAfterStopSignalWaitSecond", reflect.TypeOf((*MockHeaven)(nil).SetAfterStopSignalWaitSecond), sec) } @@ -611,6 +636,7 @@ func (mr *MockHeavenMockRecorder) WaitEnd() *gomock.Call { type MockProphet struct { ctrl *gomock.Controller recorder *MockProphetMockRecorder + isgomock struct{} } // MockProphetMockRecorder is the mock recorder for MockProphet. @@ -660,6 +686,7 @@ func (mr *MockProphetMockRecorder) goneFlag() *gomock.Call { type MockProphet2 struct { ctrl *gomock.Controller recorder *MockProphet2MockRecorder + isgomock struct{} } // MockProphet2MockRecorder is the mock recorder for MockProphet2. @@ -709,6 +736,7 @@ func (mr *MockProphet2MockRecorder) goneFlag() *gomock.Call { type MockAngel struct { ctrl *gomock.Controller recorder *MockAngelMockRecorder + isgomock struct{} } // MockAngelMockRecorder is the mock recorder for MockAngel. @@ -737,7 +765,7 @@ func (m *MockAngel) Start(arg0 Cemetery) error { } // Start indicates an expected call of Start. -func (mr *MockAngelMockRecorder) Start(arg0 interface{}) *gomock.Call { +func (mr *MockAngelMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockAngel)(nil).Start), arg0) } @@ -751,7 +779,7 @@ func (m *MockAngel) Stop(arg0 Cemetery) error { } // Stop indicates an expected call of Stop. -func (mr *MockAngelMockRecorder) Stop(arg0 interface{}) *gomock.Call { +func (mr *MockAngelMockRecorder) Stop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockAngel)(nil).Stop), arg0) } @@ -772,6 +800,7 @@ func (mr *MockAngelMockRecorder) goneFlag() *gomock.Call { type MockVampire struct { ctrl *gomock.Controller recorder *MockVampireMockRecorder + isgomock struct{} } // MockVampireMockRecorder is the mock recorder for MockVampire. @@ -800,7 +829,7 @@ func (m *MockVampire) Suck(conf string, v reflect.Value) SuckError { } // Suck indicates an expected call of Suck. -func (mr *MockVampireMockRecorder) Suck(conf, v interface{}) *gomock.Call { +func (mr *MockVampireMockRecorder) Suck(conf, v any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Suck", reflect.TypeOf((*MockVampire)(nil).Suck), conf, v) } @@ -821,6 +850,7 @@ func (mr *MockVampireMockRecorder) goneFlag() *gomock.Call { type MockVampire2 struct { ctrl *gomock.Controller recorder *MockVampire2MockRecorder + isgomock struct{} } // MockVampire2MockRecorder is the mock recorder for MockVampire2. @@ -849,7 +879,7 @@ func (m *MockVampire2) Suck(conf string, v reflect.Value, field reflect.StructFi } // Suck indicates an expected call of Suck. -func (mr *MockVampire2MockRecorder) Suck(conf, v, field interface{}) *gomock.Call { +func (mr *MockVampire2MockRecorder) Suck(conf, v, field any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Suck", reflect.TypeOf((*MockVampire2)(nil).Suck), conf, v, field) } @@ -870,6 +900,7 @@ func (mr *MockVampire2MockRecorder) goneFlag() *gomock.Call { type MockError struct { ctrl *gomock.Controller recorder *MockErrorMockRecorder + isgomock struct{} } // MockErrorMockRecorder is the mock recorder for MockError. @@ -917,6 +948,20 @@ func (mr *MockErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockError) Msg() string { m.ctrl.T.Helper() @@ -935,6 +980,7 @@ func (mr *MockErrorMockRecorder) Msg() *gomock.Call { type MockInnerError struct { ctrl *gomock.Controller recorder *MockInnerErrorMockRecorder + isgomock struct{} } // MockInnerErrorMockRecorder is the mock recorder for MockInnerError. @@ -982,6 +1028,20 @@ func (mr *MockInnerErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockInnerError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockInnerError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockInnerErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockInnerError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockInnerError) Msg() string { m.ctrl.T.Helper() @@ -1014,6 +1074,7 @@ func (mr *MockInnerErrorMockRecorder) Stack() *gomock.Call { type MockBusinessError struct { ctrl *gomock.Controller recorder *MockBusinessErrorMockRecorder + isgomock struct{} } // MockBusinessErrorMockRecorder is the mock recorder for MockBusinessError. @@ -1075,6 +1136,20 @@ func (mr *MockBusinessErrorMockRecorder) Error() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockBusinessError)(nil).Error)) } +// GetStatusCode mocks base method. +func (m *MockBusinessError) GetStatusCode() int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetStatusCode") + ret0, _ := ret[0].(int) + return ret0 +} + +// GetStatusCode indicates an expected call of GetStatusCode. +func (mr *MockBusinessErrorMockRecorder) GetStatusCode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatusCode", reflect.TypeOf((*MockBusinessError)(nil).GetStatusCode)) +} + // Msg mocks base method. func (m *MockBusinessError) Msg() string { m.ctrl.T.Helper() @@ -1093,6 +1168,7 @@ func (mr *MockBusinessErrorMockRecorder) Msg() *gomock.Call { type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -1115,7 +1191,7 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { // Debug mocks base method. func (m *MockLogger) Debug(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1123,7 +1199,7 @@ func (m *MockLogger) Debug(args ...any) { } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), args...) } @@ -1131,7 +1207,7 @@ func (mr *MockLoggerMockRecorder) Debug(args ...interface{}) *gomock.Call { // Debugf mocks base method. func (m *MockLogger) Debugf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1139,16 +1215,16 @@ func (m *MockLogger) Debugf(format string, args ...any) { } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Debugln mocks base method. func (m *MockLogger) Debugln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1156,7 +1232,7 @@ func (m *MockLogger) Debugln(args ...any) { } // Debugln indicates an expected call of Debugln. -func (mr *MockLoggerMockRecorder) Debugln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugln", reflect.TypeOf((*MockLogger)(nil).Debugln), args...) } @@ -1164,7 +1240,7 @@ func (mr *MockLoggerMockRecorder) Debugln(args ...interface{}) *gomock.Call { // Error mocks base method. func (m *MockLogger) Error(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1172,7 +1248,7 @@ func (m *MockLogger) Error(args ...any) { } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), args...) } @@ -1180,7 +1256,7 @@ func (mr *MockLoggerMockRecorder) Error(args ...interface{}) *gomock.Call { // Errorf mocks base method. func (m *MockLogger) Errorf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1188,16 +1264,16 @@ func (m *MockLogger) Errorf(format string, args ...any) { } // Errorf indicates an expected call of Errorf. -func (mr *MockLoggerMockRecorder) Errorf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) } // Errorln mocks base method. func (m *MockLogger) Errorln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1205,7 +1281,7 @@ func (m *MockLogger) Errorln(args ...any) { } // Errorln indicates an expected call of Errorln. -func (mr *MockLoggerMockRecorder) Errorln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorln", reflect.TypeOf((*MockLogger)(nil).Errorln), args...) } @@ -1213,7 +1289,7 @@ func (mr *MockLoggerMockRecorder) Errorln(args ...interface{}) *gomock.Call { // Fatal mocks base method. func (m *MockLogger) Fatal(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1221,7 +1297,7 @@ func (m *MockLogger) Fatal(args ...any) { } // Fatal indicates an expected call of Fatal. -func (mr *MockLoggerMockRecorder) Fatal(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatal(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatal", reflect.TypeOf((*MockLogger)(nil).Fatal), args...) } @@ -1229,7 +1305,7 @@ func (mr *MockLoggerMockRecorder) Fatal(args ...interface{}) *gomock.Call { // Fatalf mocks base method. func (m *MockLogger) Fatalf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1237,16 +1313,16 @@ func (m *MockLogger) Fatalf(format string, args ...any) { } // Fatalf indicates an expected call of Fatalf. -func (mr *MockLoggerMockRecorder) Fatalf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalf", reflect.TypeOf((*MockLogger)(nil).Fatalf), varargs...) } // Fatalln mocks base method. func (m *MockLogger) Fatalln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1254,7 +1330,7 @@ func (m *MockLogger) Fatalln(args ...any) { } // Fatalln indicates an expected call of Fatalln. -func (mr *MockLoggerMockRecorder) Fatalln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalln", reflect.TypeOf((*MockLogger)(nil).Fatalln), args...) } @@ -1262,7 +1338,7 @@ func (mr *MockLoggerMockRecorder) Fatalln(args ...interface{}) *gomock.Call { // Info mocks base method. func (m *MockLogger) Info(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1270,7 +1346,7 @@ func (m *MockLogger) Info(args ...any) { } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), args...) } @@ -1278,7 +1354,7 @@ func (mr *MockLoggerMockRecorder) Info(args ...interface{}) *gomock.Call { // Infof mocks base method. func (m *MockLogger) Infof(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1286,16 +1362,16 @@ func (m *MockLogger) Infof(format string, args ...any) { } // Infof indicates an expected call of Infof. -func (mr *MockLoggerMockRecorder) Infof(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infof(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infof", reflect.TypeOf((*MockLogger)(nil).Infof), varargs...) } // Infoln mocks base method. func (m *MockLogger) Infoln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1303,7 +1379,7 @@ func (m *MockLogger) Infoln(args ...any) { } // Infoln indicates an expected call of Infoln. -func (mr *MockLoggerMockRecorder) Infoln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infoln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infoln", reflect.TypeOf((*MockLogger)(nil).Infoln), args...) } @@ -1311,7 +1387,7 @@ func (mr *MockLoggerMockRecorder) Infoln(args ...interface{}) *gomock.Call { // Panic mocks base method. func (m *MockLogger) Panic(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1319,7 +1395,7 @@ func (m *MockLogger) Panic(args ...any) { } // Panic indicates an expected call of Panic. -func (mr *MockLoggerMockRecorder) Panic(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panic(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panic", reflect.TypeOf((*MockLogger)(nil).Panic), args...) } @@ -1327,7 +1403,7 @@ func (mr *MockLoggerMockRecorder) Panic(args ...interface{}) *gomock.Call { // Panicf mocks base method. func (m *MockLogger) Panicf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1335,16 +1411,16 @@ func (m *MockLogger) Panicf(format string, args ...any) { } // Panicf indicates an expected call of Panicf. -func (mr *MockLoggerMockRecorder) Panicf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panicf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panicf", reflect.TypeOf((*MockLogger)(nil).Panicf), varargs...) } // Panicln mocks base method. func (m *MockLogger) Panicln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1352,7 +1428,7 @@ func (m *MockLogger) Panicln(args ...any) { } // Panicln indicates an expected call of Panicln. -func (mr *MockLoggerMockRecorder) Panicln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Panicln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panicln", reflect.TypeOf((*MockLogger)(nil).Panicln), args...) } @@ -1360,7 +1436,7 @@ func (mr *MockLoggerMockRecorder) Panicln(args ...interface{}) *gomock.Call { // Print mocks base method. func (m *MockLogger) Print(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1368,7 +1444,7 @@ func (m *MockLogger) Print(args ...any) { } // Print indicates an expected call of Print. -func (mr *MockLoggerMockRecorder) Print(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Print(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Print", reflect.TypeOf((*MockLogger)(nil).Print), args...) } @@ -1376,7 +1452,7 @@ func (mr *MockLoggerMockRecorder) Print(args ...interface{}) *gomock.Call { // Printf mocks base method. func (m *MockLogger) Printf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1384,16 +1460,16 @@ func (m *MockLogger) Printf(format string, args ...any) { } // Printf indicates an expected call of Printf. -func (mr *MockLoggerMockRecorder) Printf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Printf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Printf", reflect.TypeOf((*MockLogger)(nil).Printf), varargs...) } // Println mocks base method. func (m *MockLogger) Println(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1401,7 +1477,7 @@ func (m *MockLogger) Println(args ...any) { } // Println indicates an expected call of Println. -func (mr *MockLoggerMockRecorder) Println(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Println(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Println", reflect.TypeOf((*MockLogger)(nil).Println), args...) } @@ -1409,7 +1485,7 @@ func (mr *MockLoggerMockRecorder) Println(args ...interface{}) *gomock.Call { // Trace mocks base method. func (m *MockLogger) Trace(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1417,7 +1493,7 @@ func (m *MockLogger) Trace(args ...any) { } // Trace indicates an expected call of Trace. -func (mr *MockLoggerMockRecorder) Trace(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Trace(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trace", reflect.TypeOf((*MockLogger)(nil).Trace), args...) } @@ -1425,7 +1501,7 @@ func (mr *MockLoggerMockRecorder) Trace(args ...interface{}) *gomock.Call { // Tracef mocks base method. func (m *MockLogger) Tracef(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1433,16 +1509,16 @@ func (m *MockLogger) Tracef(format string, args ...any) { } // Tracef indicates an expected call of Tracef. -func (mr *MockLoggerMockRecorder) Tracef(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Tracef(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Tracef", reflect.TypeOf((*MockLogger)(nil).Tracef), varargs...) } // Traceln mocks base method. func (m *MockLogger) Traceln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1450,7 +1526,7 @@ func (m *MockLogger) Traceln(args ...any) { } // Traceln indicates an expected call of Traceln. -func (mr *MockLoggerMockRecorder) Traceln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Traceln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Traceln", reflect.TypeOf((*MockLogger)(nil).Traceln), args...) } @@ -1458,7 +1534,7 @@ func (mr *MockLoggerMockRecorder) Traceln(args ...interface{}) *gomock.Call { // Warn mocks base method. func (m *MockLogger) Warn(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1466,7 +1542,7 @@ func (m *MockLogger) Warn(args ...any) { } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), args...) } @@ -1474,7 +1550,7 @@ func (mr *MockLoggerMockRecorder) Warn(args ...interface{}) *gomock.Call { // Warnf mocks base method. func (m *MockLogger) Warnf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{format} + varargs := []any{format} for _, a := range args { varargs = append(varargs, a) } @@ -1482,16 +1558,16 @@ func (m *MockLogger) Warnf(format string, args ...any) { } // Warnf indicates an expected call of Warnf. -func (mr *MockLoggerMockRecorder) Warnf(format interface{}, args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{format}, args...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) } // Warnln mocks base method. func (m *MockLogger) Warnln(args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range args { varargs = append(varargs, a) } @@ -1499,7 +1575,7 @@ func (m *MockLogger) Warnln(args ...any) { } // Warnln indicates an expected call of Warnln. -func (mr *MockLoggerMockRecorder) Warnln(args ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnln(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnln", reflect.TypeOf((*MockLogger)(nil).Warnln), args...) } @@ -1508,6 +1584,7 @@ func (mr *MockLoggerMockRecorder) Warnln(args ...interface{}) *gomock.Call { type MockTracer struct { ctrl *gomock.Controller recorder *MockTracerMockRecorder + isgomock struct{} } // MockTracerMockRecorder is the mock recorder for MockTracer. @@ -1548,7 +1625,7 @@ func (m *MockTracer) Go(fn func()) { } // Go indicates an expected call of Go. -func (mr *MockTracerMockRecorder) Go(fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) Go(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Go", reflect.TypeOf((*MockTracer)(nil).Go), fn) } @@ -1572,7 +1649,7 @@ func (m *MockTracer) RecoverSetTraceId(traceId string, fn func()) { } // RecoverSetTraceId indicates an expected call of RecoverSetTraceId. -func (mr *MockTracerMockRecorder) RecoverSetTraceId(traceId, fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) RecoverSetTraceId(traceId, fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecoverSetTraceId", reflect.TypeOf((*MockTracer)(nil).RecoverSetTraceId), traceId, fn) } @@ -1584,7 +1661,7 @@ func (m *MockTracer) SetTraceId(traceId string, fn func()) { } // SetTraceId indicates an expected call of SetTraceId. -func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn interface{}) *gomock.Call { +func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTraceId", reflect.TypeOf((*MockTracer)(nil).SetTraceId), traceId, fn) } @@ -1593,6 +1670,7 @@ func (mr *MockTracerMockRecorder) SetTraceId(traceId, fn interface{}) *gomock.Ca type MockXormEngine struct { ctrl *gomock.Controller recorder *MockXormEngineMockRecorder + isgomock struct{} } // MockXormEngineMockRecorder is the mock recorder for MockXormEngine. @@ -1619,7 +1697,7 @@ func (m *MockXormEngine) AddHook(hook contexts.Hook) { } // AddHook indicates an expected call of AddHook. -func (mr *MockXormEngineMockRecorder) AddHook(hook interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) AddHook(hook any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHook", reflect.TypeOf((*MockXormEngine)(nil).AddHook), hook) } @@ -1633,7 +1711,7 @@ func (m *MockXormEngine) Alias(alias string) *xorm.Session { } // Alias indicates an expected call of Alias. -func (mr *MockXormEngineMockRecorder) Alias(alias interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Alias(alias any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Alias", reflect.TypeOf((*MockXormEngine)(nil).Alias), alias) } @@ -1655,7 +1733,7 @@ func (mr *MockXormEngineMockRecorder) AllCols() *gomock.Call { // Asc mocks base method. func (m *MockXormEngine) Asc(colNames ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range colNames { varargs = append(varargs, a) } @@ -1665,13 +1743,13 @@ func (m *MockXormEngine) Asc(colNames ...string) *xorm.Session { } // Asc indicates an expected call of Asc. -func (mr *MockXormEngineMockRecorder) Asc(colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Asc(colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Asc", reflect.TypeOf((*MockXormEngine)(nil).Asc), colNames...) } // Before mocks base method. -func (m *MockXormEngine) Before(arg0 func(interface{})) *xorm.Session { +func (m *MockXormEngine) Before(arg0 func(any)) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Before", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -1679,7 +1757,7 @@ func (m *MockXormEngine) Before(arg0 func(interface{})) *xorm.Session { } // Before indicates an expected call of Before. -func (mr *MockXormEngineMockRecorder) Before(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Before(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Before", reflect.TypeOf((*MockXormEngine)(nil).Before), arg0) } @@ -1693,7 +1771,7 @@ func (m *MockXormEngine) BufferSize(size int) *xorm.Session { } // BufferSize indicates an expected call of BufferSize. -func (mr *MockXormEngineMockRecorder) BufferSize(size interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) BufferSize(size any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BufferSize", reflect.TypeOf((*MockXormEngine)(nil).BufferSize), size) } @@ -1707,15 +1785,15 @@ func (m *MockXormEngine) Charset(charset string) *xorm.Session { } // Charset indicates an expected call of Charset. -func (mr *MockXormEngineMockRecorder) Charset(charset interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Charset(charset any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Charset", reflect.TypeOf((*MockXormEngine)(nil).Charset), charset) } // ClearCache mocks base method. -func (m *MockXormEngine) ClearCache(arg0 ...interface{}) error { +func (m *MockXormEngine) ClearCache(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1725,7 +1803,7 @@ func (m *MockXormEngine) ClearCache(arg0 ...interface{}) error { } // ClearCache indicates an expected call of ClearCache. -func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearCache", reflect.TypeOf((*MockXormEngine)(nil).ClearCache), arg0...) } @@ -1733,7 +1811,7 @@ func (mr *MockXormEngineMockRecorder) ClearCache(arg0 ...interface{}) *gomock.Ca // Cols mocks base method. func (m *MockXormEngine) Cols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -1743,7 +1821,7 @@ func (m *MockXormEngine) Cols(columns ...string) *xorm.Session { } // Cols indicates an expected call of Cols. -func (mr *MockXormEngineMockRecorder) Cols(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Cols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Cols", reflect.TypeOf((*MockXormEngine)(nil).Cols), columns...) } @@ -1757,15 +1835,15 @@ func (m *MockXormEngine) Context(arg0 context.Context) *xorm.Session { } // Context indicates an expected call of Context. -func (mr *MockXormEngineMockRecorder) Context(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Context(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockXormEngine)(nil).Context), arg0) } // Count mocks base method. -func (m *MockXormEngine) Count(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Count(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1776,13 +1854,13 @@ func (m *MockXormEngine) Count(arg0 ...interface{}) (int64, error) { } // Count indicates an expected call of Count. -func (mr *MockXormEngineMockRecorder) Count(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Count(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Count", reflect.TypeOf((*MockXormEngine)(nil).Count), arg0...) } // CreateIndexes mocks base method. -func (m *MockXormEngine) CreateIndexes(bean interface{}) error { +func (m *MockXormEngine) CreateIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateIndexes", bean) ret0, _ := ret[0].(error) @@ -1790,15 +1868,15 @@ func (m *MockXormEngine) CreateIndexes(bean interface{}) error { } // CreateIndexes indicates an expected call of CreateIndexes. -func (mr *MockXormEngineMockRecorder) CreateIndexes(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateIndexes", reflect.TypeOf((*MockXormEngine)(nil).CreateIndexes), bean) } // CreateTables mocks base method. -func (m *MockXormEngine) CreateTables(arg0 ...interface{}) error { +func (m *MockXormEngine) CreateTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1808,13 +1886,13 @@ func (m *MockXormEngine) CreateTables(arg0 ...interface{}) error { } // CreateTables indicates an expected call of CreateTables. -func (mr *MockXormEngineMockRecorder) CreateTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTables", reflect.TypeOf((*MockXormEngine)(nil).CreateTables), arg0...) } // CreateUniques mocks base method. -func (m *MockXormEngine) CreateUniques(bean interface{}) error { +func (m *MockXormEngine) CreateUniques(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateUniques", bean) ret0, _ := ret[0].(error) @@ -1822,7 +1900,7 @@ func (m *MockXormEngine) CreateUniques(bean interface{}) error { } // CreateUniques indicates an expected call of CreateUniques. -func (mr *MockXormEngineMockRecorder) CreateUniques(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) CreateUniques(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUniques", reflect.TypeOf((*MockXormEngine)(nil).CreateUniques), bean) } @@ -1858,9 +1936,9 @@ func (mr *MockXormEngineMockRecorder) DBVersion() *gomock.Call { } // Decr mocks base method. -func (m *MockXormEngine) Decr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXormEngine) Decr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -1870,16 +1948,16 @@ func (m *MockXormEngine) Decr(column string, arg ...interface{}) *xorm.Session { } // Decr indicates an expected call of Decr. -func (mr *MockXormEngineMockRecorder) Decr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Decr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockXormEngine)(nil).Decr), varargs...) } // Delete mocks base method. -func (m *MockXormEngine) Delete(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Delete(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1890,7 +1968,7 @@ func (m *MockXormEngine) Delete(arg0 ...interface{}) (int64, error) { } // Delete indicates an expected call of Delete. -func (mr *MockXormEngineMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Delete(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockXormEngine)(nil).Delete), arg0...) } @@ -1898,7 +1976,7 @@ func (mr *MockXormEngineMockRecorder) Delete(arg0 ...interface{}) *gomock.Call { // Desc mocks base method. func (m *MockXormEngine) Desc(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1908,7 +1986,7 @@ func (m *MockXormEngine) Desc(arg0 ...string) *xorm.Session { } // Desc indicates an expected call of Desc. -func (mr *MockXormEngineMockRecorder) Desc(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Desc(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Desc", reflect.TypeOf((*MockXormEngine)(nil).Desc), arg0...) } @@ -1930,7 +2008,7 @@ func (mr *MockXormEngineMockRecorder) Dialect() *gomock.Call { // Distinct mocks base method. func (m *MockXormEngine) Distinct(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -1940,7 +2018,7 @@ func (m *MockXormEngine) Distinct(columns ...string) *xorm.Session { } // Distinct indicates an expected call of Distinct. -func (mr *MockXormEngineMockRecorder) Distinct(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Distinct(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Distinct", reflect.TypeOf((*MockXormEngine)(nil).Distinct), columns...) } @@ -1960,7 +2038,7 @@ func (mr *MockXormEngineMockRecorder) DriverName() *gomock.Call { } // DropIndexes mocks base method. -func (m *MockXormEngine) DropIndexes(bean interface{}) error { +func (m *MockXormEngine) DropIndexes(bean any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DropIndexes", bean) ret0, _ := ret[0].(error) @@ -1968,15 +2046,15 @@ func (m *MockXormEngine) DropIndexes(bean interface{}) error { } // DropIndexes indicates an expected call of DropIndexes. -func (mr *MockXormEngineMockRecorder) DropIndexes(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DropIndexes(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropIndexes", reflect.TypeOf((*MockXormEngine)(nil).DropIndexes), bean) } // DropTables mocks base method. -func (m *MockXormEngine) DropTables(arg0 ...interface{}) error { +func (m *MockXormEngine) DropTables(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -1986,7 +2064,7 @@ func (m *MockXormEngine) DropTables(arg0 ...interface{}) error { } // DropTables indicates an expected call of DropTables. -func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DropTables", reflect.TypeOf((*MockXormEngine)(nil).DropTables), arg0...) } @@ -1994,7 +2072,7 @@ func (mr *MockXormEngineMockRecorder) DropTables(arg0 ...interface{}) *gomock.Ca // DumpAllToFile mocks base method. func (m *MockXormEngine) DumpAllToFile(fp string, tp ...schemas.DBType) error { m.ctrl.T.Helper() - varargs := []interface{}{fp} + varargs := []any{fp} for _, a := range tp { varargs = append(varargs, a) } @@ -2004,9 +2082,9 @@ func (m *MockXormEngine) DumpAllToFile(fp string, tp ...schemas.DBType) error { } // DumpAllToFile indicates an expected call of DumpAllToFile. -func (mr *MockXormEngineMockRecorder) DumpAllToFile(fp interface{}, tp ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) DumpAllToFile(fp any, tp ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{fp}, tp...) + varargs := append([]any{fp}, tp...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DumpAllToFile", reflect.TypeOf((*MockXormEngine)(nil).DumpAllToFile), varargs...) } @@ -2017,15 +2095,15 @@ func (m *MockXormEngine) EnableSessionID(arg0 bool) { } // EnableSessionID indicates an expected call of EnableSessionID. -func (mr *MockXormEngineMockRecorder) EnableSessionID(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) EnableSessionID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableSessionID", reflect.TypeOf((*MockXormEngine)(nil).EnableSessionID), arg0) } // Exec mocks base method. -func (m *MockXormEngine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { +func (m *MockXormEngine) Exec(sqlOrArgs ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2036,15 +2114,15 @@ func (m *MockXormEngine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockXormEngineMockRecorder) Exec(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Exec(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockXormEngine)(nil).Exec), sqlOrArgs...) } // Exist mocks base method. -func (m *MockXormEngine) Exist(bean ...interface{}) (bool, error) { +func (m *MockXormEngine) Exist(bean ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range bean { varargs = append(varargs, a) } @@ -2055,15 +2133,15 @@ func (m *MockXormEngine) Exist(bean ...interface{}) (bool, error) { } // Exist indicates an expected call of Exist. -func (mr *MockXormEngineMockRecorder) Exist(bean ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Exist(bean ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exist", reflect.TypeOf((*MockXormEngine)(nil).Exist), bean...) } // Find mocks base method. -func (m *MockXormEngine) Find(arg0 interface{}, arg1 ...interface{}) error { +func (m *MockXormEngine) Find(arg0 any, arg1 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2073,16 +2151,16 @@ func (m *MockXormEngine) Find(arg0 interface{}, arg1 ...interface{}) error { } // Find indicates an expected call of Find. -func (mr *MockXormEngineMockRecorder) Find(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Find(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockXormEngine)(nil).Find), varargs...) } // FindAndCount mocks base method. -func (m *MockXormEngine) FindAndCount(arg0 interface{}, arg1 ...interface{}) (int64, error) { +func (m *MockXormEngine) FindAndCount(arg0 any, arg1 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2093,16 +2171,16 @@ func (m *MockXormEngine) FindAndCount(arg0 interface{}, arg1 ...interface{}) (in } // FindAndCount indicates an expected call of FindAndCount. -func (mr *MockXormEngineMockRecorder) FindAndCount(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) FindAndCount(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindAndCount", reflect.TypeOf((*MockXormEngine)(nil).FindAndCount), varargs...) } // Get mocks base method. -func (m *MockXormEngine) Get(arg0 ...interface{}) (bool, error) { +func (m *MockXormEngine) Get(arg0 ...any) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2113,7 +2191,7 @@ func (m *MockXormEngine) Get(arg0 ...interface{}) (bool, error) { } // Get indicates an expected call of Get. -func (mr *MockXormEngineMockRecorder) Get(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Get(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockXormEngine)(nil).Get), arg0...) } @@ -2127,7 +2205,7 @@ func (m *MockXormEngine) GetCacher(arg0 string) caches.Cacher { } // GetCacher indicates an expected call of GetCacher. -func (mr *MockXormEngineMockRecorder) GetCacher(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) GetCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCacher", reflect.TypeOf((*MockXormEngine)(nil).GetCacher), arg0) } @@ -2225,13 +2303,13 @@ func (m *MockXormEngine) GroupBy(keys string) *xorm.Session { } // GroupBy indicates an expected call of GroupBy. -func (mr *MockXormEngineMockRecorder) GroupBy(keys interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) GroupBy(keys any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupBy", reflect.TypeOf((*MockXormEngine)(nil).GroupBy), keys) } // ID mocks base method. -func (m *MockXormEngine) ID(arg0 interface{}) *xorm.Session { +func (m *MockXormEngine) ID(arg0 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID", arg0) ret0, _ := ret[0].(*xorm.Session) @@ -2239,7 +2317,7 @@ func (m *MockXormEngine) ID(arg0 interface{}) *xorm.Session { } // ID indicates an expected call of ID. -func (mr *MockXormEngineMockRecorder) ID(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockXormEngine)(nil).ID), arg0) } @@ -2254,15 +2332,15 @@ func (m *MockXormEngine) ImportFile(fp string) ([]sql.Result, error) { } // ImportFile indicates an expected call of ImportFile. -func (mr *MockXormEngineMockRecorder) ImportFile(fp interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ImportFile(fp any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImportFile", reflect.TypeOf((*MockXormEngine)(nil).ImportFile), fp) } // In mocks base method. -func (m *MockXormEngine) In(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) In(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2272,16 +2350,16 @@ func (m *MockXormEngine) In(arg0 string, arg1 ...interface{}) *xorm.Session { } // In indicates an expected call of In. -func (mr *MockXormEngineMockRecorder) In(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) In(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "In", reflect.TypeOf((*MockXormEngine)(nil).In), varargs...) } // Incr mocks base method. -func (m *MockXormEngine) Incr(column string, arg ...interface{}) *xorm.Session { +func (m *MockXormEngine) Incr(column string, arg ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{column} + varargs := []any{column} for _, a := range arg { varargs = append(varargs, a) } @@ -2291,16 +2369,16 @@ func (m *MockXormEngine) Incr(column string, arg ...interface{}) *xorm.Session { } // Incr indicates an expected call of Incr. -func (mr *MockXormEngineMockRecorder) Incr(column interface{}, arg ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Incr(column any, arg ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{column}, arg...) + varargs := append([]any{column}, arg...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockXormEngine)(nil).Incr), varargs...) } // Insert mocks base method. -func (m *MockXormEngine) Insert(arg0 ...interface{}) (int64, error) { +func (m *MockXormEngine) Insert(arg0 ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2311,13 +2389,13 @@ func (m *MockXormEngine) Insert(arg0 ...interface{}) (int64, error) { } // Insert indicates an expected call of Insert. -func (mr *MockXormEngineMockRecorder) Insert(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Insert(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockXormEngine)(nil).Insert), arg0...) } // InsertOne mocks base method. -func (m *MockXormEngine) InsertOne(arg0 interface{}) (int64, error) { +func (m *MockXormEngine) InsertOne(arg0 any) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertOne", arg0) ret0, _ := ret[0].(int64) @@ -2326,13 +2404,13 @@ func (m *MockXormEngine) InsertOne(arg0 interface{}) (int64, error) { } // InsertOne indicates an expected call of InsertOne. -func (mr *MockXormEngineMockRecorder) InsertOne(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) InsertOne(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertOne", reflect.TypeOf((*MockXormEngine)(nil).InsertOne), arg0) } // IsTableEmpty mocks base method. -func (m *MockXormEngine) IsTableEmpty(bean interface{}) (bool, error) { +func (m *MockXormEngine) IsTableEmpty(bean any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableEmpty", bean) ret0, _ := ret[0].(bool) @@ -2341,13 +2419,13 @@ func (m *MockXormEngine) IsTableEmpty(bean interface{}) (bool, error) { } // IsTableEmpty indicates an expected call of IsTableEmpty. -func (mr *MockXormEngineMockRecorder) IsTableEmpty(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) IsTableEmpty(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableEmpty", reflect.TypeOf((*MockXormEngine)(nil).IsTableEmpty), bean) } // IsTableExist mocks base method. -func (m *MockXormEngine) IsTableExist(beanOrTableName interface{}) (bool, error) { +func (m *MockXormEngine) IsTableExist(beanOrTableName any) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsTableExist", beanOrTableName) ret0, _ := ret[0].(bool) @@ -2356,13 +2434,13 @@ func (m *MockXormEngine) IsTableExist(beanOrTableName interface{}) (bool, error) } // IsTableExist indicates an expected call of IsTableExist. -func (mr *MockXormEngineMockRecorder) IsTableExist(beanOrTableName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) IsTableExist(beanOrTableName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsTableExist", reflect.TypeOf((*MockXormEngine)(nil).IsTableExist), beanOrTableName) } // Iterate mocks base method. -func (m *MockXormEngine) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { +func (m *MockXormEngine) Iterate(arg0 any, arg1 xorm.IterFunc) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -2370,15 +2448,15 @@ func (m *MockXormEngine) Iterate(arg0 interface{}, arg1 xorm.IterFunc) error { } // Iterate indicates an expected call of Iterate. -func (mr *MockXormEngineMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Iterate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockXormEngine)(nil).Iterate), arg0, arg1) } // Join mocks base method. -func (m *MockXormEngine) Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *xorm.Session { +func (m *MockXormEngine) Join(joinOperator string, tablename any, condition string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{joinOperator, tablename, condition} + varargs := []any{joinOperator, tablename, condition} for _, a := range args { varargs = append(varargs, a) } @@ -2388,16 +2466,16 @@ func (m *MockXormEngine) Join(joinOperator string, tablename interface{}, condit } // Join indicates an expected call of Join. -func (mr *MockXormEngineMockRecorder) Join(joinOperator, tablename, condition interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Join(joinOperator, tablename, condition any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{joinOperator, tablename, condition}, args...) + varargs := append([]any{joinOperator, tablename, condition}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Join", reflect.TypeOf((*MockXormEngine)(nil).Join), varargs...) } // Limit mocks base method. func (m *MockXormEngine) Limit(arg0 int, arg1 ...int) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2407,14 +2485,14 @@ func (m *MockXormEngine) Limit(arg0 int, arg1 ...int) *xorm.Session { } // Limit indicates an expected call of Limit. -func (mr *MockXormEngineMockRecorder) Limit(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Limit(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Limit", reflect.TypeOf((*MockXormEngine)(nil).Limit), varargs...) } // MapCacher mocks base method. -func (m *MockXormEngine) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { +func (m *MockXormEngine) MapCacher(arg0 any, arg1 caches.Cacher) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MapCacher", arg0, arg1) ret0, _ := ret[0].(error) @@ -2422,7 +2500,7 @@ func (m *MockXormEngine) MapCacher(arg0 interface{}, arg1 caches.Cacher) error { } // MapCacher indicates an expected call of MapCacher. -func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MapCacher", reflect.TypeOf((*MockXormEngine)(nil).MapCacher), arg0, arg1) } @@ -2430,7 +2508,7 @@ func (mr *MockXormEngineMockRecorder) MapCacher(arg0, arg1 interface{}) *gomock. // MustCols mocks base method. func (m *MockXormEngine) MustCols(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -2440,7 +2518,7 @@ func (m *MockXormEngine) MustCols(columns ...string) *xorm.Session { } // MustCols indicates an expected call of MustCols. -func (mr *MockXormEngineMockRecorder) MustCols(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) MustCols(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MustCols", reflect.TypeOf((*MockXormEngine)(nil).MustCols), columns...) } @@ -2462,7 +2540,7 @@ func (mr *MockXormEngineMockRecorder) NewSession() *gomock.Call { // NoAutoCondition mocks base method. func (m *MockXormEngine) NoAutoCondition(arg0 ...bool) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2472,7 +2550,7 @@ func (m *MockXormEngine) NoAutoCondition(arg0 ...bool) *xorm.Session { } // NoAutoCondition indicates an expected call of NoAutoCondition. -func (mr *MockXormEngineMockRecorder) NoAutoCondition(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) NoAutoCondition(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NoAutoCondition", reflect.TypeOf((*MockXormEngine)(nil).NoAutoCondition), arg0...) } @@ -2492,9 +2570,9 @@ func (mr *MockXormEngineMockRecorder) NoAutoTime() *gomock.Call { } // NotIn mocks base method. -func (m *MockXormEngine) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) NotIn(arg0 string, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2504,16 +2582,16 @@ func (m *MockXormEngine) NotIn(arg0 string, arg1 ...interface{}) *xorm.Session { } // NotIn indicates an expected call of NotIn. -func (mr *MockXormEngineMockRecorder) NotIn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) NotIn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotIn", reflect.TypeOf((*MockXormEngine)(nil).NotIn), varargs...) } // Nullable mocks base method. func (m *MockXormEngine) Nullable(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -2523,7 +2601,7 @@ func (m *MockXormEngine) Nullable(arg0 ...string) *xorm.Session { } // Nullable indicates an expected call of Nullable. -func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Nullable", reflect.TypeOf((*MockXormEngine)(nil).Nullable), arg0...) } @@ -2531,7 +2609,7 @@ func (mr *MockXormEngineMockRecorder) Nullable(arg0 ...interface{}) *gomock.Call // Omit mocks base method. func (m *MockXormEngine) Omit(columns ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range columns { varargs = append(varargs, a) } @@ -2541,15 +2619,15 @@ func (m *MockXormEngine) Omit(columns ...string) *xorm.Session { } // Omit indicates an expected call of Omit. -func (mr *MockXormEngineMockRecorder) Omit(columns ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Omit(columns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Omit", reflect.TypeOf((*MockXormEngine)(nil).Omit), columns...) } // OrderBy mocks base method. -func (m *MockXormEngine) OrderBy(order interface{}, args ...interface{}) *xorm.Session { +func (m *MockXormEngine) OrderBy(order any, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{order} + varargs := []any{order} for _, a := range args { varargs = append(varargs, a) } @@ -2559,9 +2637,9 @@ func (m *MockXormEngine) OrderBy(order interface{}, args ...interface{}) *xorm.S } // OrderBy indicates an expected call of OrderBy. -func (mr *MockXormEngineMockRecorder) OrderBy(order interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) OrderBy(order any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{order}, args...) + varargs := append([]any{order}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OrderBy", reflect.TypeOf((*MockXormEngine)(nil).OrderBy), varargs...) } @@ -2594,9 +2672,9 @@ func (mr *MockXormEngineMockRecorder) Prepare() *gomock.Call { } // Query mocks base method. -func (m *MockXormEngine) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) { +func (m *MockXormEngine) Query(sqlOrArgs ...any) ([]map[string][]byte, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2607,34 +2685,34 @@ func (m *MockXormEngine) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, e } // Query indicates an expected call of Query. -func (mr *MockXormEngineMockRecorder) Query(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Query(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockXormEngine)(nil).Query), sqlOrArgs...) } // QueryInterface mocks base method. -func (m *MockXormEngine) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) { +func (m *MockXormEngine) QueryInterface(sqlOrArgs ...any) ([]map[string]any, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryInterface", varargs...) - ret0, _ := ret[0].([]map[string]interface{}) + ret0, _ := ret[0].([]map[string]any) ret1, _ := ret[1].(error) return ret0, ret1 } // QueryInterface indicates an expected call of QueryInterface. -func (mr *MockXormEngineMockRecorder) QueryInterface(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) QueryInterface(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryInterface", reflect.TypeOf((*MockXormEngine)(nil).QueryInterface), sqlOrArgs...) } // QueryString mocks base method. -func (m *MockXormEngine) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) { +func (m *MockXormEngine) QueryString(sqlOrArgs ...any) ([]map[string]string, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range sqlOrArgs { varargs = append(varargs, a) } @@ -2645,7 +2723,7 @@ func (m *MockXormEngine) QueryString(sqlOrArgs ...interface{}) ([]map[string]str } // QueryString indicates an expected call of QueryString. -func (mr *MockXormEngineMockRecorder) QueryString(sqlOrArgs ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) QueryString(sqlOrArgs ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryString", reflect.TypeOf((*MockXormEngine)(nil).QueryString), sqlOrArgs...) } @@ -2659,13 +2737,13 @@ func (m *MockXormEngine) Quote(arg0 string) string { } // Quote indicates an expected call of Quote. -func (mr *MockXormEngineMockRecorder) Quote(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Quote(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Quote", reflect.TypeOf((*MockXormEngine)(nil).Quote), arg0) } // Rows mocks base method. -func (m *MockXormEngine) Rows(bean interface{}) (*xorm.Rows, error) { +func (m *MockXormEngine) Rows(bean any) (*xorm.Rows, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Rows", bean) ret0, _ := ret[0].(*xorm.Rows) @@ -2674,15 +2752,15 @@ func (m *MockXormEngine) Rows(bean interface{}) (*xorm.Rows, error) { } // Rows indicates an expected call of Rows. -func (mr *MockXormEngineMockRecorder) Rows(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Rows(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rows", reflect.TypeOf((*MockXormEngine)(nil).Rows), bean) } // SQL mocks base method. -func (m *MockXormEngine) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) SQL(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -2692,9 +2770,9 @@ func (m *MockXormEngine) SQL(arg0 interface{}, arg1 ...interface{}) *xorm.Sessio } // SQL indicates an expected call of SQL. -func (mr *MockXormEngineMockRecorder) SQL(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SQL(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SQL", reflect.TypeOf((*MockXormEngine)(nil).SQL), varargs...) } @@ -2707,7 +2785,7 @@ func (m *MockXormEngine) Select(arg0 string) *xorm.Session { } // Select indicates an expected call of Select. -func (mr *MockXormEngineMockRecorder) Select(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Select(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Select", reflect.TypeOf((*MockXormEngine)(nil).Select), arg0) } @@ -2719,7 +2797,7 @@ func (m *MockXormEngine) SetCacher(arg0 string, arg1 caches.Cacher) { } // SetCacher indicates an expected call of SetCacher. -func (mr *MockXormEngineMockRecorder) SetCacher(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetCacher(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCacher", reflect.TypeOf((*MockXormEngine)(nil).SetCacher), arg0, arg1) } @@ -2731,7 +2809,7 @@ func (m *MockXormEngine) SetColumnMapper(arg0 names.Mapper) { } // SetColumnMapper indicates an expected call of SetColumnMapper. -func (mr *MockXormEngineMockRecorder) SetColumnMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetColumnMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColumnMapper", reflect.TypeOf((*MockXormEngine)(nil).SetColumnMapper), arg0) } @@ -2743,7 +2821,7 @@ func (m *MockXormEngine) SetConnMaxLifetime(arg0 time.Duration) { } // SetConnMaxLifetime indicates an expected call of SetConnMaxLifetime. -func (mr *MockXormEngineMockRecorder) SetConnMaxLifetime(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetConnMaxLifetime(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetConnMaxLifetime", reflect.TypeOf((*MockXormEngine)(nil).SetConnMaxLifetime), arg0) } @@ -2755,13 +2833,13 @@ func (m *MockXormEngine) SetDefaultCacher(arg0 caches.Cacher) { } // SetDefaultCacher indicates an expected call of SetDefaultCacher. -func (mr *MockXormEngineMockRecorder) SetDefaultCacher(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetDefaultCacher(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefaultCacher", reflect.TypeOf((*MockXormEngine)(nil).SetDefaultCacher), arg0) } // SetExpr mocks base method. -func (m *MockXormEngine) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { +func (m *MockXormEngine) SetExpr(arg0 string, arg1 any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetExpr", arg0, arg1) ret0, _ := ret[0].(*xorm.Session) @@ -2769,7 +2847,7 @@ func (m *MockXormEngine) SetExpr(arg0 string, arg1 interface{}) *xorm.Session { } // SetExpr indicates an expected call of SetExpr. -func (mr *MockXormEngineMockRecorder) SetExpr(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetExpr(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExpr", reflect.TypeOf((*MockXormEngine)(nil).SetExpr), arg0, arg1) } @@ -2781,19 +2859,19 @@ func (m *MockXormEngine) SetLogLevel(arg0 log.LogLevel) { } // SetLogLevel indicates an expected call of SetLogLevel. -func (mr *MockXormEngineMockRecorder) SetLogLevel(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetLogLevel(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogLevel", reflect.TypeOf((*MockXormEngine)(nil).SetLogLevel), arg0) } // SetLogger mocks base method. -func (m *MockXormEngine) SetLogger(logger interface{}) { +func (m *MockXormEngine) SetLogger(logger any) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetLogger", logger) } // SetLogger indicates an expected call of SetLogger. -func (mr *MockXormEngineMockRecorder) SetLogger(logger interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetLogger(logger any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogger", reflect.TypeOf((*MockXormEngine)(nil).SetLogger), logger) } @@ -2805,7 +2883,7 @@ func (m *MockXormEngine) SetMapper(arg0 names.Mapper) { } // SetMapper indicates an expected call of SetMapper. -func (mr *MockXormEngineMockRecorder) SetMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMapper", reflect.TypeOf((*MockXormEngine)(nil).SetMapper), arg0) } @@ -2817,7 +2895,7 @@ func (m *MockXormEngine) SetMaxIdleConns(arg0 int) { } // SetMaxIdleConns indicates an expected call of SetMaxIdleConns. -func (mr *MockXormEngineMockRecorder) SetMaxIdleConns(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMaxIdleConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxIdleConns", reflect.TypeOf((*MockXormEngine)(nil).SetMaxIdleConns), arg0) } @@ -2829,7 +2907,7 @@ func (m *MockXormEngine) SetMaxOpenConns(arg0 int) { } // SetMaxOpenConns indicates an expected call of SetMaxOpenConns. -func (mr *MockXormEngineMockRecorder) SetMaxOpenConns(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetMaxOpenConns(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMaxOpenConns", reflect.TypeOf((*MockXormEngine)(nil).SetMaxOpenConns), arg0) } @@ -2841,7 +2919,7 @@ func (m *MockXormEngine) SetQuotePolicy(arg0 dialects.QuotePolicy) { } // SetQuotePolicy indicates an expected call of SetQuotePolicy. -func (mr *MockXormEngineMockRecorder) SetQuotePolicy(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetQuotePolicy(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQuotePolicy", reflect.TypeOf((*MockXormEngine)(nil).SetQuotePolicy), arg0) } @@ -2853,7 +2931,7 @@ func (m *MockXormEngine) SetSchema(arg0 string) { } // SetSchema indicates an expected call of SetSchema. -func (mr *MockXormEngineMockRecorder) SetSchema(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetSchema(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSchema", reflect.TypeOf((*MockXormEngine)(nil).SetSchema), arg0) } @@ -2865,7 +2943,7 @@ func (m *MockXormEngine) SetTZDatabase(tz *time.Location) { } // SetTZDatabase indicates an expected call of SetTZDatabase. -func (mr *MockXormEngineMockRecorder) SetTZDatabase(tz interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTZDatabase(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZDatabase", reflect.TypeOf((*MockXormEngine)(nil).SetTZDatabase), tz) } @@ -2877,7 +2955,7 @@ func (m *MockXormEngine) SetTZLocation(tz *time.Location) { } // SetTZLocation indicates an expected call of SetTZLocation. -func (mr *MockXormEngineMockRecorder) SetTZLocation(tz interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTZLocation(tz any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTZLocation", reflect.TypeOf((*MockXormEngine)(nil).SetTZLocation), tz) } @@ -2889,7 +2967,7 @@ func (m *MockXormEngine) SetTableMapper(arg0 names.Mapper) { } // SetTableMapper indicates an expected call of SetTableMapper. -func (mr *MockXormEngineMockRecorder) SetTableMapper(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTableMapper(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTableMapper", reflect.TypeOf((*MockXormEngine)(nil).SetTableMapper), arg0) } @@ -2901,7 +2979,7 @@ func (m *MockXormEngine) SetTagIdentifier(arg0 string) { } // SetTagIdentifier indicates an expected call of SetTagIdentifier. -func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTagIdentifier", reflect.TypeOf((*MockXormEngine)(nil).SetTagIdentifier), arg0) } @@ -2909,7 +2987,7 @@ func (mr *MockXormEngineMockRecorder) SetTagIdentifier(arg0 interface{}) *gomock // ShowSQL mocks base method. func (m *MockXormEngine) ShowSQL(show ...bool) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range show { varargs = append(varargs, a) } @@ -2917,7 +2995,7 @@ func (m *MockXormEngine) ShowSQL(show ...bool) { } // ShowSQL indicates an expected call of ShowSQL. -func (mr *MockXormEngineMockRecorder) ShowSQL(show ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) ShowSQL(show ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowSQL", reflect.TypeOf((*MockXormEngine)(nil).ShowSQL), show...) } @@ -2925,7 +3003,7 @@ func (mr *MockXormEngineMockRecorder) ShowSQL(show ...interface{}) *gomock.Call // Sqlx mocks base method. func (m *MockXormEngine) Sqlx(sql string, args ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{sql} + varargs := []any{sql} for _, a := range args { varargs = append(varargs, a) } @@ -2935,9 +3013,9 @@ func (m *MockXormEngine) Sqlx(sql string, args ...any) *xorm.Session { } // Sqlx indicates an expected call of Sqlx. -func (mr *MockXormEngineMockRecorder) Sqlx(sql interface{}, args ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sqlx(sql any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{sql}, args...) + varargs := append([]any{sql}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sqlx", reflect.TypeOf((*MockXormEngine)(nil).Sqlx), varargs...) } @@ -2950,13 +3028,13 @@ func (m *MockXormEngine) StoreEngine(storeEngine string) *xorm.Session { } // StoreEngine indicates an expected call of StoreEngine. -func (mr *MockXormEngineMockRecorder) StoreEngine(storeEngine interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) StoreEngine(storeEngine any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreEngine", reflect.TypeOf((*MockXormEngine)(nil).StoreEngine), storeEngine) } // Sum mocks base method. -func (m *MockXormEngine) Sum(bean interface{}, colName string) (float64, error) { +func (m *MockXormEngine) Sum(bean any, colName string) (float64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sum", bean, colName) ret0, _ := ret[0].(float64) @@ -2965,13 +3043,13 @@ func (m *MockXormEngine) Sum(bean interface{}, colName string) (float64, error) } // Sum indicates an expected call of Sum. -func (mr *MockXormEngineMockRecorder) Sum(bean, colName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sum(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockXormEngine)(nil).Sum), bean, colName) } // SumInt mocks base method. -func (m *MockXormEngine) SumInt(bean interface{}, colName string) (int64, error) { +func (m *MockXormEngine) SumInt(bean any, colName string) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SumInt", bean, colName) ret0, _ := ret[0].(int64) @@ -2980,15 +3058,15 @@ func (m *MockXormEngine) SumInt(bean interface{}, colName string) (int64, error) } // SumInt indicates an expected call of SumInt. -func (mr *MockXormEngineMockRecorder) SumInt(bean, colName interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SumInt(bean, colName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumInt", reflect.TypeOf((*MockXormEngine)(nil).SumInt), bean, colName) } // Sums mocks base method. -func (m *MockXormEngine) Sums(bean interface{}, colNames ...string) ([]float64, error) { +func (m *MockXormEngine) Sums(bean any, colNames ...string) ([]float64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -2999,16 +3077,16 @@ func (m *MockXormEngine) Sums(bean interface{}, colNames ...string) ([]float64, } // Sums indicates an expected call of Sums. -func (mr *MockXormEngineMockRecorder) Sums(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sums(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sums", reflect.TypeOf((*MockXormEngine)(nil).Sums), varargs...) } // SumsInt mocks base method. -func (m *MockXormEngine) SumsInt(bean interface{}, colNames ...string) ([]int64, error) { +func (m *MockXormEngine) SumsInt(bean any, colNames ...string) ([]int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range colNames { varargs = append(varargs, a) } @@ -3019,16 +3097,16 @@ func (m *MockXormEngine) SumsInt(bean interface{}, colNames ...string) ([]int64, } // SumsInt indicates an expected call of SumsInt. -func (mr *MockXormEngineMockRecorder) SumsInt(bean interface{}, colNames ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) SumsInt(bean any, colNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, colNames...) + varargs := append([]any{bean}, colNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SumsInt", reflect.TypeOf((*MockXormEngine)(nil).SumsInt), varargs...) } // Sync mocks base method. -func (m *MockXormEngine) Sync(arg0 ...interface{}) error { +func (m *MockXormEngine) Sync(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3038,15 +3116,15 @@ func (m *MockXormEngine) Sync(arg0 ...interface{}) error { } // Sync indicates an expected call of Sync. -func (mr *MockXormEngineMockRecorder) Sync(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sync(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockXormEngine)(nil).Sync), arg0...) } // Sync2 mocks base method. -func (m *MockXormEngine) Sync2(arg0 ...interface{}) error { +func (m *MockXormEngine) Sync2(arg0 ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3056,13 +3134,13 @@ func (m *MockXormEngine) Sync2(arg0 ...interface{}) error { } // Sync2 indicates an expected call of Sync2. -func (mr *MockXormEngineMockRecorder) Sync2(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Sync2(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync2", reflect.TypeOf((*MockXormEngine)(nil).Sync2), arg0...) } // Table mocks base method. -func (m *MockXormEngine) Table(tableNameOrBean interface{}) *xorm.Session { +func (m *MockXormEngine) Table(tableNameOrBean any) *xorm.Session { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Table", tableNameOrBean) ret0, _ := ret[0].(*xorm.Session) @@ -3070,13 +3148,13 @@ func (m *MockXormEngine) Table(tableNameOrBean interface{}) *xorm.Session { } // Table indicates an expected call of Table. -func (mr *MockXormEngineMockRecorder) Table(tableNameOrBean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Table(tableNameOrBean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Table", reflect.TypeOf((*MockXormEngine)(nil).Table), tableNameOrBean) } // TableInfo mocks base method. -func (m *MockXormEngine) TableInfo(bean interface{}) (*schemas.Table, error) { +func (m *MockXormEngine) TableInfo(bean any) (*schemas.Table, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TableInfo", bean) ret0, _ := ret[0].(*schemas.Table) @@ -3085,15 +3163,15 @@ func (m *MockXormEngine) TableInfo(bean interface{}) (*schemas.Table, error) { } // TableInfo indicates an expected call of TableInfo. -func (mr *MockXormEngineMockRecorder) TableInfo(bean interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) TableInfo(bean any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableInfo", reflect.TypeOf((*MockXormEngine)(nil).TableInfo), bean) } // TableName mocks base method. -func (m *MockXormEngine) TableName(arg0 interface{}, arg1 ...bool) string { +func (m *MockXormEngine) TableName(arg0 any, arg1 ...bool) string { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -3103,9 +3181,9 @@ func (m *MockXormEngine) TableName(arg0 interface{}, arg1 ...bool) string { } // TableName indicates an expected call of TableName. -func (mr *MockXormEngineMockRecorder) TableName(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) TableName(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableName", reflect.TypeOf((*MockXormEngine)(nil).TableName), varargs...) } @@ -3118,7 +3196,7 @@ func (m *MockXormEngine) Transaction(fn func(xorm.Interface) error) error { } // Transaction indicates an expected call of Transaction. -func (mr *MockXormEngineMockRecorder) Transaction(fn interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Transaction(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transaction", reflect.TypeOf((*MockXormEngine)(nil).Transaction), fn) } @@ -3130,7 +3208,7 @@ func (m *MockXormEngine) UnMapType(arg0 reflect.Type) { } // UnMapType indicates an expected call of UnMapType. -func (mr *MockXormEngineMockRecorder) UnMapType(arg0 interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) UnMapType(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnMapType", reflect.TypeOf((*MockXormEngine)(nil).UnMapType), arg0) } @@ -3150,9 +3228,9 @@ func (mr *MockXormEngineMockRecorder) Unscoped() *gomock.Call { } // Update mocks base method. -func (m *MockXormEngine) Update(bean interface{}, condiBeans ...interface{}) (int64, error) { +func (m *MockXormEngine) Update(bean any, condiBeans ...any) (int64, error) { m.ctrl.T.Helper() - varargs := []interface{}{bean} + varargs := []any{bean} for _, a := range condiBeans { varargs = append(varargs, a) } @@ -3163,16 +3241,16 @@ func (m *MockXormEngine) Update(bean interface{}, condiBeans ...interface{}) (in } // Update indicates an expected call of Update. -func (mr *MockXormEngineMockRecorder) Update(bean interface{}, condiBeans ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Update(bean any, condiBeans ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{bean}, condiBeans...) + varargs := append([]any{bean}, condiBeans...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockXormEngine)(nil).Update), varargs...) } // UseBool mocks base method. func (m *MockXormEngine) UseBool(arg0 ...string) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -3182,15 +3260,15 @@ func (m *MockXormEngine) UseBool(arg0 ...string) *xorm.Session { } // UseBool indicates an expected call of UseBool. -func (mr *MockXormEngineMockRecorder) UseBool(arg0 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) UseBool(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseBool", reflect.TypeOf((*MockXormEngine)(nil).UseBool), arg0...) } // Where mocks base method. -func (m *MockXormEngine) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Session { +func (m *MockXormEngine) Where(arg0 any, arg1 ...any) *xorm.Session { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -3200,9 +3278,9 @@ func (m *MockXormEngine) Where(arg0 interface{}, arg1 ...interface{}) *xorm.Sess } // Where indicates an expected call of Where. -func (mr *MockXormEngineMockRecorder) Where(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockXormEngineMockRecorder) Where(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Where", reflect.TypeOf((*MockXormEngine)(nil).Where), varargs...) } @@ -3210,6 +3288,7 @@ func (mr *MockXormEngineMockRecorder) Where(arg0 interface{}, arg1 ...interface{ type MockCMuxServer struct { ctrl *gomock.Controller recorder *MockCMuxServerMockRecorder + isgomock struct{} } // MockCMuxServerMockRecorder is the mock recorder for MockCMuxServer. @@ -3246,7 +3325,7 @@ func (mr *MockCMuxServerMockRecorder) GetAddress() *gomock.Call { // Match mocks base method. func (m *MockCMuxServer) Match(matcher ...cmux.Matcher) net.Listener { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range matcher { varargs = append(varargs, a) } @@ -3256,7 +3335,7 @@ func (m *MockCMuxServer) Match(matcher ...cmux.Matcher) net.Listener { } // Match indicates an expected call of Match. -func (mr *MockCMuxServerMockRecorder) Match(matcher ...interface{}) *gomock.Call { +func (mr *MockCMuxServerMockRecorder) Match(matcher ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Match", reflect.TypeOf((*MockCMuxServer)(nil).Match), matcher...) } @@ -3264,7 +3343,7 @@ func (mr *MockCMuxServerMockRecorder) Match(matcher ...interface{}) *gomock.Call // MatchWithWriters mocks base method. func (m *MockCMuxServer) MatchWithWriters(matcher ...cmux.MatchWriter) net.Listener { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range matcher { varargs = append(varargs, a) } @@ -3274,7 +3353,7 @@ func (m *MockCMuxServer) MatchWithWriters(matcher ...cmux.MatchWriter) net.Liste } // MatchWithWriters indicates an expected call of MatchWithWriters. -func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...interface{}) *gomock.Call { +func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MatchWithWriters", reflect.TypeOf((*MockCMuxServer)(nil).MatchWithWriters), matcher...) } @@ -3283,6 +3362,7 @@ func (mr *MockCMuxServerMockRecorder) MatchWithWriters(matcher ...interface{}) * type MockConfigure struct { ctrl *gomock.Controller recorder *MockConfigureMockRecorder + isgomock struct{} } // MockConfigureMockRecorder is the mock recorder for MockConfigure. @@ -3311,7 +3391,45 @@ func (m *MockConfigure) Get(key string, v any, defaultVal string) error { } // Get indicates an expected call of Get. -func (mr *MockConfigureMockRecorder) Get(key, v, defaultVal interface{}) *gomock.Call { +func (mr *MockConfigureMockRecorder) Get(key, v, defaultVal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockConfigure)(nil).Get), key, v, defaultVal) } + +// MockNamedGoner is a mock of NamedGoner interface. +type MockNamedGoner struct { + ctrl *gomock.Controller + recorder *MockNamedGonerMockRecorder + isgomock struct{} +} + +// MockNamedGonerMockRecorder is the mock recorder for MockNamedGoner. +type MockNamedGonerMockRecorder struct { + mock *MockNamedGoner +} + +// NewMockNamedGoner creates a new mock instance. +func NewMockNamedGoner(ctrl *gomock.Controller) *MockNamedGoner { + mock := &MockNamedGoner{ctrl: ctrl} + mock.recorder = &MockNamedGonerMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockNamedGoner) EXPECT() *MockNamedGonerMockRecorder { + return m.recorder +} + +// GetGonerId mocks base method. +func (m *MockNamedGoner) GetGonerId() GonerId { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetGonerId") + ret0, _ := ret[0].(GonerId) + return ret0 +} + +// GetGonerId indicates an expected call of GetGonerId. +func (mr *MockNamedGonerMockRecorder) GetGonerId() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGonerId", reflect.TypeOf((*MockNamedGoner)(nil).GetGonerId)) +} diff --git a/templates/.gitignore b/templates/.gitignore deleted file mode 100644 index a2e585c..0000000 --- a/templates/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/go.sum \ No newline at end of file diff --git a/templates/f.go b/templates/f.go deleted file mode 100644 index 6810781..0000000 --- a/templates/f.go +++ /dev/null @@ -1,8 +0,0 @@ -package templates - -import "embed" - -//go:embed * -//go:embed */.dockerignore -//go:embed */.gitignore -var F embed.FS diff --git a/templates/web+mysql/.dockerignore b/templates/web+mysql/.dockerignore deleted file mode 100644 index a8bd336..0000000 --- a/templates/web+mysql/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -tests -*.md \ No newline at end of file diff --git a/templates/web+mysql/.gitignore b/templates/web+mysql/.gitignore deleted file mode 100644 index 90c15df..0000000 --- a/templates/web+mysql/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -bin -data -internal/priest.go \ No newline at end of file diff --git a/templates/web+mysql/Dockerfile b/templates/web+mysql/Dockerfile deleted file mode 100644 index 9d234a5..0000000 --- a/templates/web+mysql/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM golang:1.22-alpine3.19 as builder -WORKDIR /app - -RUN sed 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' -i /etc/apk/repositories && \ - apk add make git - -ENV GO111MODULE=on \ - GOPROXY=https://goproxy.cn,direct - -COPY ["go.mod", "go.sum", "Makefile", "./"] - -RUN --mount=type=cache,target=/go,id=go go mod download - -COPY cmd cmd -COPY internal internal - -#编译 -RUN --mount=type=cache,target=/go,id=go make build - -FROM alpine:3.19 -RUN sed 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' -i /etc/apk/repositories && \ - apk update && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo "Asia/Shanghai" > /etc/timezone - -WORKDIR /app -COPY config config -COPY --from=builder /app/bin/server /app/server - -ARG ENVIRONMENT=dev -ENV ENV=${ENVIRONMENT} - -CMD ./server -EXPOSE 8080 \ No newline at end of file diff --git a/templates/web+mysql/Makefile b/templates/web+mysql/Makefile deleted file mode 100644 index 5a1bd22..0000000 --- a/templates/web+mysql/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -gone: - make install-gone - go mod tidy - go generate ./... - -run: - make gone - go run cmd/server/main.go - -build: - make gone - go build -ldflags="-w -s" -tags musl -o bin/server cmd/server/main.go - - -build-docker: - docker compose build - -run-in-docker: - docker compose up - - -# for test -test: - make install-mockgen - make gone - go test ./... -v - -install-gone: - go install github.com/gone-io/gone/tools/gone@latest - -install-mockgen: - go install github.com/golang/mock/mockgen@latest \ No newline at end of file diff --git a/templates/web+mysql/README.md b/templates/web+mysql/README.md deleted file mode 100644 index 1beafb2..0000000 --- a/templates/web+mysql/README.md +++ /dev/null @@ -1,79 +0,0 @@ -# web-mysql - - -## 目录结构： - -``` -. -├── README.md -├── go.mod -├── go.sum -├── docker-compose.yaml # compose文件，通过在当前目录执行 `docker-compose up` 可以运行代码 -├── Dockerfile # 用于镜像编译 -├── Makefile # Makefile，定义了 run、build、test 等命令 -├── bin -│   └── server # 项目编译后的二进制文件 -├── cmd -│   └── server -│   └── main.go -├── config # 配置目录 -│   ├── default.properties # 默认配置 -│   ├── local.properties # 本地开发配置，不设置环境变量，会使用该配置 -│   ├── dev.properties # 开发环境配置，可以用于部署到开发环境的服务器上 -│   └── prod.properties # 生产环境配置，用于部署到生产环境使用 -├── internal -│   ├── master.go # 主 Preist 函数，用于加载框架基础依赖(本项目只依赖了 goner/gin ) 和 内部 Priest 函数 -│   ├── priest.go # 运行 make gone 生成的文件，包括一个Priest函数，用于安葬(加载)所有内部的Goner组件 -│   ├── interface # 接口包，可以包含 domain 、event、 service 等子包 -│   │   ├── domain # 用于定义业务对象(实体对象、值对象、聚合根等) -│   │   │   ├── demo.go -│   │   │   └── user.go -│   │   └── service # 内部接口包，用于管理内部接口定义 -│   │   └── i_demo.go # IDemo 接口 -│   ├── middleware # 中间件包，用于定义中间件 -│   │   ├── authorize.go -│   │   └── pub.go -│   ├── module # 模块 -│   │   └── demo # demo模块，一般情况下，一个模块与service包下的一个文件对应，实现其中定义的接口 -│   │   ├── demo_svc.go # 实现 IDemo 接口 -│   │   └── error.go # 模块内的错误编码定义 -│   ├── controller # controller目录，用于定义http服务接口 -│   │   └── demo_ctr.go # demo controller -│   ├── pkg -│   │   └── utils -│   │   └── error.go # 定义全局错误编码 -│   └── router -│   ├── auth_router.go # 定义需要鉴权的路由 -│   └── pub_router.go # 定义不需要鉴权的路由 -└── tests # 全局测试目录 - └── api # 接口测试 - └── demo.http # demo接口测试 -``` - -## 命令 - -> 假设已经安装了Golang环境 -> 下列命令使用Makefile定义，系统中需要安装Make(参考[安装make](https://blog.csdn.net/waitdeng/article/details/138849321)) - -- `make gone` - 用于生成Priest代码，在IED中运行前**⚠️必须先执行**该命令，否则代码不完整无法运行 - -- `make run` - 运行代码，已经集成了`make gone` - -- `make build` - 编译项目 -- `make build-docker` - 编译docker镜像，假设已经安装 [docker](https://www.docker.com/) - 和 [docker-compose](https://docs.docker.com/compose/install/) -- `make run-in-docker` - 在docker中运行，假设已经安装 [docker](https://www.docker.com/) - 和 [docker-compose](https://docs.docker.com/compose/install/) - -## 数据库 -在`docker-compose.yaml`中定义了数据库，默认使用`mysql`，默认用户名密码为`root/123456`，启动方法： - -```bash -docker compose up -d mysql -``` -如果另外使用数据库，请修改`config/default.properties`中的相关信息 \ No newline at end of file diff --git a/templates/web+mysql/cmd/server/main.go.tpl b/templates/web+mysql/cmd/server/main.go.tpl deleted file mode 100644 index 89cfcf2..0000000 --- a/templates/web+mysql/cmd/server/main.go.tpl +++ /dev/null @@ -1,42 +0,0 @@ -package main - -import ( - "github.com/gone-io/gone" - log "github.com/sirupsen/logrus" - "web-mysql/internal" -) - -func main() { - ////给启动流程增加traceId - //tracer.SetTraceId("", func() { - // gone.Serve(internal.MasterPriest) - //}) - - // 直接启动服务 - //gone.Serve(internal.MasterPriest) - - // 启动前注册Hook函数；更多内容参考文档：https://goner.fun/zh/guide/hooks.html - //Hook可以注册多次；支持的Hook函数有：BeforeStart、AfterStart、BeforeStop、AfterStop; - // 注意：BeforeStart、BeforeStop **后注册先执行**; AfterStart、AfterStop **先注册先执行**; - gone. - Prepare(internal.MasterPriest). - BeforeStart(func(in struct { - // 在 BeforeStart、AfterStart、BeforeStop、AfterStop Hook中，可以注入任何需要的依赖； - cemetery gone.Cemetery `gone:"gone-cemetery"` - log gone.Logger `gone:"gone-logger"` - }) { - log.Info("before start") - // 启动前执行的代码 - }). - AfterStart(func() { - // 启动后执行的代码 - }). - BeforeStop(func() { - // 停止前执行的代码 - }). - AfterStop(func() { - // 停止后执行的代码 - }). - Serve() - -} diff --git a/templates/web+mysql/config/default.properties b/templates/web+mysql/config/default.properties deleted file mode 100644 index 52f7a25..0000000 --- a/templates/web+mysql/config/default.properties +++ /dev/null @@ -1,41 +0,0 @@ -# 服务监听主机地址，默认为空 -#server.host - -# 服务端口，默认为8080 -# server.port=8080 - -# gin服务模式，可选值 debug,test,release，默认为release -server.mode=debug - -# 静态服务目录/文件，支持通配符，默认无 -#server.html-tpl-pattern= - -# 健康检查监听路径，默认无 -server.health-check=/api/health-check - -# 是否打印access log，默认true -# server.log.show-access-log=true - -# 打印access log 长度限制，0为不限制，默认为0 -# server.log.data-max-length=100 - -# 是否打印请求耗时，默认true -# server.log.show-request-time=true - -# 开启返回数据封装，开启后响应内容会封装到 json`{"code": 0, "msg": "err msg", data: $data }`中，默认true -# server.return.wrapped-data=true - -#业务代码自定义配置：http上下文中保存userId的Key -auth.user-key=user - -# 使用mysql -database.driver-name=mysql - -db.host=localhost -db.port=3306 -db.name=demo -db.username=root -db.password=123456 - -# 数据源配置 配置中，使用${key}来引用配置文件中的值 -database.dsn=${db.username}:${db.password}@tcp(${db.host}:${db.port})/${db.name}?charset=utf8mb4&loc=Local \ No newline at end of file diff --git a/templates/web+mysql/config/dev.properties b/templates/web+mysql/config/dev.properties deleted file mode 100644 index 7ab62a3..0000000 --- a/templates/web+mysql/config/dev.properties +++ /dev/null @@ -1 +0,0 @@ -server.env=dev \ No newline at end of file diff --git a/templates/web+mysql/config/local.properties b/templates/web+mysql/config/local.properties deleted file mode 100644 index d575dcc..0000000 --- a/templates/web+mysql/config/local.properties +++ /dev/null @@ -1,4 +0,0 @@ -# 本地开发环境会读取该文件的配置 -server.env=dev - -log.level=debug \ No newline at end of file diff --git a/templates/web+mysql/config/prod.properties b/templates/web+mysql/config/prod.properties deleted file mode 100644 index 76ad222..0000000 --- a/templates/web+mysql/config/prod.properties +++ /dev/null @@ -1,3 +0,0 @@ -server.env=prod - -db.host=mysql \ No newline at end of file diff --git a/templates/web+mysql/docker-compose.yaml b/templates/web+mysql/docker-compose.yaml deleted file mode 100644 index 6a3981e..0000000 --- a/templates/web+mysql/docker-compose.yaml +++ /dev/null @@ -1,31 +0,0 @@ -version: '3.8' -services: - web: - image: web - restart: unless-stopped - build: - context: . - args: - ENVIRONMENT: prod - ports: - - "8080:8080" - depends_on: - - mysql - healthcheck: # 添加健康检测 - test: [ "CMD", "curl", "-f", "http://localhost:8080/api/health-check" ] - interval: 30s - timeout: 3s - retries: 3 - start_period: 20s - - mysql: - image: mysql:8.3 - restart: unless-stopped - environment: - MYSQL_ROOT_PASSWORD: 123456 - MYSQL_DATABASE: demo - volumes: - - ./data/mysql:/var/lib/mysql - - ./scripts/mysql/initdb.d:/docker-entrypoint-initdb.d - ports: - - "3306:3306" \ No newline at end of file diff --git a/templates/web+mysql/go.mod.tpl b/templates/web+mysql/go.mod.tpl deleted file mode 100644 index 20c7152..0000000 --- a/templates/web+mysql/go.mod.tpl +++ /dev/null @@ -1,10 +0,0 @@ -module web-mysql - -go 1.21 - -toolchain go1.21.1 - -require ( - github.com/go-sql-driver/mysql v1.6.0 - github.com/gone-io/gone latest -) \ No newline at end of file diff --git a/templates/web+mysql/internal/controller/demo_ctr.go.tpl b/templates/web+mysql/internal/controller/demo_ctr.go.tpl deleted file mode 100644 index 0d71b08..0000000 --- a/templates/web+mysql/internal/controller/demo_ctr.go.tpl +++ /dev/null @@ -1,159 +0,0 @@ -package controller - -import ( - "fmt" - "github.com/gone-io/gone" - "net/http" - "net/url" - "web-mysql/internal/interface/domain" - "web-mysql/internal/interface/service" - "web-mysql/internal/pkg/utils" -) - -//go:gone -func NewDemoController() gone.Goner { - return &demoController{} -} - -type demoController struct { - gone.Flag - demoSvc service.IDemo `gone:"*"` - gone.Logger `gone:"*"` - - authRouter gone.IRouter `gone:"router-auth"` - pubRouter gone.IRouter `gone:"router-pub"` -} - -func (ctr *demoController) Mount() gone.GinMountError { - - //需要鉴权的路由分组 - ctr. - authRouter. - Group("/demo"). - GET("/show", ctr.showDemo) - - //不需要鉴权的路由分组 - ctr. - pubRouter. - Group("/demo2"). - GET("/show", ctr.showDemo). - GET("/error", ctr.error). - GET("/echo", ctr.echo) - - // http注入 演示组 - ctr. - pubRouter. - GET("/inject-query", ctr.injectQuery). - GET("/inject/:key", ctr.injectUrlParam). - POST("/inject-http-body", ctr.injectHttpBody). - GET("/inject-http-struct", ctr.injectHttpStruct) - - // demo数据 user 的增删改查，挂载到authRouter只为方便演示 - ctr. - pubRouter. - Group("/users"). - POST("", func(in struct { - req *domain.User `gone:"http,body"` - }) error { - return ctr.demoSvc.CreateUser(in.req) - }). - GET("", func() (any, error) { - return ctr.demoSvc.ListUsers() - }). - GET("/page", func(in struct { - query domain.PageQuery `gone:"http,query"` - }) (any, error) { - return ctr.demoSvc.PageUsers(in.query) - }). - GET("/:id", func(in struct { - id int64 `gone:"http,param"` - }) (any, error) { - return ctr.demoSvc.GetUserById(in.id) - }). - PUT("/:id", func(in struct { - id int64 `gone:"http,param"` - req *domain.User `gone:"http,body"` - }) error { - return ctr.demoSvc.UpdateUserById(in.id, in.req) - }). - DELETE("/:id", func(in struct { - id int64 `gone:"http,param"` - }) error { - return ctr.demoSvc.DeleteUser(in.id) - }) - - return nil -} - -type QueryReq struct { - Key string `form:"key"` -} - -// http注入query参数 -func (ctr *demoController) injectQuery(in struct { - key string `gone:"http,query"` //参数类型为string，标签中没有指定参数名时取属性名 - keyFloat float64 `gone:"http,query=key"` //参数类型为float64，标签中指定了参数名为key - keyArr []int `gone:"http,query=key"` //参数类型为[]int，标签中指定了参数名为key - - //参数类型为*QueryReq； - //类型为一个结构体或者结构体指针时，会尝试将query中的参数值注入到结构体中；结构体的属性标注和gin框架的标签标注一致 - query *QueryReq `gone:"http,query"` -}) (string, error) { - query := fmt.Sprintf("key:%s;keyFloat:%f;keyArr:%v", in.key, in.keyFloat, in.keyArr) - ctr.Infof("query=> %s", query) - ctr.Infof("query=> %v", in.query) - return query, nil -} - -func (ctr *demoController) injectUrlParam(in struct { - key string `gone:"http,param"` - keyInt int `gone:"http,param=key"` -}) (any, error) { - ctr.Infof("key: %s;keyInt: %d", in.key, in.keyInt) - return in.key, nil -} - -func (ctr *demoController) injectHttpBody(in struct { - req *Req `gone:"http,body"` -}) (any, error) { - ctr.Infof("req.Echo: %s", in.req.Echo) - return in.req, nil -} - -func (ctr *demoController) injectHttpStruct(in struct { - ctx *gone.Context `gone:"http"` - req *http.Request `gone:"http"` - url *url.URL `gone:"http"` - header http.Header `gone:"http"` -}) (any, error) { - ctr.Infof("remote ip:%s", in.ctx.RemoteIP()) - ctr.Infof("method: %s", in.req.Method) - ctr.Infof("url path:%s", in.url.Path) - ctr.Infof("header: %v", in.header) - - return "ok", nil -} - -type Req struct { - Echo string `form:"echo" json:"echo" xml:"echo"` -} - -func (ctr *demoController) showDemo(ctx *gone.Context) (any, error) { - return ctr.demoSvc.Show() -} - -func (ctr *demoController) error(ctx *gone.Context) (any, error) { - return ctr.demoSvc.Error() -} - -func (ctr *demoController) echo(ctx *gone.Context) (any, error) { - type Req struct { - Echo string `form:"echo"` - } - - var req Req - if err := ctx.Bind(&req); err != nil { - return nil, gone.NewParameterError(err.Error(), utils.ParameterParseError) - } - return ctr.demoSvc.Echo(req.Echo) -} diff --git a/templates/web+mysql/internal/interface/domain/demo.go.tpl b/templates/web+mysql/internal/interface/domain/demo.go.tpl deleted file mode 100644 index ec074e0..0000000 --- a/templates/web+mysql/internal/interface/domain/demo.go.tpl +++ /dev/null @@ -1,5 +0,0 @@ -package domain - -type DemoEntity struct { - Info string `json:"info"` -} diff --git a/templates/web+mysql/internal/interface/domain/page.go.tpl b/templates/web+mysql/internal/interface/domain/page.go.tpl deleted file mode 100644 index aad4cdd..0000000 --- a/templates/web+mysql/internal/interface/domain/page.go.tpl +++ /dev/null @@ -1,12 +0,0 @@ -package domain - -// Page 分页 -type Page[T any] struct { - List []*T `json:"list,omitempty"` - Total int64 `json:"total,omitempty"` -} - -type PageQuery struct { - Page int `form:"page"` - PageSize int `form:"pageSize"` -} diff --git a/templates/web+mysql/internal/interface/domain/user.go.tpl b/templates/web+mysql/internal/interface/domain/user.go.tpl deleted file mode 100644 index 369c838..0000000 --- a/templates/web+mysql/internal/interface/domain/user.go.tpl +++ /dev/null @@ -1,7 +0,0 @@ -package domain - -type User struct { - Id int64 `json:"id,omitempty"` - Name string `json:"name,omitempty" binding:"required"` - Email string `json:"email,omitempty"` -} diff --git a/templates/web+mysql/internal/interface/entity/User.go.tpl b/templates/web+mysql/internal/interface/entity/User.go.tpl deleted file mode 100644 index 8018160..0000000 --- a/templates/web+mysql/internal/interface/entity/User.go.tpl +++ /dev/null @@ -1,13 +0,0 @@ -package entity - -import "time" - -type User struct { - Id int64 - Name string - Email string - - CreatedAt *time.Time `xorm:"created"` - UpdatedAt *time.Time `xorm:"updated"` - DeletedAt *time.Time `xorm:"deleted"` -} diff --git a/templates/web+mysql/internal/interface/service/i_demo.go.tpl b/templates/web+mysql/internal/interface/service/i_demo.go.tpl deleted file mode 100644 index fe98b96..0000000 --- a/templates/web+mysql/internal/interface/service/i_demo.go.tpl +++ /dev/null @@ -1,16 +0,0 @@ -package service - -import "web-mysql/internal/interface/domain" - -type IDemo interface { - Show() (*domain.DemoEntity, error) - Echo(input string) (string, error) - Error() (any, error) - - CreateUser(user *domain.User) error - GetUserById(userId int64) (*domain.User, error) - ListUsers() ([]*domain.User, error) - UpdateUserById(userId int64, user *domain.User) error - DeleteUser(userId int64) error - PageUsers(query domain.PageQuery) (*domain.Page[domain.User], error) -} diff --git a/templates/web+mysql/internal/master.go.tpl b/templates/web+mysql/internal/master.go.tpl deleted file mode 100644 index c5205b1..0000000 --- a/templates/web+mysql/internal/master.go.tpl +++ /dev/null @@ -1,16 +0,0 @@ -package internal - -import ( - _ "github.com/go-sql-driver/mysql" //导入mysql驱动 - "github.com/gone-io/gone" - "github.com/gone-io/gone/goner" -) - -//go:generate gone priest -s . -p $GOPACKAGE -f Priest -o priest.go -func MasterPriest(cemetery gone.Cemetery) error { - _ = goner.XormPriest(cemetery) - _ = goner.GinPriest(cemetery) - - _ = Priest(cemetery) - return nil -} diff --git a/templates/web+mysql/internal/middleware/authorize.go.tpl b/templates/web+mysql/internal/middleware/authorize.go.tpl deleted file mode 100644 index 514d4ea..0000000 --- a/templates/web+mysql/internal/middleware/authorize.go.tpl +++ /dev/null @@ -1,44 +0,0 @@ -package middleware - -import ( - "github.com/gone-io/gone" - "github.com/gone-io/gone/goner/gin" - "net/http" - "web-mysql/internal/interface/domain" - "web-mysql/internal/pkg/utils" -) - -//go:gone -func NewAuthorizeMiddleware() gone.Goner { - return &AuthorizeMiddleware{} -} - -type AuthorizeMiddleware struct { - gone.Flag - gone.Logger `gone:"*"` - userKey string `gone:"config,auth.user-key"` -} - -func (m *AuthorizeMiddleware) Next(ctx *gone.Context) (any, error) { - if userId, err := checkToken(ctx); err != nil { - ctx.JSON(http.StatusUnauthorized, map[string]any{ - "code": err.Code(), - "msg": err.Msg(), - }) - ctx.Abort() - } else { - m.Debugf("userId:%v", userId) - ctx.Set(m.userKey, userId) - ctx.Next() - } - return nil, nil -} - -func checkToken(ctx *gin.Context) (*domain.User, gone.Error) { - //todo 修改该函数，实现鉴权的相关逻辑 - - if ctx.Query("auth") == "pass" { - return nil, nil - } - return nil, gone.NewParameterError("Unauthorized", utils.Unauthorized) -} diff --git a/templates/web+mysql/internal/middleware/pub.go.tpl b/templates/web+mysql/internal/middleware/pub.go.tpl deleted file mode 100644 index df5f785..0000000 --- a/templates/web+mysql/internal/middleware/pub.go.tpl +++ /dev/null @@ -1,22 +0,0 @@ -package middleware - -import ( - "github.com/gone-io/gone" -) - -//go:gone -func NewPlantMiddleware() gone.Goner { - return &PubMiddleware{} -} - -// PubMiddleware 公共中间件 -type PubMiddleware struct { - gone.Flag - gone.Logger `gone:"*"` -} - -func (m *PubMiddleware) Next(ctx *gone.Context) (interface{}, error) { - m.Infof("public middleware: %s", ctx.Request.URL) - //todo - return nil, nil -} diff --git a/templates/web+mysql/internal/module/demo/db.go.tpl b/templates/web+mysql/internal/module/demo/db.go.tpl deleted file mode 100644 index b20c588..0000000 --- a/templates/web+mysql/internal/module/demo/db.go.tpl +++ /dev/null @@ -1,60 +0,0 @@ -package demo - -import ( - "github.com/gone-io/gone" - "github.com/gone-io/gone/goner/gin" - "web-mysql/internal/interface/entity" -) - -//go:gone -func NewDb() gone.Goner { - return &db{} -} - -type db struct { - gone.Flag - gone.XormEngine `gone:"*"` -} - -func (d *db) createUser(user *entity.User) error { - _, err := d.Insert(user) - - //使用gone.ToError(err)来处理错误，如果err不为nil，将返回一个携带堆栈的错误，框架中间件会拦截并打印堆栈 - return gone.ToError(err) -} - -func (d *db) getUser(id int64) (*entity.User, error) { - user := &entity.User{} - has, err := d.ID(id).Get(user) - if err != nil { - return nil, gone.ToError(err) - } - if !has { - return nil, nil - } - return user, nil -} - -func (d *db) updateUser(user *entity.User) error { - _, err := d.ID(user.Id).Update(user) - return gone.ToError(err) -} - -func (d *db) deleteUser(id int64) error { - _, err := d.ID(id).Delete(&entity.User{}) - return gone.ToError(err) -} - -func (d *db) getUserList() ([]*entity.User, error) { - users := make([]*entity.User, 0) - err := d.Find(&users) - if err != nil { - return nil, gone.ToError(err) - } - return users, nil -} - -func (d *db) getUsersPage(page, pageSize int) (list []*entity.User, total int64, err error) { - count, err := d.Limit(pageSize, page*pageSize).FindAndCount(&list) - return list, count, gin.ToError(err) -} diff --git a/templates/web+mysql/internal/module/demo/demo_svc.go.tpl b/templates/web+mysql/internal/module/demo/demo_svc.go.tpl deleted file mode 100644 index a9ea4db..0000000 --- a/templates/web+mysql/internal/module/demo/demo_svc.go.tpl +++ /dev/null @@ -1,98 +0,0 @@ -package demo - -import ( - "github.com/gone-io/gone" - "net/http" - "web-mysql/internal/interface/domain" - "web-mysql/internal/interface/entity" -) - -//go:gone -func NewDemoService() gone.Goner { - return &demoService{} -} - -type demoService struct { - gone.Flag - db iDb `gone:"*"` -} - -func (svc *demoService) Show() (*domain.DemoEntity, error) { - return &domain.DemoEntity{Info: "hello, this is a demo."}, nil -} - -func (svc *demoService) Error() (any, error) { - return nil, gone.NewParameterError("parameter error1", Error1) -} - -func (svc *demoService) Echo(input string) (string, error) { - return input, nil -} - -func (svc *demoService) CreateUser(user *domain.User) error { - return svc.db.createUser(&entity.User{ - Id: user.Id, - Name: user.Name, - Email: user.Email, - }) -} -func (svc *demoService) GetUserById(userId int64) (*domain.User, error) { - user, err := svc.db.getUser(userId) - if err != nil { - return nil, err - } - if user == nil { - return nil, gone.NewParameterError("user not found", UserNotFound, http.StatusFound) - } - return &domain.User{ - Id: user.Id, - Name: user.Name, - Email: user.Email, - }, nil -} -func (svc *demoService) ListUsers() ([]*domain.User, error) { - users, err := svc.db.getUserList() - if err != nil { - return nil, err - } - var list []*domain.User - for _, user := range users { - list = append(list, &domain.User{ - Id: user.Id, - Name: user.Name, - Email: user.Email, - }) - } - return list, nil -} -func (svc *demoService) UpdateUserById(userId int64, user *domain.User) error { - return svc.db.updateUser(&entity.User{ - Id: userId, - Name: user.Name, - Email: user.Email, - }) -} -func (svc *demoService) DeleteUser(userId int64) error { - return svc.db.deleteUser(userId) -} - -func (svc *demoService) PageUsers(query domain.PageQuery) (*domain.Page[domain.User], error) { - list, total, err := svc.db.getUsersPage(query.Page, query.PageSize) - if err != nil { - return nil, err - } - - var page domain.Page[domain.User] - - page.Total = total - - for _, user := range list { - page.List = append(page.List, &domain.User{ - Id: user.Id, - Name: user.Name, - Email: user.Email, - }) - - } - return &page, nil -} diff --git a/templates/web+mysql/internal/module/demo/error.go.tpl b/templates/web+mysql/internal/module/demo/error.go.tpl deleted file mode 100644 index 0438063..0000000 --- a/templates/web+mysql/internal/module/demo/error.go.tpl +++ /dev/null @@ -1,10 +0,0 @@ -package demo - -import "web-mysql/internal/pkg/utils" - -const ModuleId = 1 - -const ( - Error1 = utils.AppId*utils.AppModuleNumber*utils.ModuleErrNumber + ModuleId*utils.ModuleErrNumber + iota - UserNotFound -) diff --git a/templates/web+mysql/internal/module/demo/i_db.go.tpl b/templates/web+mysql/internal/module/demo/i_db.go.tpl deleted file mode 100644 index 1232f68..0000000 --- a/templates/web+mysql/internal/module/demo/i_db.go.tpl +++ /dev/null @@ -1,12 +0,0 @@ -package demo - -import "web-mysql/internal/interface/entity" - -type iDb interface { - createUser(user *entity.User) error - getUser(id int64) (*entity.User, error) - updateUser(user *entity.User) error - deleteUser(id int64) error - getUserList() ([]*entity.User, error) - getUsersPage(page, pageSize int) (list []*entity.User, total int64, err error) -} diff --git a/templates/web+mysql/internal/pkg/utils/error.go.tpl b/templates/web+mysql/internal/pkg/utils/error.go.tpl deleted file mode 100644 index 0961628..0000000 --- a/templates/web+mysql/internal/pkg/utils/error.go.tpl +++ /dev/null @@ -1,18 +0,0 @@ -package utils - -// AppId 定义应用Id -const AppId = 1 - -const AppModuleNumber = 1000 -const ModuleErrNumber = 1000 - -// PubModuleId 公共错误空间的模块Id -const PubModuleId = 0 - -const ( - //Unauthorized 未授权 - Unauthorized = AppId*AppModuleNumber*ModuleErrNumber + PubModuleId*ModuleErrNumber + iota - - //ParameterParseError 参数解析错误 - ParameterParseError -) diff --git a/templates/web+mysql/internal/priest.go.tpl b/templates/web+mysql/internal/priest.go.tpl deleted file mode 100644 index ad62431..0000000 --- a/templates/web+mysql/internal/priest.go.tpl +++ /dev/null @@ -1,20 +0,0 @@ -// Code generated by gone; DO NOT EDIT. -package internal -import ( - "web-mysql/internal/controller" - "web-mysql/internal/middleware" - "web-mysql/internal/module/demo" - "web-mysql/internal/router" - "github.com/gone-io/gone" -) - -func Priest(cemetery gone.Cemetery) error { - cemetery.Bury(controller.NewDemoController()) - cemetery.Bury(middleware.NewAuthorizeMiddleware()) - cemetery.Bury(middleware.NewPlantMiddleware()) - cemetery.Bury(demo.NewDb()) - cemetery.Bury(demo.NewDemoService()) - cemetery.Bury(router.NewAuth()) - cemetery.Bury(router.NewPubRouter()) - return nil -} diff --git a/templates/web+mysql/internal/router/auth_router.go.tpl b/templates/web+mysql/internal/router/auth_router.go.tpl deleted file mode 100644 index 7945699..0000000 --- a/templates/web+mysql/internal/router/auth_router.go.tpl +++ /dev/null @@ -1,27 +0,0 @@ -package router - -import ( - "github.com/gone-io/gone" - "web-mysql/internal/middleware" -) - -const IdAuthRouter = "router-auth" - -//go:gone -func NewAuth() (gone.Goner, gone.GonerId) { - return &authRouter{}, IdAuthRouter -} - -type authRouter struct { - gone.Flag - gone.IRouter - root gone.RouteGroup `gone:"*"` - - auth *middleware.AuthorizeMiddleware `gone:"*"` - pub *middleware.PubMiddleware `gone:"*"` -} - -func (r *authRouter) AfterRevive() gone.AfterReviveError { - r.IRouter = r.root.Group("/api", r.pub.Next, r.auth.Next) - return nil -} diff --git a/templates/web+mysql/internal/router/pub_router.go.tpl b/templates/web+mysql/internal/router/pub_router.go.tpl deleted file mode 100644 index 1b6aaf2..0000000 --- a/templates/web+mysql/internal/router/pub_router.go.tpl +++ /dev/null @@ -1,25 +0,0 @@ -package router - -import ( - "github.com/gone-io/gone" - "web-mysql/internal/middleware" -) - -const IdRouterPub = "router-pub" - -//go:gone -func NewPubRouter() (gone.Goner, gone.GonerId) { - return &pubRouter{}, IdRouterPub -} - -type pubRouter struct { - gone.Flag - gone.IRouter - root gone.RouteGroup `gone:"*"` - pub *middleware.PubMiddleware `gone:"*"` -} - -func (r *pubRouter) AfterRevive() gone.AfterReviveError { - r.IRouter = r.root.Group("/api", r.pub.Next) - return nil -} diff --git a/templates/web+mysql/scripts/mysql/initdb.d/user.sql b/templates/web+mysql/scripts/mysql/initdb.d/user.sql deleted file mode 100644 index 25fdb6c..0000000 --- a/templates/web+mysql/scripts/mysql/initdb.d/user.sql +++ /dev/null @@ -1,9 +0,0 @@ -create table user -( - id int primary key auto_increment, - name varchar(64), - email varchar(255), - created_at datetime default current_timestamp, - updated_at datetime default current_timestamp on update current_timestamp, - deleted_at datetime -); \ No newline at end of file diff --git a/templates/web+mysql/tests/api/demo.http b/templates/web+mysql/tests/api/demo.http deleted file mode 100644 index 07a06f0..0000000 --- a/templates/web+mysql/tests/api/demo.http +++ /dev/null @@ -1,115 +0,0 @@ -### 鉴权失败 -GET http://localhost:8080/api/demo/show - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 401, "Response status is not 401"); - }); - - - client.test("error code is 1000000", function() { - client.assert(1000000 == response.body.code, "code is error"); - }); -%} - -### 鉴权成功 -GET http://localhost:8080/api/demo/show?auth=pass - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 200, "Response status is not 200"); - }); - - - client.test("error code is 1000000", function() { - client.assert(0 == response.body.code, "code is error"); - }); -%} - -### 无需鉴权 -GET http://localhost:8080/api/demo2/show - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 200, "Response status is not 200"); - }); - - - client.test("error code is 1000000", function() { - client.assert(0 == response.body.code, "code is error"); - }); -%} - - -### 错误 -GET http://localhost:8080/api/demo2/error - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 400, "Response status is not 400"); - }); - - - client.test("error code is 1000000", function() { - client.assert(1001000 == response.body.code, "code is error"); - }); -%} - -### echo api -GET http://localhost:8080/api/demo2/echo?echo=info - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 200, "Response status is not 200"); - }); - - - client.test("error code is 1000000", function() { - client.assert(0 == response.body.code, "code is error"); - }); - - client.test("echo data is info", function() { - client.assert('info' == response.body.data, "code is error"); - }); -%} - -### inject-query -GET http://localhost:8080/api/inject-query?key=100&key=200 - -### inject-url-define-param -GET http://localhost:8080/api/inject/100 - -### inject-http-body json -POST http://localhost:8080/api/inject-http-body -Content-Type: application/json - -{ - "echo":"hello" -} - -### inject-http-body xml -POST http://localhost:8080/api/inject-http-body -Content-Type: application/xml - - - hello - - -### inject-http-body form-data -POST http://localhost:8080/api/inject-http-body -Content-Type: multipart/form-data; boundary=WebAppBoundary - ---WebAppBoundary -Content-Disposition: form-data; name="echo" - -hello - - -### inject-http-body x-www-form-urlencoded -POST http://localhost:8080/api/inject-http-body -Content-Type: application/x-www-form-urlencoded - -echo=hello - -### inject-http-struct -GET http://localhost:8080/api/inject-http-struct diff --git a/templates/web+mysql/tests/api/http-client.env.json b/templates/web+mysql/tests/api/http-client.env.json deleted file mode 100644 index f81a90c..0000000 --- a/templates/web+mysql/tests/api/http-client.env.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dev": { - "host": "http://localhost:8080" - } -} \ No newline at end of file diff --git a/templates/web+mysql/tests/api/user.http b/templates/web+mysql/tests/api/user.http deleted file mode 100644 index a525c45..0000000 --- a/templates/web+mysql/tests/api/user.http +++ /dev/null @@ -1,29 +0,0 @@ -### 创建用户 -POST {{host}}/api/users HTTP/1.1 -content-type: application/json - -{ - "name": "degfy", - "email": "degfy@hotmail.com" -} - -### 获取用户 -GET {{host}}/api/users/1 HTTP/1.1 - -### 获取用户列表 -GET {{host}}/api/users HTTP/1.1 - -### 获取用户分页 -GET {{host}}/api/users/page?page=0&pageSize=10 HTTP/1.1 - -### 更新用户 -PUT {{host}}/api/users/1 HTTP/1.1 -content-type: application/json - -{ - "name": "dapeng", - "email": "degfy@hotmail.com" -} - -### 删除用户 -DELETE {{host}}/api/users/1 HTTP/1.1 diff --git a/templates/web/.dockerignore b/templates/web/.dockerignore deleted file mode 100644 index a8bd336..0000000 --- a/templates/web/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -tests -*.md \ No newline at end of file diff --git a/templates/web/.gitignore b/templates/web/.gitignore deleted file mode 100644 index 435fc83..0000000 --- a/templates/web/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -bin -internal/priest.go \ No newline at end of file diff --git a/templates/web/Dockerfile b/templates/web/Dockerfile deleted file mode 100644 index 9d234a5..0000000 --- a/templates/web/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM golang:1.22-alpine3.19 as builder -WORKDIR /app - -RUN sed 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' -i /etc/apk/repositories && \ - apk add make git - -ENV GO111MODULE=on \ - GOPROXY=https://goproxy.cn,direct - -COPY ["go.mod", "go.sum", "Makefile", "./"] - -RUN --mount=type=cache,target=/go,id=go go mod download - -COPY cmd cmd -COPY internal internal - -#编译 -RUN --mount=type=cache,target=/go,id=go make build - -FROM alpine:3.19 -RUN sed 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' -i /etc/apk/repositories && \ - apk update && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo "Asia/Shanghai" > /etc/timezone - -WORKDIR /app -COPY config config -COPY --from=builder /app/bin/server /app/server - -ARG ENVIRONMENT=dev -ENV ENV=${ENVIRONMENT} - -CMD ./server -EXPOSE 8080 \ No newline at end of file diff --git a/templates/web/Makefile b/templates/web/Makefile deleted file mode 100644 index 07b6436..0000000 --- a/templates/web/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -gone: - make install-gone - go mod tidy - go generate ./... - -run: - make gone - go run cmd/server/main.go - -build: - make gone - go build -ldflags="-w -s" -tags musl -o bin/server cmd/server/main.go - - -build-docker: - docker-compose build - -run-in-docker: - docker-comopose up - - -# for test -test: - make install-mockgen - make gone - go test ./... -v - -install-gone: - go install github.com/gone-io/gone/tools/gone@latest - -install-mockgen: - go install github.com/golang/mock/mockgen@latest \ No newline at end of file diff --git a/templates/web/README.md b/templates/web/README.md deleted file mode 100644 index 7387b7e..0000000 --- a/templates/web/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# ${{appName}} - - -## 目录结构： - -``` -. -├── README.md -├── go.mod -├── go.sum -├── docker-compose.yaml # compose文件，通过在当前目录执行 `docker-compose up` 可以运行代码 -├── Dockerfile # 用于镜像编译 -├── Makefile # Makefile，定义了 run、build、test 等命令 -├── bin -│   └── server # 项目编译后的二进制文件 -├── cmd -│   └── server -│   └── main.go -├── config # 配置目录 -│   ├── default.properties # 默认配置 -│   ├── local.properties # 本地开发配置，不设置环境变量，会使用该配置 -│   ├── dev.properties # 开发环境配置，可以用于部署到开发环境的服务器上 -│   └── prod.properties # 生产环境配置，用于部署到生产环境使用 -├── internal -│   ├── master.go # 主 Preist 函数，用于加载框架基础依赖(本项目只依赖了 goner/gin ) 和 内部 Priest 函数 -│   ├── priest.go # 运行 make gone 生成的文件，包括一个Priest函数，用于安葬(加载)所有内部的Goner组件 -│   ├── interface # 接口包，可以包含 domain 、event、 service 等子包 -│   │   ├── domain # 用于定义业务对象(实体对象、值对象、聚合根等) -│   │   │   ├── demo.go -│   │   │   └── user.go -│   │   └── service # 内部接口包，用于管理内部接口定义 -│   │   └── i_demo.go # IDemo 接口 -│   ├── middleware # 中间件包，用于定义中间件 -│   │   ├── authorize.go -│   │   └── pub.go -│   ├── module # 模块 -│   │   └── demo # demo模块，一般情况下，一个模块与service包下的一个文件对应，实现其中定义的接口 -│   │   ├── demo_svc.go # 实现 IDemo 接口 -│   │   └── error.go # 模块内的错误编码定义 -│   ├── controller # controller目录，用于定义http服务接口 -│   │   └── demo_ctr.go # demo controller -│   ├── pkg -│   │   └── utils -│   │   └── error.go # 定义全局错误编码 -│   └── router -│   ├── auth_router.go # 定义需要鉴权的路由 -│   └── pub_router.go # 定义不需要鉴权的路由 -└── tests # 全局测试目录 - └── api # 接口测试 - └── demo.http # demo接口测试 -``` - -## 命令 - -> 假设已经安装了Golang环境 -> 下列命令使用Makefile定义，系统中需要安装Make(参考[安装make](https://blog.csdn.net/waitdeng/article/details/138849321)) - -- `make gone` - 用于生成Priest代码，在IED中运行前**⚠️必须先执行**该命令，否则代码不完整无法运行 - -- `make run` - 运行代码，已经集成了`make gone` - -- `make build` - 编译项目 -- `make build-docker` - 编译docker镜像，假设已经安装 [docker](https://www.docker.com/) - 和 [docker-compose](https://docs.docker.com/compose/install/) -- `make run-in-docker` - 在docker中运行，假设已经安装 [docker](https://www.docker.com/) - 和 [docker-compose](https://docs.docker.com/compose/install/) diff --git a/templates/web/cmd/server/main.go.tpl b/templates/web/cmd/server/main.go.tpl deleted file mode 100644 index b8175e8..0000000 --- a/templates/web/cmd/server/main.go.tpl +++ /dev/null @@ -1,13 +0,0 @@ -package main - -import ( - "demo-structure/internal" - "github.com/gone-io/gone" - "github.com/gone-io/gone/goner/tracer" -) - -func main() { - tracer.SetTraceId("", func() { - gone.Serve(internal.MasterPriest) - }) -} diff --git a/templates/web/config/default.properties b/templates/web/config/default.properties deleted file mode 100644 index 5fd079e..0000000 --- a/templates/web/config/default.properties +++ /dev/null @@ -1 +0,0 @@ -auth.user-key=user \ No newline at end of file diff --git a/templates/web/config/dev.properties b/templates/web/config/dev.properties deleted file mode 100644 index 7ab62a3..0000000 --- a/templates/web/config/dev.properties +++ /dev/null @@ -1 +0,0 @@ -server.env=dev \ No newline at end of file diff --git a/templates/web/config/local.properties b/templates/web/config/local.properties deleted file mode 100644 index f669954..0000000 --- a/templates/web/config/local.properties +++ /dev/null @@ -1,2 +0,0 @@ -# 本地开发环境会读取该文件的配置 -server.env=dev \ No newline at end of file diff --git a/templates/web/config/prod.properties b/templates/web/config/prod.properties deleted file mode 100644 index 4b85bda..0000000 --- a/templates/web/config/prod.properties +++ /dev/null @@ -1 +0,0 @@ -server.env=prod \ No newline at end of file diff --git a/templates/web/docker-compose.yaml b/templates/web/docker-compose.yaml deleted file mode 100644 index ef27fa8..0000000 --- a/templates/web/docker-compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3' -services: - web: - image: demo-structure - build: - context: . - args: - ENVIRONMENT: prod - restart: always - ports: - - "8080:8080" \ No newline at end of file diff --git a/templates/web/go.mod.tpl b/templates/web/go.mod.tpl deleted file mode 100644 index 74e6e07..0000000 --- a/templates/web/go.mod.tpl +++ /dev/null @@ -1,7 +0,0 @@ -module demo-structure - -go 1.21 - -toolchain go1.21.1 - -require github.com/gone-io/gone latest diff --git a/templates/web/internal/controller/demo_ctr.go.tpl b/templates/web/internal/controller/demo_ctr.go.tpl deleted file mode 100644 index 3ce738b..0000000 --- a/templates/web/internal/controller/demo_ctr.go.tpl +++ /dev/null @@ -1,59 +0,0 @@ -package controller - -import ( - "demo-structure/internal/interface/service" - "demo-structure/internal/pkg/utils" - "github.com/gone-io/gone" -) - -//go:gone -func NewDemoController() gone.Goner { - return &demoController{} -} - -type demoController struct { - gone.Flag - demoSvc service.IDemo `gone:"*"` - - authRouter gone.IRouter `gone:"router-auth"` - pubRouter gone.IRouter `gone:"router-pub"` -} - -func (ctr *demoController) Mount() gone.GinMountError { - - //需要鉴权的路由分组 - ctr. - authRouter. - Group("/demo"). - GET("/show", ctr.showDemo) - - //不需要鉴权的路由分组 - ctr. - pubRouter. - Group("/demo2"). - GET("/show", ctr.showDemo). - GET("/error", ctr.error). - GET("/echo", ctr.echo) - - return nil -} - -func (ctr *demoController) showDemo(ctx *gone.Context) (any, error) { - return ctr.demoSvc.Show() -} - -func (ctr *demoController) error(ctx *gone.Context) (any, error) { - return ctr.demoSvc.Error() -} - -func (ctr *demoController) echo(ctx *gone.Context) (any, error) { - type Req struct { - Echo string `form:"echo"` - } - - var req Req - if err := ctx.Bind(&req); err != nil { - return nil, gone.NewParameterError(err.Error(), utils.ParameterParseError) - } - return ctr.demoSvc.Echo(req.Echo) -} diff --git a/templates/web/internal/interface/domain/demo.go.tpl b/templates/web/internal/interface/domain/demo.go.tpl deleted file mode 100644 index ec074e0..0000000 --- a/templates/web/internal/interface/domain/demo.go.tpl +++ /dev/null @@ -1,5 +0,0 @@ -package domain - -type DemoEntity struct { - Info string `json:"info"` -} diff --git a/templates/web/internal/interface/domain/user.go.tpl b/templates/web/internal/interface/domain/user.go.tpl deleted file mode 100644 index 4670e37..0000000 --- a/templates/web/internal/interface/domain/user.go.tpl +++ /dev/null @@ -1,5 +0,0 @@ -package domain - -type User struct { - Id int64 -} diff --git a/templates/web/internal/interface/service/i_demo.go.tpl b/templates/web/internal/interface/service/i_demo.go.tpl deleted file mode 100644 index a335492..0000000 --- a/templates/web/internal/interface/service/i_demo.go.tpl +++ /dev/null @@ -1,9 +0,0 @@ -package service - -import "demo-structure/internal/interface/domain" - -type IDemo interface { - Show() (*domain.DemoEntity, error) - Echo(input string) (string, error) - Error() (any, error) -} diff --git a/templates/web/internal/master.go.tpl b/templates/web/internal/master.go.tpl deleted file mode 100644 index e5e15b3..0000000 --- a/templates/web/internal/master.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -package internal - -import ( - "github.com/gone-io/gone" - "github.com/gone-io/gone/goner" -) - -//go:generate gone priest -s . -p $GOPACKAGE -f Priest -o priest.go -func MasterPriest(cemetery gone.Cemetery) error { - _ = goner.GinPriest(cemetery) - - _ = Priest(cemetery) - return nil -} diff --git a/templates/web/internal/middleware/authorize.go.tpl b/templates/web/internal/middleware/authorize.go.tpl deleted file mode 100644 index 7e66364..0000000 --- a/templates/web/internal/middleware/authorize.go.tpl +++ /dev/null @@ -1,43 +0,0 @@ -package middleware - -import ( - "demo-structure/internal/interface/domain" - "demo-structure/internal/pkg/utils" - "github.com/gone-io/gone" - "net/http" -) - -//go:gone -func NewAuthorizeMiddleware() gone.Goner { - return &AuthorizeMiddleware{} -} - -type AuthorizeMiddleware struct { - gone.Flag - gone.Logger `gone:"*"` - userKey string `gone:"config,auth.user-key"` -} - -func (m *AuthorizeMiddleware) Next(ctx *gone.Context) (any, error) { - if userId, err := checkToken(ctx); err != nil { - ctx.JSON(http.StatusUnauthorized, map[string]any{ - "code": err.Code(), - "msg": err.Msg(), - }) - ctx.Abort() - } else { - m.Debugf("userId:%v", userId) - ctx.Set(m.userKey, userId) - ctx.Next() - } - return nil, nil -} - -func checkToken(ctx *gone.Context) (*domain.User, gone.Error) { - //todo 修改该函数，实现鉴权的相关逻辑 - - if ctx.Query("auth") == "pass" { - return nil, nil - } - return nil, gone.NewParameterError("Unauthorized", utils.Unauthorized) -} diff --git a/templates/web/internal/middleware/pub.go.tpl b/templates/web/internal/middleware/pub.go.tpl deleted file mode 100644 index df5f785..0000000 --- a/templates/web/internal/middleware/pub.go.tpl +++ /dev/null @@ -1,22 +0,0 @@ -package middleware - -import ( - "github.com/gone-io/gone" -) - -//go:gone -func NewPlantMiddleware() gone.Goner { - return &PubMiddleware{} -} - -// PubMiddleware 公共中间件 -type PubMiddleware struct { - gone.Flag - gone.Logger `gone:"*"` -} - -func (m *PubMiddleware) Next(ctx *gone.Context) (interface{}, error) { - m.Infof("public middleware: %s", ctx.Request.URL) - //todo - return nil, nil -} diff --git a/templates/web/internal/module/demo/demo_svc.go.tpl b/templates/web/internal/module/demo/demo_svc.go.tpl deleted file mode 100644 index 01632de..0000000 --- a/templates/web/internal/module/demo/demo_svc.go.tpl +++ /dev/null @@ -1,27 +0,0 @@ -package demo - -import ( - "demo-structure/internal/interface/domain" - "github.com/gone-io/gone" -) - -//go:gone -func NewDemoService() gone.Goner { - return &demoService{} -} - -type demoService struct { - gone.Flag -} - -func (svc *demoService) Show() (*domain.DemoEntity, error) { - return &domain.DemoEntity{Info: "hello, this is a demo."}, nil -} - -func (svc *demoService) Error() (any, error) { - return nil, gone.NewParameterError("parameter error1", Error1) -} - -func (svc *demoService) Echo(input string) (string, error) { - return input, nil -} diff --git a/templates/web/internal/module/demo/error.go.tpl b/templates/web/internal/module/demo/error.go.tpl deleted file mode 100644 index 3810669..0000000 --- a/templates/web/internal/module/demo/error.go.tpl +++ /dev/null @@ -1,11 +0,0 @@ -package demo - -import "demo-structure/internal/pkg/utils" - -const ModuleId = 1 - -const ( - Error1 = utils.AppId*utils.AppModuleNumber*utils.ModuleErrNumber + ModuleId*utils.ModuleErrNumber + iota - Error2 - Error3 -) diff --git a/templates/web/internal/pkg/utils/error.go.tpl b/templates/web/internal/pkg/utils/error.go.tpl deleted file mode 100644 index 0961628..0000000 --- a/templates/web/internal/pkg/utils/error.go.tpl +++ /dev/null @@ -1,18 +0,0 @@ -package utils - -// AppId 定义应用Id -const AppId = 1 - -const AppModuleNumber = 1000 -const ModuleErrNumber = 1000 - -// PubModuleId 公共错误空间的模块Id -const PubModuleId = 0 - -const ( - //Unauthorized 未授权 - Unauthorized = AppId*AppModuleNumber*ModuleErrNumber + PubModuleId*ModuleErrNumber + iota - - //ParameterParseError 参数解析错误 - ParameterParseError -) diff --git a/templates/web/internal/router/auth_router.go.tpl b/templates/web/internal/router/auth_router.go.tpl deleted file mode 100644 index ac09791..0000000 --- a/templates/web/internal/router/auth_router.go.tpl +++ /dev/null @@ -1,27 +0,0 @@ -package router - -import ( - "demo-structure/internal/middleware" - "github.com/gone-io/gone" -) - -const IdAuthRouter = "router-auth" - -//go:gone -func NewAuth() (gone.Goner, gone.GonerId) { - return &authRouter{}, IdAuthRouter -} - -type authRouter struct { - gone.Flag - gone.IRouter - root gone.RouteGroup `gone:"*"` - - auth *middleware.AuthorizeMiddleware `gone:"*"` - pub *middleware.PubMiddleware `gone:"*"` -} - -func (r *authRouter) AfterRevive() gone.AfterReviveError { - r.IRouter = r.root.Group("/api", r.pub.Next, r.auth.Next) - return nil -} diff --git a/templates/web/internal/router/pub_router.go.tpl b/templates/web/internal/router/pub_router.go.tpl deleted file mode 100644 index fb878ba..0000000 --- a/templates/web/internal/router/pub_router.go.tpl +++ /dev/null @@ -1,25 +0,0 @@ -package router - -import ( - "demo-structure/internal/middleware" - "github.com/gone-io/gone" -) - -const IdRouterPub = "router-pub" - -//go:gone -func NewPubRouter() (gone.Goner, gone.GonerId) { - return &pubRouter{}, IdRouterPub -} - -type pubRouter struct { - gone.Flag - gone.IRouter - root gone.IRouter `gone:"gone-gin-router"` - pub *middleware.PubMiddleware `gone:"*"` -} - -func (r *pubRouter) AfterRevive() gone.AfterReviveError { - r.IRouter = r.root.Group("/api", r.pub.Next) - return nil -} diff --git a/templates/web/tests/api/demo.http b/templates/web/tests/api/demo.http deleted file mode 100644 index ab10d66..0000000 --- a/templates/web/tests/api/demo.http +++ /dev/null @@ -1,74 +0,0 @@ -### 鉴权失败 -GET http://localhost:8080/api/demo/show - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 401, "Response status is not 401"); - }); - - - client.test("error code is 1000000", function() { - client.assert(1000000 == response.body.code, "code is error"); - }); -%} - -### 鉴权成功 -GET http://localhost:8080/api/demo/show?auth=pass - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 200, "Response status is not 200"); - }); - - - client.test("error code is 1000000", function() { - client.assert(0 == response.body.code, "code is error"); - }); -%} - -### 无需鉴权 -GET http://localhost:8080/api/demo2/show - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 200, "Response status is not 200"); - }); - - - client.test("error code is 1000000", function() { - client.assert(0 == response.body.code, "code is error"); - }); -%} - - -### 错误 -GET http://localhost:8080/api/demo2/error - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 400, "Response status is not 400"); - }); - - - client.test("error code is 1000000", function() { - client.assert(1001000 == response.body.code, "code is error"); - }); -%} - -### echo api -GET http://localhost:8080/api/demo2/echo?echo=info - -> {% - client.test("Request executed successfully", function() { - client.assert(response.status === 200, "Response status is not 200"); - }); - - - client.test("error code is 1000000", function() { - client.assert(0 == response.body.code, "code is error"); - }); - - client.test("echo data is info", function() { - client.assert('info' == response.body.data, "code is error"); - }); -%} \ No newline at end of file diff --git a/tools/gone/.gitignore b/tools/gone/.gitignore deleted file mode 100644 index c5e82d7..0000000 --- a/tools/gone/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bin \ No newline at end of file diff --git a/tools/gone/Makefile b/tools/gone/Makefile deleted file mode 100644 index 2c8a3e3..0000000 --- a/tools/gone/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -build: - go build -ldflags="-w -s" -tags musl -o bin/gone main.go - -test: - go install github.com/golang/mock/mockgen@latest - make build - mockgen -package=mock -source=mock/testdata/interface.go|./bin/gone mock -o mock/testdata/mock/interface.go - diff --git a/tools/gone/app/action.go b/tools/gone/app/action.go deleted file mode 100644 index cc58b8d..0000000 --- a/tools/gone/app/action.go +++ /dev/null @@ -1,48 +0,0 @@ -package app - -import ( - "github.com/urfave/cli/v2" - "path" -) - -func CreateCommand() *cli.Command { - return &cli.Command{ - Name: "create", - Usage: "[-t ${template} [-m ${modName}]] ${appName}", - Description: "create a gone app", - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "template", - Aliases: []string{"t"}, - Value: "web", - Usage: "template: only support web、web+mysql, more will be supported in the future", - }, - - &cli.StringFlag{ - Name: "mod", - Aliases: []string{"m"}, - Usage: "modName", - }, - }, - Action: action, - } -} - -func action(c *cli.Context) error { - return doAction(c.String("template"), c.String("mod"), c.Args().Get(0)) -} - -func doAction(template, modName, appName string) error { - tplName, app, mod, err := paramsProcess(template, appName, modName) - if err != nil { - return err - } - return copyAndReplace(f, - path.Join(".", tplName), - app, - map[string]string{ - "${{appName}}": app, - "demo-structure": mod, - }, - ) -} diff --git a/tools/gone/app/action_test.go b/tools/gone/app/action_test.go deleted file mode 100644 index bffc637..0000000 --- a/tools/gone/app/action_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package app - -import ( - "github.com/stretchr/testify/assert" - "github.com/urfave/cli/v2" - "testing" -) - -func TestAction(t *testing.T) { - app := cli.App{ - Commands: []*cli.Command{ - CreateCommand(), - }, - } - - err := app.Run([]string{"", "create"}) - assert.Nil(t, err) -} diff --git a/tools/gone/app/app.go b/tools/gone/app/app.go deleted file mode 100644 index d15e106..0000000 --- a/tools/gone/app/app.go +++ /dev/null @@ -1,84 +0,0 @@ -package app - -import ( - "bytes" - "embed" - "fmt" - "github.com/gone-io/gone/templates" - log "github.com/sirupsen/logrus" - "os" - "path" - "strings" -) - -var f = templates.F - -func copyAndReplace(f embed.FS, source, target string, replacement map[string]string) error { - err := os.MkdirAll(target, 0766) - if err != nil { - return err - } - - dir, err := f.ReadDir(source) - if err != nil { - return err - } - - for _, entry := range dir { - from := path.Join(source, entry.Name()) - to := path.Join(target, strings.TrimSuffix(entry.Name(), ".tpl")) - - if entry.IsDir() { - err = copyAndReplace( - f, - from, - to, - replacement, - ) - if err != nil { - return err - } - } else { - file, err := os.OpenFile(to, os.O_RDWR|os.O_CREATE, 0644) - if err != nil { - return err - } - defer func(file *os.File) { - err := file.Close() - if err != nil { - log.Error(err) - } - }(file) - - data, err := f.ReadFile(from) - if err != nil { - return err - } - - for k, v := range replacement { - data = bytes.ReplaceAll(data, []byte(k), []byte(v)) - } - - _, err = file.Write(data) - if err != nil { - return err - } - } - } - return nil -} - -func paramsProcess(template, appName, modName string) (string, string, string, error) { - if template != "web" && template != "web+mysql" { - return "", "", "", fmt.Errorf("only support web、web+mysql, more will be supported in the future") - } - - if appName == "" { - appName = "demo" - } - - if modName == "" { - modName = appName - } - return template, appName, modName, nil -} diff --git a/tools/gone/app/app_test.go b/tools/gone/app/app_test.go deleted file mode 100644 index 587e5e6..0000000 --- a/tools/gone/app/app_test.go +++ /dev/null @@ -1,49 +0,0 @@ -package app - -import ( - "embed" - "fmt" - "github.com/stretchr/testify/assert" - "os" - "path/filepath" - "testing" -) - -func deleteFilesInDirectory(dir string) error { - files, err := os.ReadDir(dir) - if err != nil { - return fmt.Errorf("failed to read directory: %v", err) - } - - for _, file := range files { - if !file.IsDir() { - err := os.Remove(filepath.Join(dir, file.Name())) - if err != nil { - return fmt.Errorf("failed to delete file %s: %v", file.Name(), err) - } - } - } - return nil -} - -//go:embed testdata/from/* -var testF embed.FS - -func Test_copyAndReplace(t *testing.T) { - _ = deleteFilesInDirectory("testdata/to/") - err := copyAndReplace(testF, "testdata/from", "testdata/to/", map[string]string{ - "test": "x-test", - }) - assert.Nil(t, err) -} - -func Test_paramsProcess(t *testing.T) { - tpl, m, app, err := paramsProcess("", "", "") - assert.Error(t, err) - - tpl, m, app, err = paramsProcess("web", "", "") - assert.Nil(t, err) - assert.Equal(t, "web", tpl) - assert.Equal(t, "demo", m) - assert.Equal(t, "demo", app) -} diff --git a/tools/gone/app/testdata/.gitignore b/tools/gone/app/testdata/.gitignore deleted file mode 100644 index 788636f..0000000 --- a/tools/gone/app/testdata/.gitignore +++ /dev/null @@ -1 +0,0 @@ -to \ No newline at end of file diff --git a/tools/gone/app/testdata/from/sub/file.txt b/tools/gone/app/testdata/from/sub/file.txt deleted file mode 100644 index e69de29..0000000 diff --git a/tools/gone/app/testdata/from/sub/x.json b/tools/gone/app/testdata/from/sub/x.json deleted file mode 100644 index c28aa8e..0000000 --- a/tools/gone/app/testdata/from/sub/x.json +++ /dev/null @@ -1 +0,0 @@ -{"data": "test"} \ No newline at end of file diff --git a/tools/gone/app/testdata/from/xx.go.tpl b/tools/gone/app/testdata/from/xx.go.tpl deleted file mode 100644 index e69de29..0000000 diff --git a/tools/gone/main.go b/tools/gone/main.go index 1d55608..dcea510 100644 --- a/tools/gone/main.go +++ b/tools/gone/main.go @@ -1,36 +1,5 @@ package main -import ( - "github.com/gone-io/gone/tools/gone/app" - "github.com/gone-io/gone/tools/gone/mock" - "github.com/gone-io/gone/tools/gone/priest" - "github.com/urfave/cli/v2" - "log" - "os" -) - -func create() *cli.App { - return &cli.App{ - Name: "gone", - Description: "generate gone code or generate gone app", - Commands: []*cli.Command{ - priest.CreateCommand(), - mock.CreateCommand(), - app.CreateCommand(), - }, - } -} - -func run(args ...string) int { - tool := create() - err := tool.Run(args) - if err != nil { - log.Println(err.Error()) - return 1 - } - return 0 -} - func main() { - os.Exit(run(os.Args...)) + println("Please install gonectr instead of this cli: `go install github.com/gone-io/gonectr@latest`") } diff --git a/tools/gone/main_test.go b/tools/gone/main_test.go deleted file mode 100644 index 17e62ed..0000000 --- a/tools/gone/main_test.go +++ /dev/null @@ -1,11 +0,0 @@ -package main - -import ( - "testing" -) - -func Test_run(t *testing.T) { - run("-h") - - run("", "priest") -} diff --git a/tools/gone/mock/action.go b/tools/gone/mock/action.go deleted file mode 100644 index 1fad339..0000000 --- a/tools/gone/mock/action.go +++ /dev/null @@ -1,56 +0,0 @@ -package mock - -import ( - "github.com/urfave/cli/v2" - "os" - "path/filepath" -) - -func CreateCommand() *cli.Command { - return &cli.Command{ - Name: "mock", - Usage: "-f ${fromGoFile} -o ${outGoFile}", - Description: "patch code which is generated by github.com/golang/mock/mockgen, add `gone.flag` to MockStructure", - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "f", - Usage: "FromGoFile", - }, - &cli.StringFlag{ - Name: "o", - Usage: "outGoFile", - Required: true, - }, - }, - Action: action, - } -} - -func action(ctx *cli.Context) error { - return doAction(ctx.String("f"), ctx.String("o")) -} - -func doAction(fromFile, outfile string) error { - err := os.MkdirAll(filepath.Dir(outfile), os.ModePerm) - if err != nil { - return err - } - - outFile, err := os.Create(outfile) - if err != nil { - return err - } - - defer outFile.Close() - - if isInputFromPipe() { - return patchMock(os.Stdin, outFile) - } else { - file, e := getFile(fromFile) - if e != nil { - return e - } - defer file.Close() - return patchMock(file, outFile) - } -} diff --git a/tools/gone/mock/action_test.go b/tools/gone/mock/action_test.go deleted file mode 100644 index 589f7fe..0000000 --- a/tools/gone/mock/action_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package mock - -import ( - "github.com/stretchr/testify/assert" - "github.com/urfave/cli/v2" - "testing" -) - -func TestAction(t *testing.T) { - t.Run("bad ags", func(t *testing.T) { - app := cli.App{ - Commands: []*cli.Command{ - CreateCommand(), - }, - } - - err := app.Run([]string{"", "mock"}) - assert.Error(t, err) - }) - - t.Run("good args", func(t *testing.T) { - app := cli.App{ - Commands: []*cli.Command{ - CreateCommand(), - }, - } - - err := app.Run([]string{"", "mock", "-f", "testdata/testInterface.go", "-o", "testdata/mock/testInterface.go"}) - assert.Nil(t, err) - }) -} diff --git a/tools/gone/mock/mock.go b/tools/gone/mock/mock.go deleted file mode 100644 index c5f5d8d..0000000 --- a/tools/gone/mock/mock.go +++ /dev/null @@ -1,73 +0,0 @@ -package mock - -import ( - "bufio" - "github.com/pkg/errors" - "io" - "os" - "regexp" - "strings" -) - -func isInputFromPipe() bool { - fileInfo, _ := os.Stdin.Stat() - return fileInfo.Mode()&os.ModeCharDevice == 0 -} - -func getFile(filepath string) (*os.File, error) { - if filepath == "" { - return nil, errors.New("please input a file") - } - - if fileInfo, err := os.Stat(filepath); err != nil { - return nil, err - } else if fileInfo.IsDir() { - return nil, errors.New("the file provided is a directory") - } - - return os.Open(filepath) -} - -var preMatchReg = regexp.MustCompile("is a mock of .+? interface.") - -func patchMock(r io.Reader, w io.Writer) error { - reader := bufio.NewReader(r) - - var preMatchFlag bool - - for { - line, _, err := reader.ReadLine() - if err == io.EOF { - break - } - - _, err = w.Write(line) - if err != nil { - return err - } - - _, _ = w.Write([]byte("\n")) - - lineStr := string(line) - - if strings.HasPrefix(lineStr, "import (") { - _, err = w.Write([]byte("\tgoneMock \"github.com/gone-io/gone\"\n")) - if err != nil { - return err - } - } - - if preMatchReg.Match(line) { - preMatchFlag = true - } - - if preMatchFlag && strings.HasPrefix(lineStr, "type") { - _, err = w.Write([]byte("\tgoneMock.Flag\n")) - if err != nil { - return err - } - preMatchFlag = false - } - } - return nil -} diff --git a/tools/gone/mock/mock_test.go b/tools/gone/mock/mock_test.go deleted file mode 100644 index 9e7823b..0000000 --- a/tools/gone/mock/mock_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package mock - -import ( - "github.com/stretchr/testify/assert" - "testing" -) - -func Test_isInputFromPipe(t *testing.T) { - assert.False(t, isInputFromPipe()) -} - -func Test_getFile(t *testing.T) { - t.Run("filepath is empty", func(t *testing.T) { - file, err := getFile("") - assert.Error(t, err) - assert.Nil(t, file) - }) - - t.Run("file existed", func(t *testing.T) { - file, err := getFile("testdata/x-testInterface.go") - assert.Error(t, err) - assert.Nil(t, file) - }) - - t.Run("file is dir", func(t *testing.T) { - file, err := getFile("testdata") - assert.Error(t, err) - assert.Nil(t, file) - }) -} diff --git a/tools/gone/mock/testdata/interface.go b/tools/gone/mock/testdata/interface.go deleted file mode 100644 index 3d324b6..0000000 --- a/tools/gone/mock/testdata/interface.go +++ /dev/null @@ -1,7 +0,0 @@ -package testdata - -//go:generate sh -c "mockgen -source=interface.go -package=testdata -destination=testInterface.go" -type TestInterface interface { - GetSomeThing() error - DoSomeThing(bool bool) (string, error) -} diff --git a/tools/gone/mock/testdata/mock/.gitignore b/tools/gone/mock/testdata/mock/.gitignore deleted file mode 100644 index f59ec20..0000000 --- a/tools/gone/mock/testdata/mock/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/tools/gone/mock/testdata/testInterface.go b/tools/gone/mock/testdata/testInterface.go deleted file mode 100644 index de83414..0000000 --- a/tools/gone/mock/testdata/testInterface.go +++ /dev/null @@ -1,63 +0,0 @@ -// Code generated by MockGen. DO NOT EDIT. -// Source: interface.go - -// Package testdata is a generated GoMock package. -package testdata - -import ( - reflect "reflect" - - gomock "github.com/golang/mock/gomock" -) - -// MockTestInterface is a mock of TestInterface interface. -type MockTestInterface struct { - ctrl *gomock.Controller - recorder *MockTestInterfaceMockRecorder -} - -// MockTestInterfaceMockRecorder is the mock recorder for MockTestInterface. -type MockTestInterfaceMockRecorder struct { - mock *MockTestInterface -} - -// NewMockTestInterface creates a new mock instance. -func NewMockTestInterface(ctrl *gomock.Controller) *MockTestInterface { - mock := &MockTestInterface{ctrl: ctrl} - mock.recorder = &MockTestInterfaceMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockTestInterface) EXPECT() *MockTestInterfaceMockRecorder { - return m.recorder -} - -// DoSomeThing mocks base method. -func (m *MockTestInterface) DoSomeThing(bool bool) (string, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DoSomeThing", bool) - ret0, _ := ret[0].(string) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// DoSomeThing indicates an expected call of DoSomeThing. -func (mr *MockTestInterfaceMockRecorder) DoSomeThing(bool interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DoSomeThing", reflect.TypeOf((*MockTestInterface)(nil).DoSomeThing), bool) -} - -// GetSomeThing mocks base method. -func (m *MockTestInterface) GetSomeThing() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetSomeThing") - ret0, _ := ret[0].(error) - return ret0 -} - -// GetSomeThing indicates an expected call of GetSomeThing. -func (mr *MockTestInterfaceMockRecorder) GetSomeThing() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSomeThing", reflect.TypeOf((*MockTestInterface)(nil).GetSomeThing)) -} diff --git a/tools/gone/priest/action.go b/tools/gone/priest/action.go deleted file mode 100644 index 32dccf7..0000000 --- a/tools/gone/priest/action.go +++ /dev/null @@ -1,116 +0,0 @@ -package priest - -import ( - log "github.com/sirupsen/logrus" - "github.com/urfave/cli/v2" - "os" - "path/filepath" -) - -func CreateCommand() *cli.Command { - return &cli.Command{ - Name: "priest", - Usage: "-s ${scanPackageDir} -p ${pkgName} -f ${funcName} -o ${outputFilePath} [-w]", - Description: "generate gone priest function", - Flags: []cli.Flag{ - &cli.StringSliceFlag{ - Name: "scan-dir", - Aliases: []string{"s"}, - Usage: "scan package dir", - Required: true, - }, - - &cli.StringFlag{ - Name: "package", - Aliases: []string{"p"}, - Value: "", - Usage: "package name of generated code", - Required: true, - }, - - &cli.StringFlag{ - Name: "function", - Aliases: []string{"f"}, - Value: "", - Usage: "function name of generated code", - Required: true, - }, - - &cli.StringFlag{ - Name: "output", - Aliases: []string{"o"}, - Value: "", - Usage: "output filepath of generated code", - Required: true, - }, - - &cli.BoolFlag{ - Name: "stat", - Value: false, - Usage: "is stat process time", - }, - &cli.BoolFlag{ - Name: "watch", - Aliases: []string{"w"}, - Value: false, - Usage: "watch files change, and generate code when any files changed", - }, - }, - Action: action, - } -} - -func action(c *cli.Context) error { - return doAction( - c.StringSlice("scan-dir"), - c.String("package"), - c.String("function"), - c.String("output"), - c.Bool("stat"), - c.Bool("watch"), - ) -} - -func doAction( - dirs []string, - packageName, functionName, outputFile string, - showStat, isWatch bool, -) error { - gShowstat = showStat - - if len(dirs) == 0 { - wd, _ := os.Getwd() - dirs = append(dirs, wd) - } - - for i := range dirs { - dirs[i], _ = filepath.Abs(dirs[i]) - } - - if !filepath.IsAbs(outputFile) { - outputFile, _ = filepath.Abs(outputFile) - } - - loader := autoload{ - scanDir: dirs, - packageName: packageName, - functionName: functionName, - outputFile: outputFile, - } - err := loader.fillModuleInfo() - if err != nil { - log.Fatalf("loader.fillModuleInfo() err:%v", err) - return err - } - err = loader.firstGenerate() - if err != nil { - log.Fatalf("loader.firstGenerate() err:%v", err) - return err - } - - if isWatch { - log.Println("watch mode...") - doWatch(loader.reGenerate, dirs, outputFile) - } - return nil -} diff --git a/tools/gone/priest/action_test.go b/tools/gone/priest/action_test.go deleted file mode 100644 index 4e0a63e..0000000 --- a/tools/gone/priest/action_test.go +++ /dev/null @@ -1,65 +0,0 @@ -package priest - -import ( - "bytes" - "github.com/stretchr/testify/assert" - "github.com/urfave/cli/v2" - "os" - "testing" - "time" -) - -func TestAction(t *testing.T) { - t.Run("bad args", func(t *testing.T) { - app := cli.App{ - Commands: []*cli.Command{ - CreateCommand(), - }, - } - - err := app.Run([]string{"", "priest"}) - assert.Error(t, err) - }) - - t.Run("good args", func(t *testing.T) { - _ = os.Remove("testdata/x/goner-new.go") - app := cli.App{ - Commands: []*cli.Command{ - CreateCommand(), - }, - } - - ch := getWatchDoneChannel() - go func() { - time.Sleep(1 * time.Second) - file, _ := os.OpenFile("testdata/x/goner-new.go", os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644) - defer func() { - _ = file.Close() - time.Sleep(1 * time.Second) - close(ch) - }() - _, _ = file.WriteString(`package x - -import "github.com/gone-io/gone" - -//go:gone -func New2() gone.Goner { - return &goner{} -}`) - }() - - err := app.Run([]string{"", "priest", - "-s", "testdata/x", - "-p", "x", - "-f", "priest", - "-o", "testdata/x/priest.go", - "--stat", - "-w", - }) - assert.Nil(t, err) - - file, err := os.ReadFile("testdata/x/priest.go") - assert.Nil(t, err) - assert.True(t, bytes.Contains(file, []byte("cemetery.Bury(New2())"))) - }) -} diff --git a/tools/gone/priest/fileparse.go b/tools/gone/priest/fileparse.go deleted file mode 100644 index 202348f..0000000 --- a/tools/gone/priest/fileparse.go +++ /dev/null @@ -1,151 +0,0 @@ -package priest - -import ( - "bufio" - "errors" - "fmt" - "golang.org/x/tools/go/packages" - "io" - "os" - "path" - "path/filepath" - "regexp" - "strings" -) - -const ( - PriestFn FnKind = iota - NewGonerFn -) - -type Fn struct { - Name string - Kind FnKind -} - -func (f Fn) Gen(pkgName string) string { - switch f.Kind { - case PriestFn: - return fmt.Sprintf("%s%s(cemetery)", pkgName, f.Name) - //case NewGonerFn: - default: - return fmt.Sprintf("cemetery.Bury(%s%s())", pkgName, f.Name) - } -} - -type parseResult struct { - Path string - PkgName string - InjectNames []Fn -} - -const InjectTag = "gone" - -var packageReg = regexp.MustCompile("^package ([a-zA-Z][a-zA-Z0-9_]*)") -var injectReg = regexp.MustCompile(fmt.Sprintf("^//go:%s(\\s+.*|$)", InjectTag)) -var funcReg = regexp.MustCompile("^func\\s+([A-Z][a-zA-Z0-9_]*)\\s*\\((.*?)\\)") -var priestParamReg = regexp.MustCompile("^([a-zA-Z0-9_]*)\\s*gone\\.Cemetery$") - -type FnKind int - -func goFileParse(goFilepath string) (*parseResult, error) { - file, err := os.Open(goFilepath) - if err != nil { - return nil, err - } - - defer file.Close() - - reader := bufio.NewReader(file) - var PkgName string - - var InjectFns = make([]Fn, 0) - - for { - line, _, err := reader.ReadLine() - if err == io.EOF { - break - } - if PkgName == "" { - match := packageReg.FindSubmatch(line) - if len(match) == 2 { - PkgName = string(match[1]) - } - } else { - if injectReg.Match(line) { - line, _, err := reader.ReadLine() - if err == io.EOF { - return nil, errors.New("file unexpected end") - } - match := funcReg.FindSubmatch(line) - if len(match) == 3 { - paramStr := strings.TrimSpace(string(match[2])) - - if paramStr == "" { - InjectFns = append(InjectFns, Fn{ - Name: string(match[1]), - Kind: NewGonerFn, - }) - } - - if priestParamReg.MatchString(paramStr) { - InjectFns = append(InjectFns, Fn{ - Name: string(match[1]), - Kind: PriestFn, - }) - } - } - } - } - } - - if PkgName == "" || len(InjectFns) == 0 { - return nil, nil - } - absPath, _ := filepath.Abs(goFilepath) - - return &parseResult{ - Path: filepath.Dir(absPath), - PkgName: PkgName, - InjectNames: InjectFns, - }, nil -} - -func goModuleInfo(dir string) (moduleName string, moduleAbsPath string, err error) { - defer TimeStat("goModuleInfo:" + dir)() - - cfg := &packages.Config{ - Mode: packages.NeedModule, - Dir: dir, - Tests: false, - } - packageList, err := packages.Load(cfg, "") - - if err != nil { - return "", "", err - } - - p := packageList[0] - - if p.Module == nil { - file, _ := os.ReadDir(dir) - if len(file) == 0 { - err = errors.New("do not found .go file") - return - } - - for _, f := range file { - if f.IsDir() && f.Name() != ".git" { - moduleName, moduleAbsPath, err = goModuleInfo(path.Join(dir, f.Name())) - if err == nil { - return - } - } - } - err = errors.New("do not found .go file") - return - } - - moduleName, moduleAbsPath = p.Module.Path, p.Module.Dir - return -} diff --git a/tools/gone/priest/fileparse_test.go b/tools/gone/priest/fileparse_test.go deleted file mode 100644 index 3e8195a..0000000 --- a/tools/gone/priest/fileparse_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package priest - -import ( - "github.com/stretchr/testify/assert" - "os" - "testing" -) - -func Test_priestParamReg(t *testing.T) { - var s = "cemetery gone.Cemetery" - match := priestParamReg.MatchString(s) - assert.True(t, match) -} - -func Test_goModuleInfo(t *testing.T) { - t.Run("err1", func(t *testing.T) { - _, _, err := goModuleInfo("testdata/x/sub") - assert.Error(t, err) - }) - - t.Run("err2", func(t *testing.T) { - _, _, err := goModuleInfo("testdata/x/sub2/.keep") - assert.Error(t, err) - }) - - t.Run("err3", func(t *testing.T) { - _ = os.MkdirAll("testdata/x/sub3/sub/sub", 0766) - _, _, err := goModuleInfo("testdata/x/sub3") - assert.Error(t, err) - }) -} diff --git a/tools/gone/priest/loader.go b/tools/gone/priest/loader.go deleted file mode 100644 index 9e84dee..0000000 --- a/tools/gone/priest/loader.go +++ /dev/null @@ -1,233 +0,0 @@ -package priest - -import ( - "bytes" - "fmt" - "github.com/fsnotify/fsnotify" - log "github.com/sirupsen/logrus" - "os" - "path" - "path/filepath" - "runtime" - "strings" -) - -func ScanDir(dir, moduleName, moduleDir string) ([]*Pkg, error) { - packageList := make([]*Pkg, 0) - pkg, err := scanDir(dir, moduleName, moduleDir) - if err != nil { - return nil, err - } - if pkg != nil { - packageList = append(packageList, pkg) - } - children, err := scanChildrenDir(dir, moduleName, moduleDir) - if err != nil { - return nil, err - } - packageList = append(packageList, children...) - return packageList, nil -} - -func scanDir(dir, moduleName, moduleDir string) (*Pkg, error) { - defer TimeStat("scanDir:" + dir)() - dirs, err := os.ReadDir(dir) - if err != nil { - return nil, err - } - - var pkg Pkg - for i := range dirs { - if !dirs[i].IsDir() { - filename := path.Join(dir, dirs[i].Name()) - if strings.HasSuffix(filename, ".go") { - rst, err := goFileParse(filename) - if err != nil { - return nil, err - } - if rst != nil { - pkg.ID = rst.Path - pkg.Name = rst.PkgName - rel, err := filepath.Rel(moduleDir, dir) - if err != nil { - return nil, err - } - pkg.PkgPath = filepath.Join(moduleName, rel) - pkg.FuncList = append(pkg.FuncList, rst.InjectNames...) - } - } - } - } - if pkg.FuncList == nil { - return nil, nil - } - return &pkg, nil -} - -func scanChildrenDir(dir, moduleName, moduleDir string) ([]*Pkg, error) { - packageList := make([]*Pkg, 0) - - dirs, err := os.ReadDir(dir) - if err != nil { - return nil, err - } - for i := range dirs { - if dirs[i].IsDir() && dirs[i].Name() != ".git" { - list, err := ScanDir(path.Join(dir, dirs[i].Name()), moduleName, moduleDir) - if err != nil { - return nil, err - } - packageList = append(packageList, list...) - } - } - return packageList, nil -} - -type Pkg struct { - ID string //包的绝对路径 - Name string - PkgPath string - FuncList []Fn -} - -func (p *Pkg) generateFuncContent(isSelfModule bool) string { - if len(p.FuncList) > 0 { - strList := make([]string, 0) - for i := range p.FuncList { - fn := p.FuncList[i] - name := p.Name - if isSelfModule { - name = "" - } else { - name = name + "." - } - strList = append(strList, - fmt.Sprintf(" %s", fn.Gen(name)), - ) - } - return strings.Join(strList, "\n") - } - return "" -} - -func normal(pkgPath string) string { - if runtime.GOOS == "windows" { - return strings.ReplaceAll(pkgPath, "\\", "/") - } - return pkgPath -} - -func (p *Pkg) genImportContent() string { - if path.Base(p.PkgPath) != p.Name { - return fmt.Sprintf(" %s \"%s\"", p.Name, normal(p.PkgPath)) - } else { - return fmt.Sprintf(" \"%s\"", normal(p.PkgPath)) - } -} - -type autoload struct { - scanDir []string - packageName string - functionName string - outputFile string - - moduleName string - moduleDir string - - pkgsMap map[string]*Pkg -} - -func (loader *autoload) genFileContent(pkgs []*Pkg, funcName string, pkgName string) string { - imports := make([]string, 0) - funcContents := make([]string, 0) - - for i := range pkgs { - pkg := pkgs[i] - - self := loader.inSelfModule(pkg) - - funcContents = append(funcContents, pkg.generateFuncContent(self)) - if len(funcContents) > 0 && !self { - imports = append(imports, pkg.genImportContent()) - } - } - - imports = append(imports, " \"github.com/gone-io/gone\"") - - var b bytes.Buffer - - b.WriteString("// Code generated by gone; DO NOT EDIT.\n") - b.WriteString(fmt.Sprintf("package %s\n", pkgName)) - b.WriteString("import (\n") - b.WriteString(strings.Join(imports, "\n")) - b.WriteString("\n)\n\n") - - b.WriteString(fmt.Sprintf("func %s(cemetery gone.Cemetery) error {\n", funcName)) - b.WriteString(strings.Join(funcContents, "\n")) - b.WriteString("\n\treturn nil\n}\n") - return b.String() -} - -func (loader *autoload) generate(outputFile string) { - l := len(loader.pkgsMap) - packages := make([]*Pkg, 0, l) - - for _, v := range loader.pkgsMap { - packages = append(packages, v) - } - - content := loader.genFileContent(packages, loader.functionName, loader.packageName) - err := os.WriteFile(outputFile, []byte(content), 0666) - if err != nil { - log.Error("write file error:", err) - } -} - -func (loader *autoload) fillModuleInfo() error { - info, absPath, err := goModuleInfo(loader.scanDir[0]) - if err != nil { - return err - } - loader.moduleName = info - loader.moduleDir = absPath - return nil -} - -func (loader *autoload) firstGenerate() error { - packages := make([]*Pkg, 0) - for _, dir := range loader.scanDir { - pkgList, err := ScanDir(dir, loader.moduleName, loader.moduleDir) - if err != nil { - return err - } - packages = append(packages, pkgList...) - } - - loader.pkgsMap = make(map[string]*Pkg) - for _, pkg := range packages { - loader.pkgsMap[pkg.ID] = pkg - } - - loader.generate(loader.outputFile) - return nil -} - -func (loader *autoload) reGenerate(dir string, filename string, op fsnotify.Op) { - log.Infof("%v %s in %s", op, filename, dir) - pkg, err := scanDir(dir, loader.moduleName, loader.moduleDir) - if err != nil { - log.Errorf("scan %s err:%v", dir, err) - return - } - if pkg != nil { - loader.pkgsMap[pkg.ID] = pkg - } else { - delete(loader.pkgsMap, dir) - } - loader.generate(loader.outputFile) -} - -func (loader *autoload) inSelfModule(v *Pkg) bool { - abs, _ := filepath.Abs(loader.outputFile) - return filepath.Dir(abs) == v.ID -} diff --git a/tools/gone/priest/loader_test.go b/tools/gone/priest/loader_test.go deleted file mode 100644 index 1e8605e..0000000 --- a/tools/gone/priest/loader_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package priest - -import ( - "github.com/stretchr/testify/assert" - "testing" -) - -func TestScanDir(t *testing.T) { - t.Run("filepath not existed", func(t *testing.T) { - _, err := ScanDir("xxxx/xxxxx", "", "") - assert.Error(t, err) - }) - - t.Run("filepath is a file", func(t *testing.T) { - _, err := ScanDir("testdata/x/sub/.keep", "", "") - assert.Error(t, err) - }) - - t.Run("filepath is empty", func(t *testing.T) { - _, err := ScanDir("testdata/x/sub", "", "") - assert.Nil(t, err) - }) -} - -func TestPkg_generateFuncContent(t *testing.T) { - a := Pkg{} - content := a.generateFuncContent(true) - assert.Equal(t, "", content) - - a.Name = "yyy" - a.PkgPath = "zzz" - importContent := a.genImportContent() - assert.Equal(t, " yyy \"zzz\"", importContent) -} diff --git a/tools/gone/priest/stat.go b/tools/gone/priest/stat.go deleted file mode 100644 index 72313d3..0000000 --- a/tools/gone/priest/stat.go +++ /dev/null @@ -1,18 +0,0 @@ -package priest - -import ( - log "github.com/sirupsen/logrus" - "time" -) - -var gShowstat bool - -func TimeStat(processName string) func() { - if gShowstat { - beginTime := time.Now() - return func() { - log.Infof("stat <%s> process use time:%v\n", processName, time.Now().Sub(beginTime)) - } - } - return func() {} -} diff --git a/tools/gone/priest/testdata/x/.gitignore b/tools/gone/priest/testdata/x/.gitignore deleted file mode 100644 index e1eb26b..0000000 --- a/tools/gone/priest/testdata/x/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -priest.go -goner-new.go \ No newline at end of file diff --git a/tools/gone/priest/testdata/x/go.mod b/tools/gone/priest/testdata/x/go.mod deleted file mode 100644 index 398df2c..0000000 --- a/tools/gone/priest/testdata/x/go.mod +++ /dev/null @@ -1,43 +0,0 @@ -module x - -go 1.22.0 - -toolchain go1.22.2 - -require github.com/gone-io/gone v0.3.1 - -replace github.com/gone-io/gone v0.3.1 => ../../../../../ - -require ( - github.com/bytedance/sonic v1.10.2 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect - github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect - github.com/gin-gonic/gin v1.9.1 // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.17.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.6 // indirect - github.com/leodido/go-urn v1.3.0 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/soheilhy/cmux v0.1.5 // indirect - github.com/syndtr/goleveldb v1.0.0 // indirect - github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.12 // indirect - golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.27.0 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect - xorm.io/xorm v1.3.2 // indirect -) diff --git a/tools/gone/priest/testdata/x/go.sum b/tools/gone/priest/testdata/x/go.sum deleted file mode 100644 index 704e7ec..0000000 --- a/tools/gone/priest/testdata/x/go.sum +++ /dev/null @@ -1,716 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= -gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= -gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= -github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= -github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= -github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= -github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= -github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= -github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= -github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= -github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74= -github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -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/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= -github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= -github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= -github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= -github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= -github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g= -github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= -github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= -github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= -github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= -github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= -github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= -github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= -github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= -github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE= -github.com/jackc/pgtype v1.8.0/go.mod h1:PqDKcEBtllAtk/2p6z6SHdXW5UB+MhE75tUol2OKexE= -github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= -github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= -github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= -github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= -github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= -github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc= -github.com/jackc/pgx/v4 v4.12.0/go.mod h1:fE547h6VulLPA3kySjfnSG/e2D861g/50JlVUa/ub60= -github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= -github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= -github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -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= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/leodido/go-urn v1.3.0 h1:jX8FDLfW4ThVXctBNZ+3cIWnCSnrACDV73r76dy0aQQ= -github.com/leodido/go-urn v1.3.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA= -github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= -github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= -github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= -github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= -github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= -github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= -golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= -golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= -lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.18 h1:rMZhRcWrba0y3nVmdiQ7kxAgOOSq2m2f2VzjHLgEs6U= -modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= -modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= -modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI= -modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag= -modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw= -modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ= -modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c= -modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo= -modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg= -modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I= -modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs= -modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8= -modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE= -modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk= -modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w= -modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE= -modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8= -modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc= -modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU= -modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE= -modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk= -modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI= -modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE= -modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg= -modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74= -modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU= -modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU= -modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc= -modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM= -modernc.org/ccgo/v3 v3.12.65/go.mod h1:D6hQtKxPNZiY6wDBtehSGKFKmyXn53F8nGTpH+POmS4= -modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= -modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= -modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= -modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= -modernc.org/ccgo/v3 v3.12.82 h1:wudcnJyjLj1aQQCXF3IM9Gz2X6UNjw+afIghzdtn0v8= -modernc.org/ccgo/v3 v3.12.82/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= -modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= -modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= -modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= -modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg= -modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M= -modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU= -modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE= -modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso= -modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8= -modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8= -modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I= -modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk= -modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY= -modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE= -modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg= -modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM= -modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg= -modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo= -modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8= -modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ= -modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA= -modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM= -modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg= -modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE= -modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM= -modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU= -modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw= -modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M= -modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18= -modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8= -modernc.org/libc v1.11.70/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= -modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= -modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0= -modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= -modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= -modernc.org/libc v1.11.87 h1:PzIzOqtlzMDDcCzJ5cUP6h/Ku6Fa9iyflP2ccTY64aE= -modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= -modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= -modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= -modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14= -modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= -modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= -modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.14.2 h1:ohsW2+e+Qe2To1W6GNezzKGwjXwSax6R+CrhRxVaFbE= -modernc.org/sqlite v1.14.2/go.mod h1:yqfn85u8wVOE6ub5UT8VI9JjhrwBUUCNyTACN0h6Sx8= -modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= -modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= -modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY= -modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk= -modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= -modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY= -nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 h1:bvLlAPW1ZMTWA32LuZMBEGHAUOcATZjzHcotf3SWweM= -xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.2 h1:uTRRKF2jYzbZ5nsofXVUx6ncMaek+SHjWYtCXyZo1oM= -xorm.io/xorm v1.3.2/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw= diff --git a/tools/gone/priest/testdata/x/goner.go b/tools/gone/priest/testdata/x/goner.go deleted file mode 100644 index b4d3cba..0000000 --- a/tools/gone/priest/testdata/x/goner.go +++ /dev/null @@ -1,18 +0,0 @@ -package x - -import "github.com/gone-io/gone" - -//go:gone -func New() gone.Goner { - return &goner{} -} - -type goner struct { - gone.Flag -} - -//go:gone -func Priest(cemetery gone.Cemetery) error { - //todo - return nil -} diff --git a/tools/gone/priest/testdata/x/sub/.keep b/tools/gone/priest/testdata/x/sub/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/tools/gone/priest/testdata/x/sub2/sub.go b/tools/gone/priest/testdata/x/sub2/sub.go deleted file mode 100644 index d0a1f2d..0000000 --- a/tools/gone/priest/testdata/x/sub2/sub.go +++ /dev/null @@ -1,9 +0,0 @@ -package sub2 - -import "github.com/gone-io/gone" - -//go:gone -func Priest(cemetery gone.Cemetery) error { - //todo - return nil -} diff --git a/tools/gone/priest/watch.go b/tools/gone/priest/watch.go deleted file mode 100644 index 1e45a5c..0000000 --- a/tools/gone/priest/watch.go +++ /dev/null @@ -1,79 +0,0 @@ -package priest - -import ( - "github.com/fsnotify/fsnotify" - log "github.com/sirupsen/logrus" - "os" - "path/filepath" - "sync" -) - -func doWatch(fn func(string, string, fsnotify.Op), scanDirs []string, exclude string) { - watch(func(event fsnotify.Event) { - if event.Op&fsnotify.Write == fsnotify.Write || event.Op == fsnotify.Remove || event.Op == fsnotify.Create { - if exclude != event.Name && filepath.Ext(event.Name) == ".go" { - log.Infof("watch file(%s) changed", event.Name) - fn(filepath.Dir(event.Name), event.Name, event.Op) - } - } - }, scanDirs) -} - -var done chan any -var mutex sync.Mutex - -func getWatchDoneChannel() chan any { - mutex.Lock() - if done == nil { - done = make(chan any) - } - mutex.Unlock() - return done -} - -func watch(fn func(event fsnotify.Event), dirs []string) { - watcher, err := fsnotify.NewWatcher() - if err != nil { - log.Error(err) - } - defer watcher.Close() - - go func() { - for { - select { - case event, ok := <-watcher.Events: - if !ok { - return - } - fn(event) - //case err, ok := <-watcher.Errors: - // if !ok { - // return - // } - // log.Error("error:", err) - } - } - }() - - for _, dir := range dirs { - watchRecursively(watcher, dir) - } - - <-getWatchDoneChannel() -} - -func watchRecursively(watcher *fsnotify.Watcher, dir string) { - log.Info("watch ", dir) - err := watcher.Add(dir) - if err != nil { - log.Error(err) - return - } - - dirs, _ := os.ReadDir(dir) - for i := range dirs { - if dirs[i].IsDir() { - watchRecursively(watcher, filepath.Join(dir, dirs[i].Name())) - } - } -} From 685caad4dbfc7488d85c4d0667b9f3ab2541505b Mon Sep 17 00:00:00 2001 From: dapeng Date: Wed, 13 Nov 2024 18:42:07 +0800 Subject: [PATCH 6/7] doc: update readme --- README.md | 27 +++++++++++++++++++++++++++ README_CN.md | 27 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/README.md b/README.md index 4236504..1b2be95 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,33 @@ Gone is a lightweight golang dependency injection framework; a series of Goners - goner/viper, used to parse various configuration files. - ... +## Quick Start +1. Install [gonectr](https://github.com/gone-io/gonectr) and [mockgen](https://github.com/uber-go/mock/tree/main) + ```bash + go install github.com/gone-io/gonectr@latest + go install go.uber.org/mock/mockgen@latest + ``` +2. Create a new project + ```bash + gonectr create myproject + ``` +3. Run the project + ```bash + cd myproject + gonectr run ./cmd/server + ``` + Or use run Make command if you have installed [make](https://www.gnu.org/software/make/): + ```bash + cd myproject + make run + ``` + Or with docker compose: + ```bash + cd myproject + docker compose build + docker compose up + ``` + ## Dependency Injection and Startup Here's an example: ```go diff --git a/README_CN.md b/README_CN.md index 8c1e7e8..09251d5 100644 --- a/README_CN.md +++ b/README_CN.md @@ -47,6 +47,33 @@ Gone 是一个轻量级的golang依赖注入框架；内置了一系列Goners组 - goner/viper，用于解析多种配置文件 - ... +## 快速开始 +1. 安装 [gonectr](https://github.com/gone-io/gonectr) 和 [mockgen](https://github.com/uber-go/mock/tree/main) + ```bash + go install github.com/gone-io/gonectr@latest + go install go.uber.org/mock/mockgen@latest + ``` +2. 创建一个项目 + ```bash + gonectr create myproject + ``` +3. 运行项目 + ```bash + cd myproject + gonectr run ./cmd/server + ``` + 或者，使用make命令运行，如果你已经安装[make](https://www.gnu.org/software/make/): + ```bash + cd myproject + make run + ``` + 或者使用docker compose来运行: + ```bash + cd myproject + docker compose build + docker compose up + ``` + ## 依赖注入与启动 看一个例子： ```go From 55540b71bbe486d2246d004741b1da03eaba635d Mon Sep 17 00:00:00 2001 From: dapeng Date: Wed, 13 Nov 2024 18:49:43 +0800 Subject: [PATCH 7/7] test: test for go@v1.23.x --- .github/workflows/go.yml | 2 +- goner/cmux/cmux.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4dcc583..5624ee0 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["1.21.x", "1.22.x"] + version: [ "1.21.x", "1.22.x","1.23.x" ] services: redis: image: redis diff --git a/goner/cmux/cmux.go b/goner/cmux/cmux.go index bb9f854..145cd36 100644 --- a/goner/cmux/cmux.go +++ b/goner/cmux/cmux.go @@ -70,7 +70,7 @@ func (s *server) Start(gone.Cemetery) error { mutex.Unlock() s.processStartError(err) }) - <-time.After(10 * time.Millisecond) + <-time.After(20 * time.Millisecond) return err } func (s *server) processStartError(err error) {