Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
f6f34306
Commit
f6f34306
authored
Mar 05, 2016
by
astaxie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1740 from ysqi/configer
Fixed #1735 Return nil if config value does not exist or is empty
parents
a40c0dd1
19d921d3
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
10 deletions
+35
-10
fake.go
config/fake.go
+6
-2
ini.go
config/ini.go
+7
-2
ini_test.go
config/ini_test.go
+1
-0
json.go
config/json.go
+2
-2
xml.go
config/xml/xml.go
+6
-2
xml_test.go
config/xml/xml_test.go
+3
-0
yaml.go
config/yaml/yaml.go
+6
-2
yaml_test.go
config/yaml/yaml_test.go
+4
-0
No files found.
config/fake.go
View file @
f6f34306
...
...
@@ -46,12 +46,16 @@ func (c *fakeConfigContainer) DefaultString(key string, defaultval string) strin
}
func
(
c
*
fakeConfigContainer
)
Strings
(
key
string
)
[]
string
{
return
strings
.
Split
(
c
.
getData
(
key
),
";"
)
v
:=
c
.
getData
(
key
)
if
v
==
""
{
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
func
(
c
*
fakeConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
len
(
v
)
==
0
{
if
v
==
nil
{
return
defaultval
}
return
v
...
...
config/ini.go
View file @
f6f34306
...
...
@@ -269,15 +269,20 @@ func (c *IniConfigContainer) DefaultString(key string, defaultval string) string
}
// Strings returns the []string value for a given key.
// Return nil if config value does not exist or is empty.
func
(
c
*
IniConfigContainer
)
Strings
(
key
string
)
[]
string
{
return
strings
.
Split
(
c
.
String
(
key
),
";"
)
v
:=
c
.
String
(
key
)
if
v
==
""
{
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func
(
c
*
IniConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
len
(
v
)
==
0
{
if
v
==
nil
{
return
defaultval
}
return
v
...
...
config/ini_test.go
View file @
f6f34306
...
...
@@ -71,6 +71,7 @@ peers = one;two;three
"null"
:
""
,
"demo2::key1"
:
""
,
"error"
:
""
,
"emptystrings"
:
[]
string
{},
}
)
...
...
config/json.go
View file @
f6f34306
...
...
@@ -173,7 +173,7 @@ func (c *JSONConfigContainer) DefaultString(key string, defaultval string) strin
func
(
c
*
JSONConfigContainer
)
Strings
(
key
string
)
[]
string
{
stringVal
:=
c
.
String
(
key
)
if
stringVal
==
""
{
return
[]
string
{}
return
nil
}
return
strings
.
Split
(
c
.
String
(
key
),
";"
)
}
...
...
@@ -181,7 +181,7 @@ func (c *JSONConfigContainer) Strings(key string) []string {
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func
(
c
*
JSONConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
if
v
:=
c
.
Strings
(
key
);
len
(
v
)
>
0
{
if
v
:=
c
.
Strings
(
key
);
v
!=
nil
{
return
v
}
return
defaultval
...
...
config/xml/xml.go
View file @
f6f34306
...
...
@@ -174,14 +174,18 @@ func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
// Strings returns the []string value for a given key.
func
(
c
*
ConfigContainer
)
Strings
(
key
string
)
[]
string
{
return
strings
.
Split
(
c
.
String
(
key
),
";"
)
v
:=
c
.
String
(
key
)
if
v
==
""
{
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func
(
c
*
ConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
len
(
v
)
==
0
{
if
v
==
nil
{
return
defaultval
}
return
v
...
...
config/xml/xml_test.go
View file @
f6f34306
...
...
@@ -82,4 +82,7 @@ func TestXML(t *testing.T) {
if
xmlconf
.
String
(
"name"
)
!=
"astaxie"
{
t
.
Fatal
(
"get name error"
)
}
if
xmlconf
.
Strings
(
"emptystrings"
)
!=
nil
{
t
.
Fatal
(
"get emtpy strings error"
)
}
}
config/yaml/yaml.go
View file @
f6f34306
...
...
@@ -211,14 +211,18 @@ func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
// Strings returns the []string value for a given key.
func
(
c
*
ConfigContainer
)
Strings
(
key
string
)
[]
string
{
return
strings
.
Split
(
c
.
String
(
key
),
";"
)
v
:=
c
.
String
(
key
)
if
v
==
""
{
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func
(
c
*
ConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
len
(
v
)
==
0
{
if
v
==
nil
{
return
defaultval
}
return
v
...
...
config/yaml/yaml_test.go
View file @
f6f34306
...
...
@@ -79,4 +79,8 @@ func TestYaml(t *testing.T) {
if
yamlconf
.
String
(
"name"
)
!=
"astaxie"
{
t
.
Fatal
(
"get name error"
)
}
if
yamlconf
.
Strings
(
"emptystrings"
)
!=
nil
{
t
.
Fatal
(
"get emtpy strings error"
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment