Refactor: Extract method

GoComply · Sep 17, 2020 · a400958 · a400958
1 parent 062d3e7
commit a400958
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/metaschema/parser/main.go b/metaschema/parser/main.go
@@ -170,6 +170,10 @@ func (df *DefineField) IsMarkup() bool {
 	return df.AsType == AsTypeMarkupMultiLine
 }
 
+func (df *DefineField) JsonName() string {
+	return "value"
+}
+
 type DefineFlag struct {
 	Name     string   `xml:"name,attr"`
 	AsType   datatype `xml:"as-type,attr"`

diff --git a/metaschema/templates/generated_models.tmpl b/metaschema/templates/generated_models.tmpl
@@ -57,7 +57,7 @@ type {{.GoTypeName}} struct {
   {{.GoName}} {{.GoDatatype}} `xml:"{{.XmlName}},attr,omitempty" json:"{{.JsonName}},omitempty"`
   {{end -}}
 
-  Value string `xml:",chardata" json:"value,omitempty"`
+  Value string `xml:",chardata" json:"{{.JsonName}},omitempty"`
 }
 {{- else}}
   {{- if .IsMarkup }}