Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
golang-github-go-openapi-jsonpointer
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Go Packaging Team
packages
golang-github-go-openapi-jsonpointer
Commits
0b35d80c
Unverified
Commit
0b35d80c
authored
4 years ago
by
Ivan Porto Carrero
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #5 from axiomhq/expand-pointable
allows more types with the Pointable interface
parents
ed123515
cf3eb5b3
Branches
Branches containing commit
Tags
v0.19.4
Tags containing commit
1 merge request
!2
Set upstream metadata fields: Repository, Repository-Browse
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pointer.go
+30
-30
30 additions, 30 deletions
pointer.go
pointer_test.go
+24
-0
24 additions, 0 deletions
pointer_test.go
with
54 additions
and
30 deletions
pointer.go
+
30
−
30
View file @
0b35d80c
...
...
@@ -114,16 +114,16 @@ func getSingleImpl(node interface{}, decodedToken string, nameProvider *swag.Nam
rValue
:=
reflect
.
Indirect
(
reflect
.
ValueOf
(
node
))
kind
:=
rValue
.
Kind
()
switch
kind
{
if
rValue
.
Type
()
.
Implements
(
jsonPointableType
)
{
r
,
err
:=
node
.
(
JSONPointable
)
.
JSONLookup
(
decodedToken
)
if
err
!=
nil
{
return
nil
,
kind
,
err
}
return
r
,
kind
,
nil
}
switch
kind
{
case
reflect
.
Struct
:
if
rValue
.
Type
()
.
Implements
(
jsonPointableType
)
{
r
,
err
:=
node
.
(
JSONPointable
)
.
JSONLookup
(
decodedToken
)
if
err
!=
nil
{
return
nil
,
kind
,
err
}
return
r
,
kind
,
nil
}
nm
,
ok
:=
nameProvider
.
GetGoNameForType
(
rValue
.
Type
(),
decodedToken
)
if
!
ok
{
return
nil
,
kind
,
fmt
.
Errorf
(
"object has no field %q"
,
decodedToken
)
...
...
@@ -161,17 +161,17 @@ func getSingleImpl(node interface{}, decodedToken string, nameProvider *swag.Nam
func
setSingleImpl
(
node
,
data
interface
{},
decodedToken
string
,
nameProvider
*
swag
.
NameProvider
)
error
{
rValue
:=
reflect
.
Indirect
(
reflect
.
ValueOf
(
node
))
switch
rValue
.
Kind
()
{
case
reflect
.
Struct
:
if
ns
,
ok
:=
node
.
(
JSONSetable
);
ok
{
// pointer impl
return
ns
.
JSONSet
(
decodedToken
,
data
)
}
if
ns
,
ok
:=
node
.
(
JSONSetable
);
ok
{
// pointer impl
return
ns
.
JSONSet
(
decodedToken
,
data
)
}
if
rValue
.
Type
()
.
Implements
(
jsonSetableType
)
{
return
node
.
(
JSONSetable
)
.
JSONSet
(
decodedToken
,
data
)
}
if
rValue
.
Type
()
.
Implements
(
jsonSetableType
)
{
return
node
.
(
JSONSetable
)
.
JSONSet
(
decodedToken
,
data
)
}
switch
rValue
.
Kind
()
{
case
reflect
.
Struct
:
nm
,
ok
:=
nameProvider
.
GetGoNameForType
(
rValue
.
Type
(),
decodedToken
)
if
!
ok
{
return
fmt
.
Errorf
(
"object has no field %q"
,
decodedToken
)
...
...
@@ -270,22 +270,22 @@ func (p *Pointer) set(node, data interface{}, nameProvider *swag.NameProvider) e
rValue
:=
reflect
.
Indirect
(
reflect
.
ValueOf
(
node
))
kind
:=
rValue
.
Kind
()
switch
kind
{
case
reflect
.
Struct
:
if
rValue
.
Type
()
.
Implements
(
jsonPointableType
)
{
r
,
err
:=
node
.
(
JSONPointable
)
.
JSONLookup
(
decodedToken
)
if
err
!=
nil
{
return
err
}
fld
:=
reflect
.
ValueOf
(
r
)
if
fld
.
CanAddr
()
&&
fld
.
Kind
()
!=
reflect
.
Interface
&&
fld
.
Kind
()
!=
reflect
.
Map
&&
fld
.
Kind
()
!=
reflect
.
Slice
&&
fld
.
Kind
()
!=
reflect
.
Ptr
{
node
=
fld
.
Addr
()
.
Interface
()
continue
}
node
=
r
if
rValue
.
Type
()
.
Implements
(
jsonPointableType
)
{
r
,
err
:=
node
.
(
JSONPointable
)
.
JSONLookup
(
decodedToken
)
if
err
!=
nil
{
return
err
}
fld
:=
reflect
.
ValueOf
(
r
)
if
fld
.
CanAddr
()
&&
fld
.
Kind
()
!=
reflect
.
Interface
&&
fld
.
Kind
()
!=
reflect
.
Map
&&
fld
.
Kind
()
!=
reflect
.
Slice
&&
fld
.
Kind
()
!=
reflect
.
Ptr
{
node
=
fld
.
Addr
()
.
Interface
()
continue
}
node
=
r
continue
}
switch
kind
{
case
reflect
.
Struct
:
nm
,
ok
:=
nameProvider
.
GetGoNameForType
(
rValue
.
Type
(),
decodedToken
)
if
!
ok
{
return
fmt
.
Errorf
(
"object has no field %q"
,
decodedToken
)
...
...
This diff is collapsed.
Click to expand it.
pointer_test.go
+
24
−
0
View file @
0b35d80c
...
...
@@ -167,6 +167,21 @@ func (p pointableImpl) JSONLookup(token string) (interface{}, error) {
return
nil
,
fmt
.
Errorf
(
"object has no field %q"
,
token
)
}
type
pointableMap
map
[
string
]
string
func
(
p
pointableMap
)
JSONLookup
(
token
string
)
(
interface
{},
error
)
{
if
token
==
"swap"
{
return
p
[
"swapped"
],
nil
}
v
,
ok
:=
p
[
token
]
if
ok
{
return
v
,
nil
}
return
nil
,
fmt
.
Errorf
(
"object has no key %q"
,
token
)
}
func
TestPointableInterface
(
t
*
testing
.
T
)
{
p
:=
&
pointableImpl
{
"hello"
}
...
...
@@ -177,6 +192,15 @@ func TestPointableInterface(t *testing.T) {
result
,
_
,
err
=
GetForToken
(
p
,
"something"
)
assert
.
Error
(
t
,
err
)
assert
.
Nil
(
t
,
result
)
pm
:=
pointableMap
{
"swapped"
:
"hello"
,
"a"
:
"world"
}
result
,
_
,
err
=
GetForToken
(
pm
,
"swap"
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
pm
[
"swapped"
],
result
)
result
,
_
,
err
=
GetForToken
(
pm
,
"a"
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
pm
[
"a"
],
result
)
}
func
TestGetNode
(
t
*
testing
.
T
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment