codec/frame.go

@@ -5,29 +5,40 @@ type Frame struct {
 	Data []byte
 }
 
+// NewFrame returns new frame with data
+func NewFrame(data []byte) *Frame {
+	return &Frame{Data: data}
+}
+
+// MarshalJSON returns frame data
 func (m *Frame) MarshalJSON() ([]byte, error) {
-	return m.Data, nil
+	return m.Marshal()
 }
 
+// UnmarshalJSON set frame data
 func (m *Frame) UnmarshalJSON(data []byte) error {
-	m.Data = data
-	return nil
+	return m.Unmarshal(data)
 }
 
+// ProtoMessage noop func
 func (m *Frame) ProtoMessage() {}
 
+// Reset resets frame
 func (m *Frame) Reset() {
 	*m = Frame{}
 }
 
+// String returns frame as string
 func (m *Frame) String() string {
 	return string(m.Data)
 }
 
+// Marshal returns frame data
 func (m *Frame) Marshal() ([]byte, error) {
 	return m.Data, nil
 }
 
+// Unmarshal set frame data
 func (m *Frame) Unmarshal(data []byte) error {
 	m.Data = data
 	return nil

server/options.go

@@ -16,6 +16,7 @@ import (
 	"go.unistack.org/micro/v3/network/transport"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v3/util/id"
 )
 
 // Option func
@@ -106,7 +107,7 @@ func NewOptions(opts ...Option) Options {
 		Address:          DefaultAddress,
 		Name:             DefaultName,
 		Version:          DefaultVersion,
-		ID:               DefaultID,
+		ID:               id.Must(),
 		Namespace:        DefaultNamespace,
 	}
 

server/server.go

@@ -8,7 +8,6 @@ import (
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/util/id"
 )
 
 // DefaultServer default server
@@ -21,8 +20,6 @@ var (
 	DefaultName = "server"
 	// DefaultVersion will be used if no version passed
 	DefaultVersion = "latest"
-	// DefaultID will be used if no id passed
-	DefaultID = id.Must()
 	// DefaultRegisterCheck holds func that run before register server
 	DefaultRegisterCheck = func(context.Context) error { return nil }
 	// DefaultRegisterInterval holds interval for register

util/reflect/reflect.go

@@ -90,9 +90,12 @@ func Merge(dst interface{}, mp map[string]interface{}, opts ...Option) error {
 		}
 
 		val, ok := mp[fname]
+		if !ok {
+			val, ok = mp[dfld.Name]
 			if !ok {
 				continue
 			}
+		}
 
 		sval = reflect.ValueOf(val)