unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

config: move reflect stuff to util/reflect

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-01-19 01:40:34 +03:00
parent 4783c6d9a3
commit 770e8425bd
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/default.go
View File

@ -5,6 +5,8 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
rutil "github.com/unistack-org/micro/v3/util/reflect"
) )
type defaultConfig struct { type defaultConfig struct {
@ -45,7 +47,7 @@ func (c *defaultConfig) Load(ctx context.Context) error {
} }
func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val string) error { func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val string) error {
if !IsEmpty(value) { if !rutil.IsEmpty(value) {
return nil return nil
} }
switch value.Kind() { switch value.Kind() {

4
config/reflect_test.go
View File

@ -3,7 +3,7 @@ package config_test
import ( import (
"testing" "testing"
"github.com/unistack-org/micro/v3/config" rutil "github.com/unistack-org/micro/v3/util/reflect"
) )
type Config struct { type Config struct {
@ -18,7 +18,7 @@ type SubConfig struct {
func TestReflect(t *testing.T) { func TestReflect(t *testing.T) {
cfg1 := &Config{Value: "cfg1", Config: &Config{Value: "cfg1_1"}, SubConfig: &SubConfig{Value: "cfg1"}} cfg1 := &Config{Value: "cfg1", Config: &Config{Value: "cfg1_1"}, SubConfig: &SubConfig{Value: "cfg1"}}
cfg2, err := config.Zero(cfg1) cfg2, err := rutil.Zero(cfg1)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

7
config/reflect.go → util/reflect/reflect.go
View File

@ -1,9 +1,14 @@
package config package reflect
import ( import (
"errors"
"reflect" "reflect"
) )
var (
ErrInvalidStruct = errors.New("invalid struct specified")
)
func IsEmpty(v reflect.Value) bool { func IsEmpty(v reflect.Value) bool {
switch v.Kind() { switch v.Kind() {
case reflect.Array, reflect.Map, reflect.Slice, reflect.String: case reflect.Array, reflect.Map, reflect.Slice, reflect.String: