[FABCAG-31] update to use only first part of JSON tag

Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
hyperledger · Oct 21, 2020 · 4f4fb4d · 4f4fb4d
1 parent 188bfec
commit 4f4fb4d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/metadata/schema.go b/metadata/schema.go
@@ -161,6 +161,12 @@ func getField(field reflect.StructField, schema *ObjectMetadata, components *Com
 		name = field.Tag.Get("json")
 	}
 
+	if strings.Contains(name, ",") {
+		spl := strings.Split(name, ",")
+
+		name = spl[0]
+	}
+
 	if name == "" || name == "-" {
 		name = field.Name
 	}

diff --git a/metadata/schema_test.go b/metadata/schema_test.go
@@ -32,21 +32,23 @@ type simpleStruct struct {
 	Prop6 string `metadata:"-"`
 	Prop7 string `metadata:",optional"`
 	Prop8 string `metadata:"prop8, optional"`
+	Prop9 string `json:"jsonname2,omitempty"`
 }
 
 var simpleStructPropertiesMap = map[string]spec.Schema{
-	"Prop1":    *spec.StringProperty(),
-	"propname": *spec.StringProperty(),
-	"jsonname": *spec.StringProperty(),
-	"Prop5":    *spec.StringProperty(),
-	"Prop7":    *spec.StringProperty(),
-	"prop8":    *spec.StringProperty(),
+	"Prop1":     *spec.StringProperty(),
+	"propname":  *spec.StringProperty(),
+	"jsonname":  *spec.StringProperty(),
+	"Prop5":     *spec.StringProperty(),
+	"Prop7":     *spec.StringProperty(),
+	"prop8":     *spec.StringProperty(),
+	"jsonname2": *spec.StringProperty(),
 }
 
 var simpleStructMetadata = ObjectMetadata{
 	ID:                   "simpleStruct",
 	Properties:           simpleStructPropertiesMap,
-	Required:             []string{"Prop1", "propname", "Prop5"},
+	Required:             []string{"Prop1", "propname", "Prop5", "jsonname2"},
 	AdditionalProperties: false,
 }