Merge pull request #742 from swagger-api/pr-268-conflict-fix

HugoMario · web-flow · commit 4534cf9a8b24 · 2020-08-14T00:58:36.000-05:00
ported changes from #268
diff --git a/src/main/resources/handlebars/scala/client/model.mustache b/src/main/resources/handlebars/scala/client/model.mustache
@@ -20,7 +20,7 @@ import {{import}}
  */
 case class {{classname}} (
   {{#vars}}
-  {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
+  {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
   {{/vars}}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import {{import}}`
`20`	`20`	`*/`
`21`	`21`	`case class {{classname}} (`
`22`	`22`	`{{#vars}}`
`23`		`- {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}`
	`23`	`+ {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}`
`24`	`24`	`{{/vars}}`
`25`	`25`	`)`
`26`	`26`