Refactor interface to any (#123)

* refactor(maps): Refactor interface to any Signed-off-by: Flc゛ <[email protected]> * refactor(debug): Refactor interface to any Signed-off-by: Flc゛ <[email protected]> * refactor(codec): Refactor interface to any Signed-off-by: Flc゛ <[email protected]> * refactor(event): Refactor interface to any Signed-off-by: Flc゛ <[email protected]> --------- Signed-off-by: Flc゛ <[email protected]>
go-fries · Mar 4, 2024 · d5a8290 · d5a8290
1 parent ea8de18
commit d5a8290
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/codec/codec.go b/codec/codec.go
@@ -2,8 +2,8 @@ package codec
 
 type Codec interface {
 	// Marshal the given data into bytes.
-	Marshal(data interface{}) ([]byte, error)
+	Marshal(data any) ([]byte, error)
 
 	// Unmarshal the given bytes into dest.
-	Unmarshal(src []byte, dest interface{}) error
+	Unmarshal(src []byte, dest any) error
 }
diff --git a/codec/json/json.go b/codec/json/json.go
@@ -10,10 +10,10 @@ var Codec codec.Codec = &jsonCodec{}
 
 type jsonCodec struct{}
 
-func (j *jsonCodec) Marshal(data interface{}) ([]byte, error) {
+func (j *jsonCodec) Marshal(data any) ([]byte, error) {
 	return json.Marshal(data)
 }
 
-func (j *jsonCodec) Unmarshal(src []byte, dest interface{}) error {
+func (j *jsonCodec) Unmarshal(src []byte, dest any) error {
 	return json.Unmarshal(src, dest)
 }
diff --git a/codec/json/json_test.go b/codec/json/json_test.go
@@ -26,7 +26,7 @@ func TestJSON(t *testing.T) {
 	assert.Equal(t, bytes1, bytes2)
 
 	// unmarshal
-	dest1, dest2 := make(map[string]interface{}), make(map[string]interface{})
+	dest1, dest2 := make(map[string]any), make(map[string]any)
 	assert.NoError(t, json.Unmarshal(bytes1, &dest1))
 	assert.NoError(t, j1.Unmarshal(bytes1, &dest2))
 

diff --git a/crontab/server.go b/crontab/server.go
@@ -114,7 +114,7 @@ func (s *Server) Stop(_ context.Context) error {
 	return nil
 }
 
-func (s *Server) log(v ...interface{}) {
+func (s *Server) log(v ...any) {
 	if s.debug {
 		log.Println(v...)
 	}

diff --git a/debug/dump.go b/debug/dump.go
@@ -9,20 +9,20 @@ import (
 // Dump dumps the given values.
 // It is a wrapper for spew.Dump(https://github.com/davecgh/go-spew)
 // This is useful for debugging.
-func Dump(v ...interface{}) {
+func Dump(v ...any) {
 	spew.Dump(v...)
 }
 
 // Sdump the given values and returns the result.
 // It's a wrapper for spew.Sdump(https://github.com/davecgh/go-spew)
 // This is useful for debugging.
-func Sdump(v ...interface{}) string {
+func Sdump(v ...any) string {
 	return spew.Sdump(v...)
 }
 
 // Fdump the given values to the given writer.
 // It's a wrapper for spew.Fdump(https://github.com/davecgh/go-spew)
 // This is useful for debugging.
-func Fdump(w io.Writer, v ...interface{}) {
+func Fdump(w io.Writer, v ...any) {
 	spew.Fdump(w, v...)
 }
diff --git a/event/dispatcher.go b/event/dispatcher.go
@@ -16,10 +16,10 @@ func (e Event) String() string {
 
 type Listener interface {
 	Listen() []Event
-	Handle(event Event, data interface{})
+	Handle(event Event, data any)
 }
 
-type RecoveryHandler func(err interface{}, listener Listener, event Event, data interface{})
+type RecoveryHandler func(err any, listener Listener, event Event, data any)
 
 type Dispatcher struct {
 	listeners map[Event][]Listener
@@ -38,7 +38,7 @@ func WithRecovery(handler RecoveryHandler) Option {
 	}
 }
 
-var DefaultRecovery RecoveryHandler = func(err interface{}, listener Listener, event Event, data interface{}) {
+var DefaultRecovery RecoveryHandler = func(err any, listener Listener, event Event, data any) {
 	log.Errorf("[Event] handler panic listener: %v, event: %s, data: %v, err: %v", listener, event, data, err)
 }
 
@@ -69,7 +69,7 @@ func (d *Dispatcher) AddListener(listener ...Listener) {
 	}
 }
 
-func (d *Dispatcher) Dispatch(event Event, data interface{}) {
+func (d *Dispatcher) Dispatch(event Event, data any) {
 	d.rw.RLock()
 	defer d.rw.RUnlock()
 
@@ -85,7 +85,7 @@ func (d *Dispatcher) Dispatch(event Event, data interface{}) {
 	}
 }
 
-func (d *Dispatcher) handle(listener Listener, event Event, data interface{}) {
+func (d *Dispatcher) handle(listener Listener, event Event, data any) {
 	if d.recovery != nil {
 		defer func() {
 			if err := recover(); err != nil {

diff --git a/event/dispatcher_test.go b/event/dispatcher_test.go
@@ -10,8 +10,8 @@ import (
 
 type result struct {
 	event Event
-	data  interface{}
-	err   interface{}
+	data  any
+	err   any
 }
 
 var recv = make(chan result, 1)
@@ -31,7 +31,7 @@ func (l *testListener) Listen() []Event {
 	}
 }
 
-func (l *testListener) Handle(event Event, data interface{}) {
+func (l *testListener) Handle(event Event, data any) {
 	if s, ok := data.(string); ok {
 		recv <- result{
 			event: event,
@@ -50,7 +50,7 @@ func (l *test2Listener) Listen() []Event {
 	}
 }
 
-func (l *test2Listener) Handle(event Event, data interface{}) {
+func (l *test2Listener) Handle(event Event, data any) {
 	recv <- result{
 		event: event,
 		data:  data,
@@ -60,7 +60,7 @@ func (l *test2Listener) Handle(event Event, data interface{}) {
 func TestDispatcher(t *testing.T) {
 	var (
 		d = NewDispatcher(
-			WithRecovery(func(err interface{}, _ Listener, event Event, data interface{}) {
+			WithRecovery(func(err any, _ Listener, event Event, data any) {
 				recv <- result{
 					event: event,
 					data:  data,

diff --git a/maps/maps.go b/maps/maps.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 )
 
-type M map[string]interface{}
+type M map[string]any
 
-func (m M) Maps() map[string]interface{} {
+func (m M) Maps() map[string]any {
 	return m
 }
 
-func (m M) All() map[string]interface{} {
+func (m M) All() map[string]any {
 	return m.Maps()
 }
 
@@ -34,20 +34,20 @@ func (m M) Has(k string) bool {
 	return ok
 }
 
-func (m M) Get(k string) (interface{}, bool) {
+func (m M) Get(k string) (any, bool) {
 	v, ok := m[k]
 	return v, ok
 }
 
-func (m M) GetX(k string) interface{} {
+func (m M) GetX(k string) any {
 	if v, ok := m.Get(k); ok {
 		return v
 	}
 
 	panic(fmt.Sprintf("maps: key %s not exists", k))
 }
 
-func (m M) Set(k string, v interface{}) M {
+func (m M) Set(k string, v any) M {
 	m[k] = v
 	return m
 }
@@ -65,8 +65,8 @@ func (m M) Keys() []string {
 	return keys
 }
 
-func (m M) Values() []interface{} {
-	values := make([]interface{}, 0, len(m))
+func (m M) Values() []any {
+	values := make([]any, 0, len(m))
 	for _, v := range m {
 		values = append(values, v)
 	}
@@ -91,7 +91,7 @@ func (m M) Unless(guard bool, fn func(maps M) M) M {
 	return m
 }
 
-func (m M) Map(fn func(k string, v interface{}) (string, interface{})) M {
+func (m M) Map(fn func(k string, v any) (string, any)) M {
 	n := make(M, len(m))
 	for k, v := range m {
 		k, v := fn(k, v)
@@ -100,7 +100,7 @@ func (m M) Map(fn func(k string, v interface{}) (string, interface{})) M {
 	return n
 }
 
-func (m M) Each(fn func(k string, v interface{})) {
+func (m M) Each(fn func(k string, v any)) {
 	for k, v := range m {
 		fn(k, v)
 	}