DeforaNetworks/corteza
3
0
Fork 0
Code Activity

More robust event args decoding

Browse Source
This commit is contained in:
Denis Arh
2020-02-25 06:53:54 +01:00
parent 9e14b50bce
commit 991af03db7
19 changed files with 270 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codegen/v2/events.gen.go.tpl
+10 -6
View File
@@ -151,18 +151,22 @@ func (res *{{ camelCase .ResourceIdent "base" }}) Decode(results map[string][]by
}
{{- if $.Events.Result }}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $.Events.Result }}); err != nil {
return
if res.{{ $.Events.Result }} != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $.Events.Result }}); err != nil {
return
}
}
}
{{ end -}}
{{- range $prop := $.Events.Properties }}
{{- if not $prop.Immutable }}
if r, ok := results["{{ $prop.Name }}"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $prop.Name }}); err != nil {
return
if res.{{ $prop.Name }} != nil {
if r, ok := results["{{ $prop.Name }}"]; ok {
if err = json.Unmarshal(r, res.{{ $prop.Name }}); err != nil {
return
}
}
}
{{ end -}}
compose/service/event/compose.gen.go
+5 -3
View File
@@ -177,9 +177,11 @@ func (res *composeBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
compose/service/event/module.gen.go
+15 -9
View File
@@ -472,21 +472,27 @@ func (res *moduleBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.module); err != nil {
return
if res.module != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.module); err != nil {
return
}
}
}
if r, ok := results["module"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.module); err != nil {
return
if res.module != nil {
if r, ok := results["module"]; ok {
if err = json.Unmarshal(r, res.module); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
compose/service/event/namespace.gen.go
+15 -9
View File
@@ -432,21 +432,27 @@ func (res *namespaceBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.namespace); err != nil {
return
if res.namespace != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.namespace); err != nil {
return
}
}
}
if r, ok := results["namespace"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.namespace); err != nil {
return
if res.namespace != nil {
if r, ok := results["namespace"]; ok {
if err = json.Unmarshal(r, res.namespace); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
compose/service/event/page.gen.go
+15 -9
View File
@@ -472,21 +472,27 @@ func (res *pageBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.page); err != nil {
return
if res.page != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.page); err != nil {
return
}
}
}
if r, ok := results["page"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.page); err != nil {
return
if res.page != nil {
if r, ok := results["page"]; ok {
if err = json.Unmarshal(r, res.page); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
compose/service/event/record.gen.go
+20 -12
View File
@@ -559,27 +559,35 @@ func (res *recordBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.record); err != nil {
return
if res.record != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.record); err != nil {
return
}
}
}
if r, ok := results["record"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.record); err != nil {
return
if res.record != nil {
if r, ok := results["record"]; ok {
if err = json.Unmarshal(r, res.record); err != nil {
return
}
}
}
if r, ok := results["recordValueErrors"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.recordValueErrors); err != nil {
return
if res.recordValueErrors != nil {
if r, ok := results["recordValueErrors"]; ok {
if err = json.Unmarshal(r, res.recordValueErrors); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
messaging/service/event/channel.gen.go
+15 -9
View File
@@ -432,21 +432,27 @@ func (res *channelBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.channel); err != nil {
return
if res.channel != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.channel); err != nil {
return
}
}
}
if r, ok := results["channel"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.channel); err != nil {
return
if res.channel != nil {
if r, ok := results["channel"]; ok {
if err = json.Unmarshal(r, res.channel); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
messaging/service/event/channel_member.gen.go
+20 -12
View File
@@ -487,27 +487,35 @@ func (res *channelMemberBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.member); err != nil {
return
if res.member != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.member); err != nil {
return
}
}
}
if r, ok := results["member"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.member); err != nil {
return
if res.member != nil {
if r, ok := results["member"]; ok {
if err = json.Unmarshal(r, res.member); err != nil {
return
}
}
}
if r, ok := results["channel"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.channel); err != nil {
return
if res.channel != nil {
if r, ok := results["channel"]; ok {
if err = json.Unmarshal(r, res.channel); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
messaging/service/event/command.gen.go
+10 -6
View File
@@ -137,15 +137,19 @@ func (res *commandBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.command); err != nil {
return
if res.command != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.command); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
messaging/service/event/message.gen.go
+20 -12
View File
@@ -479,27 +479,35 @@ func (res *messageBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.message); err != nil {
return
if res.message != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.message); err != nil {
return
}
}
}
if r, ok := results["message"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.message); err != nil {
return
if res.message != nil {
if r, ok := results["message"]; ok {
if err = json.Unmarshal(r, res.message); err != nil {
return
}
}
}
if r, ok := results["channel"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.channel); err != nil {
return
if res.channel != nil {
if r, ok := results["channel"]; ok {
if err = json.Unmarshal(r, res.channel); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
messaging/service/event/messaging.gen.go
+5 -3
View File
@@ -177,9 +177,11 @@ func (res *messagingBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/application.gen.go
+15 -9
View File
@@ -432,21 +432,27 @@ func (res *applicationBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.application); err != nil {
return
if res.application != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.application); err != nil {
return
}
}
}
if r, ok := results["application"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.application); err != nil {
return
if res.application != nil {
if r, ok := results["application"]; ok {
if err = json.Unmarshal(r, res.application); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/auth.gen.go
+20 -12
View File
@@ -295,27 +295,35 @@ func (res *authBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
if res.user != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
}
}
}
if r, ok := results["user"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
if res.user != nil {
if r, ok := results["user"]; ok {
if err = json.Unmarshal(r, res.user); err != nil {
return
}
}
}
if r, ok := results["provider"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.provider); err != nil {
return
if res.provider != nil {
if r, ok := results["provider"]; ok {
if err = json.Unmarshal(r, res.provider); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/mail.gen.go
+15 -9
View File
@@ -216,21 +216,27 @@ func (res *mailBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.message); err != nil {
return
if res.message != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.message); err != nil {
return
}
}
}
if r, ok := results["message"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.message); err != nil {
return
if res.message != nil {
if r, ok := results["message"]; ok {
if err = json.Unmarshal(r, res.message); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/role.gen.go
+15 -9
View File
@@ -432,21 +432,27 @@ func (res *roleBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.role); err != nil {
return
if res.role != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.role); err != nil {
return
}
}
}
if r, ok := results["role"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.role); err != nil {
return
if res.role != nil {
if r, ok := results["role"]; ok {
if err = json.Unmarshal(r, res.role); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/role_member.gen.go
+20 -12
View File
@@ -295,27 +295,35 @@ func (res *roleMemberBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
if res.user != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
}
}
}
if r, ok := results["user"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
if res.user != nil {
if r, ok := results["user"]; ok {
if err = json.Unmarshal(r, res.user); err != nil {
return
}
}
}
if r, ok := results["role"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.role); err != nil {
return
if res.role != nil {
if r, ok := results["role"]; ok {
if err = json.Unmarshal(r, res.role); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/sink.gen.go
+15 -9
View File
@@ -144,21 +144,27 @@ func (res *sinkBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.response); err != nil {
return
if res.response != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.response); err != nil {
return
}
}
}
if r, ok := results["response"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.response); err != nil {
return
if res.response != nil {
if r, ok := results["response"]; ok {
if err = json.Unmarshal(r, res.response); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/system.gen.go
+5 -3
View File
@@ -177,9 +177,11 @@ func (res *systemBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return
system/service/event/user.gen.go
+15 -9
View File
@@ -432,21 +432,27 @@ func (res *userBase) Decode(results map[string][]byte) (err error) {
// Respect immutability
return
}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
if res.user != nil {
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
}
}
}
if r, ok := results["user"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.user); err != nil {
return
if res.user != nil {
if r, ok := results["user"]; ok {
if err = json.Unmarshal(r, res.user); err != nil {
return
}
}
}
if r, ok := results["invoker"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
if res.invoker != nil {
if r, ok := results["invoker"]; ok {
if err = json.Unmarshal(r, res.invoker); err != nil {
return
}
}
}
return