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
74b22649
Commit
74b22649
authored
Apr 24, 2015
by
Wyatt Fang
Committed by
astaxie
May 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove the double isStruct/isStructPtr check
parent
42556305
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
validation.go
validation/validation.go
+13
-13
No files found.
validation/validation.go
View file @
74b22649
...
@@ -342,6 +342,7 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) {
...
@@ -342,6 +342,7 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) {
// Anonymous fields will be ignored
// Anonymous fields will be ignored
func
(
v
*
Validation
)
RecursiveValid
(
objc
interface
{})
(
bool
,
error
)
{
func
(
v
*
Validation
)
RecursiveValid
(
objc
interface
{})
(
bool
,
error
)
{
//Step 1: validate obj itself firstly
//Step 1: validate obj itself firstly
// fails if objc is not struct
pass
,
err
:=
v
.
Valid
(
objc
)
pass
,
err
:=
v
.
Valid
(
objc
)
if
err
!=
nil
||
false
==
pass
{
if
err
!=
nil
||
false
==
pass
{
return
pass
,
err
// Stop recursive validation
return
pass
,
err
// Stop recursive validation
...
@@ -349,23 +350,22 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) {
...
@@ -349,23 +350,22 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) {
// Step 2: Validate struct's struct fields
// Step 2: Validate struct's struct fields
objT
:=
reflect
.
TypeOf
(
objc
)
objT
:=
reflect
.
TypeOf
(
objc
)
objV
:=
reflect
.
ValueOf
(
objc
)
objV
:=
reflect
.
ValueOf
(
objc
)
if
isStruct
(
objT
)
||
isStructPtr
(
objT
)
{
if
isStructPtr
(
objT
)
{
if
isStructPtr
(
objT
)
{
objT
=
objT
.
Elem
()
objT
=
objT
.
Elem
()
objV
=
objV
.
Elem
()
objV
=
objV
.
Elem
()
}
}
for
i
:=
0
;
i
<
objT
.
NumField
();
i
++
{
for
i
:=
0
;
i
<
objT
.
NumField
();
i
++
{
t
:=
objT
.
Field
(
i
)
.
Type
t
:=
objT
.
Field
(
i
)
.
Type
if
isStruct
(
t
)
||
isStructPtr
(
t
)
{
// Recursive applies to struct or pointer to structs fields
// Step 3: do the recursive validation
if
isStruct
(
t
)
||
isStructPtr
(
t
)
{
// Only valid the Public field recursively
// Step 3: do the recursive validation
if
objV
.
Field
(
i
)
.
CanInterface
()
{
// Only valid the Public field recursively
pass
,
err
=
v
.
RecursiveValid
(
objV
.
Field
(
i
)
.
Interface
())
if
objV
.
Field
(
i
)
.
CanInterface
()
{
}
pass
,
err
=
v
.
RecursiveValid
(
objV
.
Field
(
i
)
.
Interface
())
}
}
}
}
}
}
...
...
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