change interface{} to any (#5)

* change interface{} to any * update go version
acoshift · Oct 19, 2022 · b716d97 · b716d97
1 parent 052c570
commit b716d97
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -12,11 +12,11 @@ Convert RPC style function into http.Handler
 - context.Context
 - *http.Request
 - http.ResponseWriter
-- interface{}
+- any
 
 ## Support output types
 
-- interface{}
+- any
 - error
 
 ## Usage
@@ -29,10 +29,10 @@ import "github.com/acoshift/hrpc/v3"
 
 ```go
 m := hrpc.Manager{
-	Decoder: func(r *http.Request, dst interface{}) error {
+	Decoder: func(r *http.Request, dst any) error {
 		return json.NewDecoder(r.Body).Decode(dst)
 	},
-	Encoder: func(w http.ResponseWriter, r *http.Request, res interface{}) {
+	Encoder: func(w http.ResponseWriter, r *http.Request, res any) {
 		w.Header().Set("Content-Type", "application/json; charset=utf-8")
 		json.NewEncoder(w).Encode(res)
 	},

diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module github.com/acoshift/hrpc/v3
 
-go 1.12
+go 1.19
diff --git a/hrpc.go b/hrpc.go
@@ -6,10 +6,10 @@ import (
 )
 
 // Decoder is the request decoder
-type Decoder func(*http.Request, interface{}) error
+type Decoder func(*http.Request, any) error
 
 // Encoder is the response encoder
-type Encoder func(http.ResponseWriter, *http.Request, interface{})
+type Encoder func(http.ResponseWriter, *http.Request, any)
 
 // ErrorEncoder is the error response encoder
 type ErrorEncoder func(http.ResponseWriter, *http.Request, error)
@@ -24,14 +24,14 @@ type Manager struct {
 
 func (m *Manager) decoder() Decoder {
 	if m.Decoder == nil {
-		return func(*http.Request, interface{}) error { return nil }
+		return func(*http.Request, any) error { return nil }
 	}
 	return m.Decoder
 }
 
 func (m *Manager) encoder() Encoder {
 	if m.Encoder == nil {
-		return func(http.ResponseWriter, *http.Request, interface{}) {}
+		return func(http.ResponseWriter, *http.Request, any) {}
 	}
 	return m.Encoder
 }
@@ -55,7 +55,7 @@ const (
 	miContext                 // context.Context
 	miRequest                 // *http.Request
 	miResponseWriter          // http.ResponseWriter
-	miInterface               // interface{}
+	miAny                     // any
 	miError                   // error
 )
 
@@ -79,7 +79,7 @@ func setOrPanic(m map[mapIndex]int, k mapIndex, v int) {
 // second input can be anything which will pass to RequestDecoder function.
 // first output must be the result which will pass to success handler.
 // second output must be an error interface which will pass to error handler if not nil.
-func (m *Manager) Handler(f interface{}) http.Handler {
+func (m *Manager) Handler(f any) http.Handler {
 	fv := reflect.ValueOf(f)
 	ft := fv.Type()
 	if ft.Kind() != reflect.Func {
@@ -106,7 +106,7 @@ func (m *Manager) Handler(f interface{}) http.Handler {
 		case strResponseWriter:
 			setOrPanic(mapIn, miResponseWriter, i)
 		default:
-			setOrPanic(mapIn, miInterface, i)
+			setOrPanic(mapIn, miAny, i)
 		}
 	}
 
@@ -118,15 +118,15 @@ func (m *Manager) Handler(f interface{}) http.Handler {
 		case strError:
 			setOrPanic(mapOut, miError, i)
 		default:
-			setOrPanic(mapOut, miInterface, i)
+			setOrPanic(mapOut, miAny, i)
 		}
 	}
 
 	var (
 		infType reflect.Type
 		infPtr  bool
 	)
-	if i, ok := mapIn[miInterface]; ok {
+	if i, ok := mapIn[miAny]; ok {
 		infType = ft.In(i)
 		if infType.Kind() == reflect.Ptr {
 			infType = infType.Elem()
@@ -145,7 +145,7 @@ func (m *Manager) Handler(f interface{}) http.Handler {
 			vIn[i] = reflect.ValueOf(r.Context())
 		}
 		// inject request interface
-		if i, ok := mapIn[miInterface]; ok {
+		if i, ok := mapIn[miAny]; ok {
 			rfReq := reflect.New(infType)
 			req := rfReq.Interface()
 			err := decoder(r, req)
@@ -189,7 +189,7 @@ func (m *Manager) Handler(f interface{}) http.Handler {
 			}
 		}
 		// check response
-		if i, ok := mapOut[miInterface]; ok {
+		if i, ok := mapOut[miAny]; ok {
 			encoder(w, r, vOut[i].Interface())
 		}
 

diff --git a/hrpc_test.go b/hrpc_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 )
 
-func jsonDecoder(r *http.Request, dst interface{}) error {
+func jsonDecoder(r *http.Request, dst any) error {
 	return json.NewDecoder(r.Body).Decode(dst)
 }
 
@@ -50,7 +50,7 @@ func TestHandler(t *testing.T) {
 
 	m := Manager{
 		Decoder: jsonDecoder,
-		Encoder: func(w http.ResponseWriter, r *http.Request, res interface{}) {
+		Encoder: func(w http.ResponseWriter, r *http.Request, res any) {
 			callSuccess = true
 		},
 		ErrorEncoder: func(w http.ResponseWriter, r *http.Request, err error) {
@@ -59,7 +59,7 @@ func TestHandler(t *testing.T) {
 		Validate: true,
 	}
 
-	h := m.Handler(func(ctx context.Context, req *requestType) (interface{}, error) {
+	h := m.Handler(func(ctx context.Context, req *requestType) (any, error) {
 		if req.Data != 1 {
 			t.Fatalf("invalid data")
 		}
@@ -113,15 +113,15 @@ func TestHandler(t *testing.T) {
 	h.ServeHTTP(w, r)
 	mustError()
 
-	h = m.Handler(func(ctx context.Context, req *requestType) (interface{}, error) {
+	h = m.Handler(func(ctx context.Context, req *requestType) (any, error) {
 		return nil, errors.New("some error")
 	})
 	r = httptest.NewRequest(http.MethodPost, "http://localhost", successBody)
 	reset()
 	h.ServeHTTP(w, r)
 	mustError()
 
-	h = m.Handler(func(r *http.Request, req *requestType) (interface{}, error) {
+	h = m.Handler(func(r *http.Request, req *requestType) (any, error) {
 		return map[string]int{"ok": 1}, nil
 	})
 	r = httptest.NewRequest(http.MethodPost, "http://localhost", successBody)
@@ -136,7 +136,7 @@ func TestHandler(t *testing.T) {
 	mustNothing()
 
 	// grpc style
-	h = m.Handler(func(ctx context.Context, req *requestType, opts ...interface{}) (interface{}, error) {
+	h = m.Handler(func(ctx context.Context, req *requestType, opts ...any) (any, error) {
 		return map[string]string{"ok": "1"}, nil
 	})
 	r = httptest.NewRequest(http.MethodPost, "http://localhost", successBody)
@@ -163,7 +163,7 @@ func TestHandler(t *testing.T) {
 func TestDefault(t *testing.T) {
 	m := Manager{}
 	i := 0
-	h := m.Handler(func(ctx context.Context, req *requestType) (interface{}, error) {
+	h := m.Handler(func(ctx context.Context, req *requestType) (any, error) {
 		if i == 0 {
 			i++
 			return req, nil
@@ -193,24 +193,24 @@ func TestInvalidF(t *testing.T) {
 	}()
 	func() {
 		defer p()
-		m.Handler(func(ctx interface{}, req interface{}) (interface{}, error) {
+		m.Handler(func(ctx any, req any) (any, error) {
 			return nil, nil
 		})
 	}()
 	func() {
 		defer p()
-		m.Handler(func(ctx context.Context, req interface{}) (interface{}, interface{}) {
+		m.Handler(func(ctx context.Context, req any) (any, any) {
 			return nil, nil
 		})
 	}()
 }
 
 func ExampleManager() {
 	m := Manager{
-		Decoder: func(r *http.Request, dst interface{}) error {
+		Decoder: func(r *http.Request, dst any) error {
 			return json.NewDecoder(r.Body).Decode(dst)
 		},
-		Encoder: func(w http.ResponseWriter, r *http.Request, res interface{}) {
+		Encoder: func(w http.ResponseWriter, r *http.Request, res any) {
 			w.Header().Set("Content-Type", "application/json; charset=utf-8")
 			json.NewEncoder(w).Encode(res)
 		},