Merge pull request #468 from digital-atelier/issue-467-default-init-param-values

HugoMario · web-flow · commit e794de3ed2e4 · 2019-10-03T03:59:34.000-05:00
Fix issue 467: Add = nil to the init template in swift 4
diff --git a/src/main/resources/handlebars/swift4/modelObject.mustache b/src/main/resources/handlebars/swift4/modelObject.mustache
@@ -11,7 +11,7 @@ public struct {{classname}}: Codable {
         }
     }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 {{/isNot}}{{/allVars}}{{#has this 'vars'}}
-    public init({{#allVars}}{{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#has this 'more'}}, {{/has}}{{/allVars}}) { {{#allVars}}
+    public init({{#allVars}}{{name}}: {{{datatypeWithEnum}}}{{^required}}? = nil{{/required}}{{#has this 'more'}}, {{/has}}{{/allVars}}) { {{#allVars}}
         self.{{name}} = {{name}}{{/allVars}}
     }
 {{/has~}}{{#additionalPropertiesType}}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public struct {{classname}}: Codable {`
`11`	`11`	`}`
`12`	`12`	`}{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}`
`13`	`13`	`{{/isNot}}{{/allVars}}{{#has this 'vars'}}`
`14`		`- public init({{#allVars}}{{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#has this 'more'}}, {{/has}}{{/allVars}}) { {{#allVars}}`
	`14`	`+ public init({{#allVars}}{{name}}: {{{datatypeWithEnum}}}{{^required}}? = nil{{/required}}{{#has this 'more'}}, {{/has}}{{/allVars}}) { {{#allVars}}`
`15`	`15`	`self.{{name}} = {{name}}{{/allVars}}`
`16`	`16`	`}`
`17`	`17`	`{{/has~}}{{#additionalPropertiesType}}`