Merge pull request #494 from okta/ssaxena/fix-code-gen

Fix codegen process to avoid manual intervention

Author: sachinsaxena-okta

.generator/templates/model_oneof.mustache

@@ -1,3 +1,4 @@
+
 //model_oneof.mustache
 // {{classname}} - {{{description}}}{{^description}}struct for {{{classname}}}{{/description}}
 type {{classname}} struct {
@@ -59,8 +60,8 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
         // try to unmarshal data into {{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}
         err = json.Unmarshal(data, &dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
         if err == nil {
-                json{{{.}}}, _ := json.Marshal(dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
-                if string(json{{{.}}}) == "{}" { // empty struct
+                json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}, _ := json.Marshal(dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
+                if string(json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}) == "{}" { // empty struct
                         dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
                 } else {
                         match++
@@ -142,4 +143,4 @@ func (obj *{{classname}}) GetActualInstance() (interface{}) {
 	return nil
 }
 
-{{>nullable_model}}
+{{>nullable_model}}