Skip to content

Commit d300cff

Browse files
committed
Remove value tag syntax ${ROOT} and ANONYMOUS prefix
1 parent bc3185d commit d300cff

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

conf/bind.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ func (param *BindParam) BindTag(tag string, validate reflect.StructTag) error {
9797
if err != nil {
9898
return err
9999
}
100-
if parsedTag.Key == "ROOT" {
101-
parsedTag.Key = ""
102-
} else if parsedTag.Key == "" {
103-
parsedTag.Key = "ANONYMOUS"
104-
}
105100
param.Tag = parsedTag
106101
if param.Key == "" {
107102
param.Key = parsedTag.Key

conf/bind_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ func TestBindTag(t *testing.T) {
124124
err = param.BindTag("${}", "")
125125
assert.Nil(t, err)
126126
assert.Equal(t, param, BindParam{
127-
Key: "ANONYMOUS",
127+
Key: "",
128128
Tag: ParsedTag{
129-
Key: "ANONYMOUS",
129+
Key: "",
130130
},
131131
})
132132

@@ -136,14 +136,14 @@ func TestBindTag(t *testing.T) {
136136
err = param.BindTag("${}", "")
137137
assert.Nil(t, err)
138138
assert.Equal(t, param, BindParam{
139-
Key: "s.ANONYMOUS",
139+
Key: "s",
140140
Tag: ParsedTag{
141-
Key: "ANONYMOUS",
141+
Key: "",
142142
},
143143
})
144144

145145
param = BindParam{}
146-
err = param.BindTag("${ROOT}", "")
146+
err = param.BindTag("${}", "")
147147
assert.Nil(t, err)
148148
assert.Equal(t, param, BindParam{})
149149

@@ -1162,7 +1162,7 @@ func TestBind_StructFilter(t *testing.T) {
11621162
param := BindParam{
11631163
Path: v.Type().String(),
11641164
}
1165-
err := param.BindTag("${ROOT}", "")
1165+
err := param.BindTag("${}", "")
11661166
assert.Nil(t, err)
11671167
filter := func(i interface{}, param BindParam) (bool, error) {
11681168
return false, errors.New("this is an error")
@@ -1180,7 +1180,7 @@ func TestBind_StructFilter(t *testing.T) {
11801180
param := BindParam{
11811181
Path: v.Type().String(),
11821182
}
1183-
err := param.BindTag("${ROOT}", "")
1183+
err := param.BindTag("${}", "")
11841184
assert.Nil(t, err)
11851185
filter := func(i interface{}, param BindParam) (bool, error) {
11861186
reflect.ValueOf(i).Elem().SetUint(3)
@@ -1200,7 +1200,7 @@ func TestBind_StructFilter(t *testing.T) {
12001200
param := BindParam{
12011201
Path: v.Type().String(),
12021202
}
1203-
err := param.BindTag("${ROOT}", "")
1203+
err := param.BindTag("${}", "")
12041204
assert.Nil(t, err)
12051205
filter := func(i interface{}, param BindParam) (bool, error) {
12061206
return false, nil

conf/conf.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ func (p *Properties) Bind(i interface{}, args ...BindArg) error {
339339
}
340340

341341
if len(args) == 0 {
342-
args = []BindArg{tagArg{tag: "${ROOT}"}}
342+
args = []BindArg{tagArg{tag: "${}"}}
343343
}
344344

345345
t := v.Type()

0 commit comments

Comments
 (0)