Skip to content

Commit 6db7c06

Browse files
committed
fix akka model import and optionals
1 parent c63e9d3 commit 6db7c06

File tree

9 files changed

+29
-28
lines changed

9 files changed

+29
-28
lines changed

modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{{>licenseInfo}}
22
package {{apiPackage}}
33

4-
{{#models.length}}
4+
{{#models.0}}
55
import {{modelPackage}}._
6-
{{/models.length}}
6+
{{/models.0}}
77
import org.json4s._
88
import scala.reflect.ClassTag
99

modules/swagger-codegen/src/main/resources/akka-scala/model.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ case class {{classname}} (
1212
{{#description}}
1313
/* {{{description}}} */
1414
{{/description}}
15-
{{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
15+
{{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
1616
{{/vars}}
1717
) extends ApiModel
1818

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*/
1212
package io.swagger.client.api
1313

14+
import io.swagger.client.model._
1415
import org.json4s._
1516
import scala.reflect.ClassTag
1617

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import org.joda.time.DateTime
1616
import java.util.UUID
1717

1818
case class ApiResponse (
19-
code: Option[Int],
20-
`type`: Option[String],
21-
message: Option[String]
19+
code: Option[Int] = None,
20+
`type`: Option[String] = None,
21+
message: Option[String] = None
2222
) extends ApiModel
2323

2424

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import org.joda.time.DateTime
1616
import java.util.UUID
1717

1818
case class Category (
19-
id: Option[Long],
20-
name: Option[String]
19+
id: Option[Long] = None,
20+
name: Option[String] = None
2121
) extends ApiModel
2222

2323

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import org.joda.time.DateTime
1616
import java.util.UUID
1717

1818
case class Order (
19-
id: Option[Long],
20-
petId: Option[Long],
21-
quantity: Option[Int],
22-
shipDate: Option[DateTime],
19+
id: Option[Long] = None,
20+
petId: Option[Long] = None,
21+
quantity: Option[Int] = None,
22+
shipDate: Option[DateTime] = None,
2323
/* Order Status */
24-
status: Option[OrderEnums.Status],
25-
complete: Option[Boolean]
24+
status: Option[OrderEnums.Status] = None,
25+
complete: Option[Boolean] = None
2626
) extends ApiModel
2727

2828
object OrderEnums {

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import org.joda.time.DateTime
1616
import java.util.UUID
1717

1818
case class Pet (
19-
id: Option[Long],
20-
category: Option[Category],
19+
id: Option[Long] = None,
20+
category: Option[Category] = None,
2121
name: String,
2222
photoUrls: Seq[String],
23-
tags: Option[Seq[Tag]],
23+
tags: Option[Seq[Tag]] = None,
2424
/* pet status in the store */
25-
status: Option[PetEnums.Status]
25+
status: Option[PetEnums.Status] = None
2626
) extends ApiModel
2727

2828
object PetEnums {

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import org.joda.time.DateTime
1616
import java.util.UUID
1717

1818
case class Tag (
19-
id: Option[Long],
20-
name: Option[String]
19+
id: Option[Long] = None,
20+
name: Option[String] = None
2121
) extends ApiModel
2222

2323

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import org.joda.time.DateTime
1616
import java.util.UUID
1717

1818
case class User (
19-
id: Option[Long],
20-
username: Option[String],
21-
firstName: Option[String],
22-
lastName: Option[String],
23-
email: Option[String],
24-
password: Option[String],
25-
phone: Option[String],
19+
id: Option[Long] = None,
20+
username: Option[String] = None,
21+
firstName: Option[String] = None,
22+
lastName: Option[String] = None,
23+
email: Option[String] = None,
24+
password: Option[String] = None,
25+
phone: Option[String] = None,
2626
/* User Status */
27-
userStatus: Option[Int]
27+
userStatus: Option[Int] = None
2828
) extends ApiModel
2929

3030

0 commit comments

Comments
 (0)