fix metadata marshal/unmarshal

Author: Frank Martinez

action/metadata.go

@@ -12,40 +12,71 @@ type Metadata struct {
 	Settings map[string]data.TypedValue
 }
 
-// UnmarshalJSON overrides the default UnmarshalJSON for TaskEnv
-func (md *Metadata) UnmarshalJSON(b []byte) error {
-
-	ser := &struct {
-		Settings []*data.Attribute `json:"settings"`
-		Input    []*data.Attribute `json:"input"`
-		Output   []*data.Attribute `json:"output"`
-	}{}
-
-	if err := json.Unmarshal(b, ser); err != nil {
-		return err
-	}
-
-	md.IOMetadata = &metadata.IOMetadata{}
-
-	md.Settings = make(map[string]data.TypedValue, len(ser.Settings))
-	md.Input = make(map[string]data.TypedValue, len(ser.Input))
-	md.Output = make(map[string]data.TypedValue, len(ser.Output))
-
-	for _, attr := range ser.Settings {
-		md.Settings[attr.Name()] = attr
+func (md *Metadata) MarshalJSON() ([]byte, error) {
+	var mdSettings []*data.Attribute
+	var mdInputs []*data.Attribute
+	var mdOutputs []*data.Attribute
+
+	for _, v := range md.Settings {
+		if attr,ok := v.(*data.Attribute); ok {
+			mdSettings = append(mdSettings, attr)
+		}
 	}
-
-	for _, attr := range ser.Input {
-		md.Input[attr.Name()] = attr
+	for _, v := range md.Input {
+		if attr,ok := v.(*data.Attribute); ok {
+			mdInputs = append(mdInputs, attr)
+		}
 	}
-
-	for _, attr := range ser.Output {
-		md.Output[attr.Name()] = attr
+	for _, v := range md.Output {
+		if attr,ok := v.(*data.Attribute); ok {
+			mdOutputs = append(mdOutputs, attr)
+		}
 	}
 
-	return nil
+	return json.Marshal(&struct {
+		Settings []*data.Attribute `json:"settings,omitempty"`
+		Input  []*data.Attribute `json:"input,omitempty"`
+		Output []*data.Attribute `json:"output,omitempty"`
+	}{
+		Settings:mdSettings,
+		Input:  mdInputs,
+		Output: mdOutputs,
+	})
 }
 
+//func (md *Metadata) UnmarshalJSON(b []byte) error {
+//
+//	ser := &struct {
+//		Settings []*data.Attribute `json:"settings"`
+//		Input    []*data.Attribute `json:"input"`
+//		Output   []*data.Attribute `json:"output"`
+//	}{}
+//
+//	if err := json.Unmarshal(b, ser); err != nil {
+//		return err
+//	}
+//
+//	md.IOMetadata = &metadata.IOMetadata{}
+//
+//	md.Settings = make(map[string]data.TypedValue, len(ser.Settings))
+//	md.Output = make(map[string]data.TypedValue, len(ser.Output))
+//	md.Output = make(map[string]data.TypedValue, len(ser.Output))
+//
+//	for _, attr := range ser.Settings {
+//		md.Settings[attr.Name()] = attr
+//	}
+//
+//	for _, attr := range ser.Input {
+//		md.Input[attr.Name()] = attr
+//	}
+//
+//	for _, attr := range ser.Output {
+//		md.Output[attr.Name()] = attr
+//	}
+//
+//	return nil
+//}
+
 func ToMetadata(mdStructs ...interface{}) *Metadata {
 
 	var settings map[string]data.TypedValue

app/config.go

@@ -15,11 +15,11 @@ type Config struct {
 	Version     string `json:"version"`
 	Description string `json:"description"`
 
-	Imports    []string               `json:"imports"`
-	Properties []*data.Attribute      `json:"properties"`
-	Channels   []string               `json:"channels"`
+	Imports    []string               `json:"imports,omitempty"`
+	Properties []*data.Attribute      `json:"properties,omitempty"`
+	Channels   []string               `json:"channels,omitempty"`
 	Triggers   []*trigger.Config      `json:"triggers"`
 	Resources  []*resource.Config     `json:"resources"`
-	Actions    []*action.Config       `json:"actions"`
+	Actions    []*action.Config       `json:"actions,omitempty"`
 	Schemas    map[string]*schema.Def `json:"schemas,omitempty"`
 }

data/attribute.go

@@ -2,6 +2,7 @@ package data
 
 import (
 	"encoding/json"
+
 	"github.com/project-flogo/core/data/schema"
 )
 
@@ -49,15 +50,35 @@ func (a *Attribute) Schema() schema.Schema {
 	return a.schema
 }
 
-//todo temporary work around for attribute deserialization
+func (a *Attribute) MarshalJSON() ([]byte, error) {
+
+	val := a.value
+	if vs, ok := val.(string); ok {
+		if vs == "" {
+			val = nil //hack to omit empty string value
+		}
+	}
+
+	return json.Marshal(&struct {
+		Name   string      `json:"name"`
+		Type   string      `json:"type"`
+		Value  interface{} `json:"value,omitempty"`
+		Schema interface{} `json:"schema,omitempty"`
+	}{
+		Name:   a.name,
+		Type:   a.dataType.String(),
+		Value:  val,
+		Schema: a.schema,
+	})
+}
 
 // UnmarshalJSON implements json.Unmarshaler.UnmarshalJSON
 func (a *Attribute) UnmarshalJSON(data []byte) error {
 
 	ser := &struct {
 		Name   string      `json:"name"`
 		Type   string      `json:"type"`
-		Value  interface{} `json:"value"`
+		Value  interface{} `json:"value,omitempty"`
 		Schema interface{} `json:"schema,omitempty"`
 
 		//KeyType  string      `json:"keyType,omitempty"`

data/metadata/metadata.go

@@ -51,6 +51,31 @@ type IOMetadata struct {
 	Output map[string]data.TypedValue
 }
 
+func (md *IOMetadata) MarshalJSON() ([]byte, error) {
+	var mdInputs []*data.Attribute
+	var mdOutputs []*data.Attribute
+
+	for _, v := range md.Input {
+		if attr,ok := v.(*data.Attribute); ok {
+			mdInputs = append(mdInputs, attr)
+		}
+	}
+	for _, v := range md.Output {
+		if attr,ok := v.(*data.Attribute); ok {
+			mdOutputs = append(mdOutputs, attr)
+		}
+	}
+
+	return json.Marshal(&struct {
+		Input  []*data.Attribute `json:"input,omitempty"`
+		Output []*data.Attribute `json:"output,omitempty"`
+	}{
+		Input:  mdInputs,
+		Output: mdOutputs,
+	})
+}
+
+
 func (md *IOMetadata) UnmarshalJSON(b []byte) error {
 
 	ser := &struct {