Skip to content

Commit

Permalink
new: RawRespond export field ParsedRespond
Browse files Browse the repository at this point in the history
  • Loading branch information
@khorevaa
khorevaa committed Jan 25, 2021
1 parent 7edced1 commit 7121304
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions clusters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (i ClustersList) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &list)
res.Error = err
res.parsedRespond = list
res.ParsedRespond = list
return err

}
Expand All @@ -95,7 +95,7 @@ func (i ClustersInfo) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -207,7 +207,7 @@ func (m *Manager) Clusters(what interface{}, opts ...interface{}) (respond Clust
return respond, err
}

switch v := respond.parsedRespond.(type) {
switch v := respond.ParsedRespond.(type) {

case ClusterInfo:
respond.Info = v
Expand Down
6 changes: 3 additions & 3 deletions connections.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (i ConnectionsList) Parse(res *RawRespond) error {
list = i.filter(list)
}

res.parsedRespond = list
res.ParsedRespond = list

return err

Expand Down Expand Up @@ -152,7 +152,7 @@ func (i ConnectionsInfo) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -213,7 +213,7 @@ func (m *Manager) Connections(what interface{}, opts ...interface{}) (respond Co
return respond, err
}

switch v := respond.parsedRespond.(type) {
switch v := respond.ParsedRespond.(type) {

case ConnectionInfo:
respond.Info = v
Expand Down
4 changes: 2 additions & 2 deletions helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ func infobaseAuthParams(auth InfobaseAuth) map[string]string {
type RawRespond struct {
Status bool
Raw []byte
parsedRespond interface{}
ParsedRespond interface{}
Error error
}

func (r *RawRespond) Parsed() interface{} {
return r.parsedRespond
return r.ParsedRespond
}

func newRawRespond(data []byte, err error) *RawRespond {
Expand Down
16 changes: 8 additions & 8 deletions infobases.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (i InfobasesList) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &list)
res.Error = err
res.parsedRespond = list
res.ParsedRespond = list

return err

Expand Down Expand Up @@ -121,7 +121,7 @@ func (i InfobasesSummaryInfo) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -154,7 +154,7 @@ func (i InfobaseFullInfo) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -199,7 +199,7 @@ func (i InfobaseDrop) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -362,7 +362,7 @@ func (i InfobaseUpdate) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -399,7 +399,7 @@ func (i InfobaseUpdateDescription) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -494,7 +494,7 @@ func (i InfobaseCreate) Parse(res *RawRespond) error {

err := Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err
}

Expand Down Expand Up @@ -523,7 +523,7 @@ func (m *Manager) Infobases(what interface{}, opts ...interface{}) (respond Info
return respond, err
}

switch v := respond.parsedRespond.(type) {
switch v := respond.ParsedRespond.(type) {

case InfobaseInfo:
respond.Info = v
Expand Down
10 changes: 5 additions & 5 deletions sessions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (i SessionsList) Parse(res *RawRespond) error {
}

res.Error = err
res.parsedRespond = list
res.ParsedRespond = list
return err

}
Expand Down Expand Up @@ -153,7 +153,7 @@ func (i SessionsInfo) Parse(res *RawRespond) error {

err = Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err

}
Expand Down Expand Up @@ -184,7 +184,7 @@ func (i SessionsTerminate) Parse(res *RawRespond) error {

err = Unmarshal(res.Raw, &info)
res.Error = err
res.parsedRespond = info
res.ParsedRespond = info
return err

}
Expand Down Expand Up @@ -215,7 +215,7 @@ func (m *Manager) Sessions(what interface{}, opts ...interface{}) (respond Sessi
return respond, err
}

switch v := respond.parsedRespond.(type) {
switch v := respond.ParsedRespond.(type) {

case SessionsInfo:
respond.Info = v
Expand All @@ -241,7 +241,7 @@ func (m *Manager) Licenses(what interface{}, opts ...interface{}) (respond Licen
return respond, err
}

switch v := respond.parsedRespond.(type) {
switch v := respond.ParsedRespond.(type) {
case LicenseInfo:
respond.Info = v
respond.List = append(respond.List, v)
Expand Down

0 comments on commit 7121304

Please sign in to comment.