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
19d921d3
Commit
19d921d3
authored
Mar 03, 2016
by
ysqi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return nil not empty []string{}
Return nil if config value does not exist or is empty
parent
8ff74e71
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
12 deletions
+17
-12
fake.go
config/fake.go
+6
-2
ini.go
config/ini.go
+3
-2
json.go
config/json.go
+2
-2
xml.go
config/xml/xml.go
+2
-2
xml_test.go
config/xml/xml_test.go
+1
-1
yaml.go
config/yaml/yaml.go
+2
-2
yaml_test.go
config/yaml/yaml_test.go
+1
-1
No files found.
config/fake.go
View file @
19d921d3
...
...
@@ -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 @
19d921d3
...
...
@@ -269,10 +269,11 @@ 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
{
v
:=
c
.
String
(
key
)
if
v
==
""
{
return
[]
string
{}
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
...
...
@@ -281,7 +282,7 @@ func (c *IniConfigContainer) Strings(key string) []string {
// 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/json.go
View file @
19d921d3
...
...
@@ -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 @
19d921d3
...
...
@@ -176,7 +176,7 @@ func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
func
(
c
*
ConfigContainer
)
Strings
(
key
string
)
[]
string
{
v
:=
c
.
String
(
key
)
if
v
==
""
{
return
[]
string
{}
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
...
...
@@ -185,7 +185,7 @@ func (c *ConfigContainer) Strings(key string) []string {
// 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 @
19d921d3
...
...
@@ -82,7 +82,7 @@ func TestXML(t *testing.T) {
if
xmlconf
.
String
(
"name"
)
!=
"astaxie"
{
t
.
Fatal
(
"get name error"
)
}
if
len
(
xmlconf
.
Strings
(
"emptystrings"
))
!=
0
{
if
xmlconf
.
Strings
(
"emptystrings"
)
!=
nil
{
t
.
Fatal
(
"get emtpy strings error"
)
}
}
config/yaml/yaml.go
View file @
19d921d3
...
...
@@ -213,7 +213,7 @@ func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
func
(
c
*
ConfigContainer
)
Strings
(
key
string
)
[]
string
{
v
:=
c
.
String
(
key
)
if
v
==
""
{
return
[]
string
{}
return
nil
}
return
strings
.
Split
(
v
,
";"
)
}
...
...
@@ -222,7 +222,7 @@ func (c *ConfigContainer) Strings(key string) []string {
// 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 @
19d921d3
...
...
@@ -80,7 +80,7 @@ func TestYaml(t *testing.T) {
t
.
Fatal
(
"get name error"
)
}
if
len
(
yamlconf
.
Strings
(
"emptystrings"
))
!=
0
{
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