Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion blacklist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ featuretoggle
workflows
openstack
notebooks
observability
cost
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{#isArray}}[{{#items}}{{#isString}}"example"{{/isString}}{{/items}}]{{/isArray}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{#isContainer}}{{#isMap}}{"map":{{#items}}{{> custom/helper/array_json_example_value}}{{^isArray}}{{#isString}}"example"{{/isString}}{{/isArray}}{{/items}}}{{/isMap}}{{^isMap}}{{> custom/helper/array_json_example_value}}{{/isMap}}{{/isContainer}}
16 changes: 12 additions & 4 deletions templates/go/custom/model_oneof_test.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,23 @@ func Test{{{classname}}}_UnmarshalJSON(t *testing.T) {
wantErr: false,
},
{{/allowableValues.values}}
{{^allowableValues.values}}{{^isModel}}
{{^allowableValues.values}}{{^isModel}}{{^isContainer}}
{
name: "success - {{dataType}} {{example}}",
name: "success - {{dataType}} {{{example}}}",
args: args{
src: []byte(`"{{example}}"`),
src: []byte(`"{{{example}}}"`),
},
wantErr: false,
},
{{/isModel}}{{/allowableValues.values}}
{{/isContainer}}{{#isContainer}}
{
name: "success - {{dataType}}",
args: args{
src: []byte(`{{>custom/helper/container_json_example_value}}`),
},
wantErr: false,
},
{{/isContainer}}{{/isModel}}{{/allowableValues.values}}
{{#-last}}
}
for _, tt := range tests {
Expand Down
4 changes: 2 additions & 2 deletions templates/go/model_oneof.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
dst{{classname}}{{-index}} := &{{classname}}{}
err = json.Unmarshal(data, &dst{{classname}}{{-index}}.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
if err == nil {
json{{{.}}}, _ := json.Marshal(&dst{{classname}}{{-index}}.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}, _ := json.Marshal(&dst{{classname}}{{-index}}.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
{{#pattern}}
regex := `{{.}}`
regex = regexp.MustCompile("^\\/|\\/$").ReplaceAllString(regex, "$1") // Remove beginning slash and ending slash
regex = regexp.MustCompile("\\\\(.)").ReplaceAllString(regex, "$1") // Remove duplicate escaping char for dots
rawString := regexp.MustCompile(`^"|"$`).ReplaceAllString(*dst{{classname}}{{-index}}.{{#lambda.type-to-name}}{{dataType}}{{/lambda.type-to-name}}, "$1") // Remove quotes
isMatched, _ := regexp.MatchString(regex, rawString)
{{/pattern}}
if string(json{{{.}}}) != "{}" {{#pattern}}&& isMatched {{/pattern}} { // empty struct
if string(json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}) != "{}" {{#pattern}}&& isMatched {{/pattern}} { // empty struct
dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = dst{{classname}}{{-index}}.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}
match++
}
Expand Down
Loading