chore: change interface{} to any (#2818)

* chore: change interface{} to any

* chore: update goctl version to 1.5.0

* chore: update goctl deps
This commit is contained in:
Kevin Wan
2023-01-24 16:32:02 +08:00
committed by GitHub
parent 7e0ac77139
commit ae87114282
221 changed files with 1910 additions and 2207 deletions

View File

@@ -33,7 +33,7 @@ func NewRequestParser(r *http.Request, resolver jsonpb.AnyResolver) (grpcurl.Req
return grpcurl.NewJSONRequestParser(body, resolver), nil
}
m := make(map[string]interface{})
m := make(map[string]any)
if err := json.NewDecoder(body).Decode(&m); err != nil {
return nil, err
}
@@ -45,7 +45,7 @@ func NewRequestParser(r *http.Request, resolver jsonpb.AnyResolver) (grpcurl.Req
return buildJsonRequestParser(m, resolver)
}
func buildJsonRequestParser(m map[string]interface{}, resolver jsonpb.AnyResolver) (
func buildJsonRequestParser(m map[string]any, resolver jsonpb.AnyResolver) (
grpcurl.RequestParser, error) {
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(m); err != nil {

View File

@@ -88,7 +88,7 @@ func TestNewRequestParserWithBadForm(t *testing.T) {
}
func TestRequestParser_buildJsonRequestParser(t *testing.T) {
parser, err := buildJsonRequestParser(map[string]interface{}{"a": make(chan int)}, nil)
parser, err := buildJsonRequestParser(map[string]any{"a": make(chan int)}, nil)
assert.NotNil(t, err)
assert.Nil(t, parser)
}

View File

@@ -63,11 +63,11 @@ func (s *Server) build() error {
return err
}
return mr.MapReduceVoid(func(source chan<- interface{}) {
return mr.MapReduceVoid(func(source chan<- any) {
for _, up := range s.upstreams {
source <- up
}
}, func(item interface{}, writer mr.Writer, cancel func(error)) {
}, func(item any, writer mr.Writer, cancel func(error)) {
up := item.(Upstream)
cli := zrpc.MustNewClient(up.Grpc)
source, err := s.createDescriptorSource(cli, up)
@@ -109,7 +109,7 @@ func (s *Server) build() error {
Handler: s.buildHandler(source, resolver, cli, m.RpcPath),
})
}
}, func(pipe <-chan interface{}, cancel func(error)) {
}, func(pipe <-chan any, cancel func(error)) {
for item := range pipe {
route := item.(rest.Route)
s.Server.AddRoute(route)