unistack-org/micro-tests
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update deps

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2021-04-10 01:30:23 +03:00
parent 0bc05ddffc
commit c7dfa3adca
8 changed files with 306 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
util/reflect/reflect.go
View File

@@ -1,258 +0,0 @@
package reflect
import (
"errors"
"fmt"
"reflect"
"strconv"
"strings"
)
var (
ErrInvalidStruct = errors.New("invalid struct specified")
ErrInvalidValue = errors.New("invalid value specified")
)
func MergeMap(dst interface{}, mp map[string]interface{}, tags []string) error {
var err error
var sval reflect.Value
var fname string
dviface := reflect.ValueOf(dst)
if dviface.Kind() == reflect.Ptr {
dviface = dviface.Elem()
}
if dviface.Kind() != reflect.Struct {
return ErrInvalidStruct
}
dtype := dviface.Type()
for idx := 0; idx < dtype.NumField(); idx++ {
dfld := dtype.Field(idx)
dval := dviface.Field(idx)
if !dval.CanSet() || len(dfld.PkgPath) != 0 || !dval.IsValid() {
continue
}
fname = ""
for _, tname := range tags {
tvalue, ok := dfld.Tag.Lookup(tname)
if !ok {
continue
}
tpart := strings.Split(tvalue, ",")
switch tname {
case "protobuf":
fname = tpart[3][5:]
default:
fname = tpart[0]
}
if fname != "" {
break
}
}
if fname == "" {
fname = strings.ToLower(dfld.Name)
}
val, ok := mp[fname]
if !ok {
continue
}
sval = reflect.ValueOf(val)
switch dval.Kind() {
case reflect.Bool:
err = mergeBool(dval, sval)
case reflect.String:
err = mergeString(dval, sval)
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
err = mergeInt(dval, sval)
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
err = mergeUint(dval, sval)
case reflect.Float32, reflect.Float64:
err = mergeFloat(dval, sval)
case reflect.Struct:
mp, ok := sval.Interface().(map[string]interface{})
if !ok {
return ErrInvalidValue
}
err = MergeMap(dval.Interface(), mp, tags)
/*
case reflect.Interface:
err = d.decodeBasic(name, input, outVal)
case reflect.Map:
err = mergeMap(dval, sval)
case reflect.Ptr:
err = mergePtr(dval, sval)
case reflect.Slice:
err = mergeSlice(dval, sval)
case reflect.Array:
err = mergeArray(dval, sval)
*/
default:
err = ErrInvalidValue
}
}
if err != nil {
err = fmt.Errorf("err: %v key %v invalid val %v", err, fname, sval.Interface())
}
return err
}
func mergeBool(dval reflect.Value, sval reflect.Value) error {
switch sval.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
switch sval.Int() {
case 1:
dval.SetBool(true)
case 0:
dval.SetBool(false)
default:
return ErrInvalidValue
}
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
switch sval.Uint() {
case 1:
dval.SetBool(true)
case 0:
dval.SetBool(false)
default:
return ErrInvalidValue
}
case reflect.Float32, reflect.Float64:
switch sval.Float() {
case 1:
dval.SetBool(true)
case 0:
dval.SetBool(false)
default:
return ErrInvalidValue
}
case reflect.Bool:
dval.SetBool(sval.Bool())
case reflect.String:
switch sval.String() {
case "t", "T", "true", "TRUE", "True", "1", "yes":
dval.SetBool(true)
case "f", "F", "false", "FALSE", "False", "0", "no":
dval.SetBool(false)
default:
return ErrInvalidValue
}
default:
return ErrInvalidValue
}
return nil
}
func mergeString(dval reflect.Value, sval reflect.Value) error {
switch sval.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
dval.SetString(strconv.FormatInt(sval.Int(), sval.Type().Bits()))
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
dval.SetString(strconv.FormatUint(sval.Uint(), sval.Type().Bits()))
case reflect.Float32, reflect.Float64:
dval.SetString(strconv.FormatFloat(sval.Float(), 'f', -1, sval.Type().Bits()))
case reflect.Bool:
switch sval.Bool() {
case true:
dval.SetString(strconv.FormatBool(true))
case false:
dval.SetString(strconv.FormatBool(false))
}
case reflect.String:
dval.SetString(sval.String())
default:
return ErrInvalidValue
}
return nil
}
func mergeInt(dval reflect.Value, sval reflect.Value) error {
switch sval.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
dval.SetInt(sval.Int())
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
dval.SetInt(int64(sval.Uint()))
case reflect.Float32, reflect.Float64:
dval.SetInt(int64(sval.Float()))
case reflect.Bool:
switch sval.Bool() {
case true:
dval.SetInt(1)
case false:
dval.SetInt(0)
}
case reflect.String:
l, err := strconv.ParseInt(sval.String(), 0, dval.Type().Bits())
if err != nil {
return err
}
dval.SetInt(l)
default:
return ErrInvalidValue
}
return nil
}
func mergeUint(dval reflect.Value, sval reflect.Value) error {
switch sval.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
dval.SetUint(uint64(sval.Int()))
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
dval.SetUint(sval.Uint())
case reflect.Float32, reflect.Float64:
dval.SetUint(uint64(sval.Float()))
case reflect.Bool:
switch sval.Bool() {
case true:
dval.SetUint(1)
case false:
dval.SetUint(0)
}
case reflect.String:
l, err := strconv.ParseUint(sval.String(), 0, dval.Type().Bits())
if err != nil {
return err
}
dval.SetUint(l)
default:
return ErrInvalidValue
}
return nil
}
func mergeFloat(dval reflect.Value, sval reflect.Value) error {
switch sval.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
dval.SetFloat(float64(sval.Int()))
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
dval.SetFloat(float64(sval.Uint()))
case reflect.Float32, reflect.Float64:
dval.SetFloat(sval.Float())
case reflect.Bool:
switch sval.Bool() {
case true:
dval.SetFloat(1)
case false:
dval.SetFloat(0)
}
case reflect.String:
l, err := strconv.ParseFloat(sval.String(), dval.Type().Bits())
if err != nil {
return err
}
dval.SetFloat(l)
default:
return ErrInvalidValue
}
return nil
}

95
util/reflect/reflect_test.go
View File

@@ -7,6 +7,13 @@ import (
rutil "github.com/unistack-org/micro/v3/util/reflect"
)
func TestFieldName(t *testing.T) {
name := rutil.FieldName("NestedArgs")
if name != "nested_args" {
t.Fatalf("%s != nested_args", name)
}
}
func TestMergeBool(t *testing.T) {
type str struct {
Bool bool `json:"bool"`
@@ -16,7 +23,7 @@ func TestMergeBool(t *testing.T) {
mp["bool"] = "true"
s := &str{}
if err := MergeMap(s, mp, []string{"json"}); err != nil {
if err := rutil.Merge(s, mp, rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
@@ -26,7 +33,7 @@ func TestMergeBool(t *testing.T) {
mp["bool"] = "false"
if err := MergeMap(s, mp, []string{"json"}); err != nil {
if err := rutil.Merge(s, mp, rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
@@ -36,7 +43,7 @@ func TestMergeBool(t *testing.T) {
mp["bool"] = 1
if err := MergeMap(s, mp, []string{"json"}); err != nil {
if err := rutil.Merge(s, mp, rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
@@ -55,7 +62,7 @@ func TestMergeString(t *testing.T) {
mp["bool"] = true
s := &str{}
if err := MergeMap(s, mp, []string{"json"}); err != nil {
if err := rutil.Merge(s, mp, rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
@@ -65,7 +72,7 @@ func TestMergeString(t *testing.T) {
mp["bool"] = false
if err := MergeMap(s, mp, []string{"json"}); err != nil {
if err := rutil.Merge(s, mp, rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
@@ -75,7 +82,7 @@ func TestMergeString(t *testing.T) {
}
func TestMergeMap(t *testing.T) {
func TestMerge(t *testing.T) {
dst := &pb.CallReq{
Name: "name_old",
Req: "req_old",
@@ -90,17 +97,85 @@ func TestMergeMap(t *testing.T) {
mp = rutil.FlattenMap(mp)
if err := MergeMap(dst, mp, []string{"protobuf"}); err != nil {
if err := rutil.Merge(dst, mp, rutil.Tags([]string{"protobuf"})); err != nil {
t.Fatal(err)
}
if dst.Name != "name_new" || dst.Req != "req_new" || dst.Arg2 != 1 {
t.Fatalf("merge error: %v", dst)
t.Fatalf("merge error: %#+v", dst)
}
if dst.Nested == nil ||
if dst.Nested == nil || len(dst.Nested.Uint64Args) != 3 ||
len(dst.Nested.StringArgs) != 2 || dst.Nested.StringArgs[0] != "args1" ||
len(dst.Nested.Uint64Args) != 3 || dst.Nested.Uint64Args[2].Value != 3 {
t.Fatalf("merge error: %v", dst.Nested)
t.Fatalf("merge error: %#+v", dst.Nested)
}
nmp := make(map[string]interface{})
nmp["nested.uint64_args"] = []uint64{4}
nmp = rutil.FlattenMap(nmp)
if err := rutil.Merge(dst, nmp, rutil.SliceAppend(true), rutil.Tags([]string{"protobuf"})); err != nil {
t.Fatal(err)
}
if dst.Nested == nil || len(dst.Nested.Uint64Args) != 4 || dst.Nested.Uint64Args[3].Value != 4 {
t.Fatalf("merge error: %#+v", dst.Nested)
}
}
func TestMergeNested(t *testing.T) {
type CallReqNested struct {
StringArgs []string `json:"string_args"`
Uint64Args []uint64 `json:"uint64_args"`
Nested *CallReqNested `json:"nested2"`
}
type CallReq struct {
Name string `json:"name"`
Req string `json:"req"`
Arg2 int `json:"arg2"`
Nested *CallReqNested `json:"nested"`
}
dst := &CallReq{
Name: "name_old",
Req: "req_old",
}
mp := make(map[string]interface{})
mp["name"] = "name_new"
mp["req"] = "req_new"
mp["arg2"] = 1
mp["nested.string_args"] = []string{"args1", "args2"}
mp["nested.uint64_args"] = []uint64{1, 2, 3}
mp["nested.nested2.uint64_args"] = []uint64{1, 2, 3}
mp = rutil.FlattenMap(mp)
if err := rutil.Merge(dst, mp, rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
if dst.Name != "name_new" || dst.Req != "req_new" || dst.Arg2 != 1 {
t.Fatalf("merge error: %#+v", dst)
}
if dst.Nested == nil || len(dst.Nested.Uint64Args) != 3 ||
len(dst.Nested.StringArgs) != 2 || dst.Nested.StringArgs[0] != "args1" ||
len(dst.Nested.Uint64Args) != 3 || dst.Nested.Uint64Args[2] != 3 {
t.Fatalf("merge error: %#+v", dst.Nested)
}
nmp := make(map[string]interface{})
nmp["nested.uint64_args"] = []uint64{4}
nmp = rutil.FlattenMap(nmp)
if err := rutil.Merge(dst, nmp, rutil.SliceAppend(true), rutil.Tags([]string{"json"})); err != nil {
t.Fatal(err)
}
if dst.Nested == nil || len(dst.Nested.Uint64Args) != 4 || dst.Nested.Uint64Args[3] != 4 {
t.Fatalf("merge error: %#+v", dst.Nested)
}
}