Add omitempty to fields not present in default flogo.json

project-flogo · Feb 26, 2019 · 6031f97 · 6031f97
1 parent 966cc75
commit 6031f97
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 49 deletions.
diff --git a/action/config.go b/action/config.go
@@ -5,13 +5,13 @@ import "encoding/json"
 // Config is the configuration for the Action
 type Config struct {
 	//inline action
-	Ref      string                 `json:"ref"`
-	Type     string                 `json:"type"` //an alias to the ref, can be used if imported
-	Settings map[string]interface{} `json:"settings"`
+	Ref      string                 `json:"ref,omitempty"`
+	Type     string                 `json:"type,omitempty"` //an alias to the ref, can be used if imported
+	Settings map[string]interface{} `json:"settings,omitempty"`
 
 	//referenced action
-	Id string `json:"id"`
+	Id string `json:"id,omitempty"`
 
 	//DEPRECATED
-	Data json.RawMessage `json:"data"`
+	Data json.RawMessage `json:"data,omitempty"`
 }
diff --git a/app/config.go b/app/config.go
@@ -13,11 +13,12 @@ type Config struct {
 	Type        string `json:"type"`
 	Version     string `json:"version"`
 	Description string `json:"description"`
+	AppModel    string `json:"appModel"`
 
-	Imports    []string           `json:"imports"`
-	Properties []*data.Attribute  `json:"properties"`
-	Channels   []string           `json:"channels"`
-	Triggers   []*trigger.Config  `json:"triggers"`
-	Resources  []*resource.Config `json:"resources"`
-	Actions    []*action.Config   `json:"actions"`
+	Imports    []string           `json:"imports,omitempty"`
+	Properties []*data.Attribute  `json:"properties,omitempty"`
+	Channels   []string           `json:"channels,omitempty"`
+	Triggers   []*trigger.Config  `json:"triggers,omitempty"`
+	Resources  []*resource.Config `json:"resources,omitempty"`
+	Actions    []*action.Config   `json:"actions,omitempty"`
 }
diff --git a/internal/schema/assets.go b/internal/schema/assets.go
diff --git a/internal/schema/schema.json b/internal/schema/schema.json
@@ -5,12 +5,7 @@
         "type",
         "version",
         "description",
-        "imports",
-        "properties",
-        "channels",
-        "triggers",
-        "resources",
-        "actions"
+        "appModel"
     ],
     "properties": {
         "actions": {
@@ -20,6 +15,9 @@
             },
             "type": "array"
         },
+        "appModel": {
+            "type": "string"
+        },
         "channels": {
             "items": {
                 "type": "string"
@@ -75,12 +73,7 @@
                 "type",
                 "version",
                 "description",
-                "imports",
-                "properties",
-                "channels",
-                "triggers",
-                "resources",
-                "actions"
+                "appModel"
             ],
             "properties": {
                 "actions": {
@@ -90,6 +83,9 @@
                     },
                     "type": "array"
                 },
+                "appModel": {
+                    "type": "string"
+                },
                 "channels": {
                     "items": {
                         "type": "string"
@@ -140,13 +136,6 @@
             "type": "object"
         },
         "action.Config": {
-            "required": [
-                "ref",
-                "type",
-                "settings",
-                "id",
-                "data"
-            ],
             "properties": {
                 "data": {
                     "type": "object"
@@ -188,19 +177,7 @@
             "type": "object"
         },
         "trigger.ActionConfig": {
-            "required": [
-                "ref",
-                "type",
-                "settings",
-                "id",
-                "data",
-                "Act"
-            ],
             "properties": {
-                "Act": {
-                    "additionalProperties": true,
-                    "type": "object"
-                },
                 "data": {
                     "type": "object"
                 },
@@ -232,8 +209,6 @@
         "trigger.Config": {
             "required": [
                 "id",
-                "type",
-                "ref",
                 "settings",
                 "handlers"
             ],

diff --git a/trigger/config.go b/trigger/config.go
@@ -12,8 +12,8 @@ import (
 // Config is the configuration for a Trigger
 type Config struct {
 	Id       string                 `json:"id"`
-	Type     string                 `json:"type"` //an alias to the ref, can be used if imported
-	Ref      string                 `json:"ref"`
+	Type     string                 `json:"type,omitempty"` //an alias to the ref, can be used if imported
+	Ref      string                 `json:"ref,omitempty"`
 	Settings map[string]interface{} `json:"settings"`
 	Handlers []*HandlerConfig       `json:"handlers"`
 }
@@ -94,7 +94,7 @@ type ActionConfig struct {
 	Input  map[string]interface{} `json:"input,omitempty"`
 	Output map[string]interface{} `json:"output,omitempty"`
 
-	Act action.Action
+	Act action.Action             `json:"-,omitempty"`
 }
 
 // UnmarshalJSON overrides the default UnmarshalJSON for TaskInst