better format of model properties

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

@@ -11,24 +11,33 @@ import org.joda.time.DateTime
 
 {{#models}}
 {{#model}}
-
 case class {{classname}} (
-  {{#vars}}{{#description}}/* {{{description}}} */
+  {{#vars}}
-  {{/description}}{{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
+  {{#description}}
-  {{/vars}} extends ApiModel
+  /* {{{description}}} */
+  {{/description}}
+  {{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
+  {{/vars}}
+) extends ApiModel
 
 {{#hasEnums}}
 object {{classname}}Enums {
 
-  {{#vars}}{{#isEnum}}type {{datatypeWithEnum}} = {{datatypeWithEnum}}.Value
+  {{#vars}}
-  {{/isEnum}}{{/vars}}
+  {{#isEnum}}
-  {{#vars}}{{#isEnum}}object {{datatypeWithEnum}} extends Enumeration {
+  type {{datatypeWithEnum}} = {{datatypeWithEnum}}.Value
+  {{/isEnum}}
+  {{/vars}}
+  {{#vars}}
+  {{#isEnum}}
+  object {{datatypeWithEnum}} extends Enumeration {
 {{#_enum}}
     val {{#fnEnumEntry}}{{.}}{{/fnEnumEntry}} = Value("{{.}}")
 {{/_enum}}
   }
 
-  {{/isEnum}}{{/vars}}
+  {{/isEnum}}
+  {{/vars}}
 }
 {{/hasEnums}}
 {{/model}}

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

@@ -1,16 +1,19 @@
 {{>licenseInfo}}
 package {{package}}
 
-{{#imports}}import {{import}}
+{{#imports}}
+import {{import}}
 {{/imports}}
 
 {{#models}}
-
 {{#model}}
-
 case class {{classname}} (
-  {{#vars}}{{#description}}/* {{{description}}} */
+  {{#vars}}
-  {{/description}}{{name}}: {{{datatype}}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
+  {{#description}}
+  /* {{{description}}} */
+  {{/description}}
+  {{name}}: {{{datatype}}}{{#hasMore}},{{/hasMore}}
   {{/vars}}
+)
 {{/model}}
 {{/models}}

modules/swagger-codegen/src/main/resources/scalatra/model.mustache

@@ -6,10 +6,13 @@ package {{package}}
 {{/imports}}
 
 {{#models}}
-
 {{#model}}
 case class {{classname}} (
-  {{#vars}}{{name}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{#description}}  // {{description}}{{/description}}
+  {{#vars}}
+  {{#description}}
+  /* {{{description}}} */
+  {{/description}}
+  {{name}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
   {{/vars}}
 )
 {{/model}}

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

@@ -6,8 +6,8 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.Pet
-import java.io.File
 import io.swagger.client.model.ApiResponse
+import java.io.File
 import io.swagger.client.core._
 import io.swagger.client.core.CollectionFormats._
 import io.swagger.client.core.ApiKeyLocations._

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

@@ -9,11 +9,10 @@ package io.swagger.client.model
 import io.swagger.client.core.ApiModel
 import org.joda.time.DateTime
 
-
 case class ApiResponse (
   code: Option[Int],
   `type`: Option[String],
-  message: Option[String])
+  message: Option[String]
-   extends ApiModel
+) extends ApiModel
 
 

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

@@ -9,10 +9,9 @@ package io.swagger.client.model
 import io.swagger.client.core.ApiModel
 import org.joda.time.DateTime
 
-
 case class Category (
   id: Option[Long],
-  name: Option[String])
+  name: Option[String]
-   extends ApiModel
+) extends ApiModel
 
 

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

@@ -9,7 +9,6 @@ package io.swagger.client.model
 import io.swagger.client.core.ApiModel
 import org.joda.time.DateTime
 
-
 case class Order (
   id: Option[Long],
   petId: Option[Long],
@@ -17,19 +16,17 @@ case class Order (
   shipDate: Option[DateTime],
   /* Order Status */
   status: Option[OrderEnums.Status],
-  complete: Option[Boolean])
+  complete: Option[Boolean]
-   extends ApiModel
+) extends ApiModel
 
 object OrderEnums {
 
   type Status = Status.Value
-  
   object Status extends Enumeration {
     val Placed = Value("placed")
     val Approved = Value("approved")
     val Delivered = Value("delivered")
   }
 
-  
 }
 

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

@@ -9,7 +9,6 @@ package io.swagger.client.model
 import io.swagger.client.core.ApiModel
 import org.joda.time.DateTime
 
-
 case class Pet (
   id: Option[Long],
   category: Option[Category],
@@ -17,19 +16,17 @@ case class Pet (
   photoUrls: Seq[String],
   tags: Option[Seq[Tag]],
   /* pet status in the store */
-  status: Option[PetEnums.Status])
+  status: Option[PetEnums.Status]
-   extends ApiModel
+) extends ApiModel
 
 object PetEnums {
 
   type Status = Status.Value
-  
   object Status extends Enumeration {
     val Available = Value("available")
     val Pending = Value("pending")
     val Sold = Value("sold")
   }
 
-  
 }
 

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

@@ -9,10 +9,9 @@ package io.swagger.client.model
 import io.swagger.client.core.ApiModel
 import org.joda.time.DateTime
 
-
 case class Tag (
   id: Option[Long],
-  name: Option[String])
+  name: Option[String]
-   extends ApiModel
+) extends ApiModel
 
 

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

@@ -9,7 +9,6 @@ package io.swagger.client.model
 import io.swagger.client.core.ApiModel
 import org.joda.time.DateTime
 
-
 case class User (
   id: Option[Long],
   username: Option[String],
@@ -19,7 +18,7 @@ case class User (
   password: Option[String],
   phone: Option[String],
   /* User Status */
-  userStatus: Option[Int])
+  userStatus: Option[Int]
-   extends ApiModel
+) extends ApiModel
 
 

samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala

@@ -25,8 +25,8 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.Pet
-import java.io.File
 import io.swagger.client.model.ApiResponse
+import java.io.File
 import io.swagger.client.ApiInvoker
 import io.swagger.client.ApiException
 

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

@@ -25,9 +25,8 @@
 package io.swagger.client.model
 
 
-
-
 case class ApiResponse (
   code: Integer,
-_type: String,
+  _type: String,
-message: String)
+  message: String
+)

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

@@ -25,8 +25,7 @@
 package io.swagger.client.model
 
 
-
-
 case class Category (
   id: Long,
-name: String)
+  name: String
+)

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

@@ -26,13 +26,12 @@ package io.swagger.client.model
 
 import org.joda.time.DateTime
 
-
-
 case class Order (
   id: Long,
-petId: Long,
+  petId: Long,
-quantity: Integer,
+  quantity: Integer,
-shipDate: DateTime,
+  shipDate: DateTime,
-/* Order Status */
+  /* Order Status */
   status: String,
-complete: Boolean)
+  complete: Boolean
+)

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

@@ -25,13 +25,12 @@
 package io.swagger.client.model
 
 
-
-
 case class Pet (
   id: Long,
-category: Category,
+  category: Category,
-name: String,
+  name: String,
-photoUrls: List[String],
+  photoUrls: List[String],
-tags: List[Tag],
+  tags: List[Tag],
-/* pet status in the store */
+  /* pet status in the store */
-  status: String)
+  status: String
+)

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

@@ -25,8 +25,7 @@
 package io.swagger.client.model
 
 
-
-
 case class Tag (
   id: Long,
-name: String)
+  name: String
+)

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

@@ -25,15 +25,14 @@
 package io.swagger.client.model
 
 
-
-
 case class User (
   id: Long,
-username: String,
+  username: String,
-firstName: String,
+  firstName: String,
-lastName: String,
+  lastName: String,
-email: String,
+  email: String,
-password: String,
+  password: String,
-phone: String,
+  phone: String,
-/* User Status */
+  /* User Status */
-  userStatus: Integer)
+  userStatus: Integer
+)

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala

@@ -25,8 +25,8 @@
 package com.wordnik.client.api
 
 import com.wordnik.client.model.Pet
-import java.io.File
 import com.wordnik.client.model.ApiResponse
+import java.io.File
 
 import java.io.File
 

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala

@@ -25,9 +25,8 @@
 package com.wordnik.client.model
 
 
-
 case class ApiResponse (
   code: Option[Int],
-_type: Option[String],
+  _type: Option[String],
-message: Option[String]
+  message: Option[String]
 )

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala

@@ -25,8 +25,7 @@
 package com.wordnik.client.model
 
 
-
 case class Category (
   id: Option[Long],
-name: Option[String]
+  name: Option[String]
 )

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala

@@ -26,12 +26,12 @@ package com.wordnik.client.model
 
 import java.util.Date
 
-
 case class Order (
   id: Option[Long],
-petId: Option[Long],
+  petId: Option[Long],
-quantity: Option[Int],
+  quantity: Option[Int],
-shipDate: Option[Date],
+  shipDate: Option[Date],
-status: Option[String],  // Order Status
+  /* Order Status */
-complete: Option[Boolean]
+  status: Option[String],
+  complete: Option[Boolean]
 )

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala

@@ -25,12 +25,12 @@
 package com.wordnik.client.model
 
 
-
 case class Pet (
   id: Option[Long],
-category: Option[Category],
+  category: Option[Category],
-name: String,
+  name: String,
-photoUrls: List[String],
+  photoUrls: List[String],
-tags: Option[List[Tag]],
+  tags: Option[List[Tag]],
-status: Option[String]  // pet status in the store
+  /* pet status in the store */
+  status: Option[String]
 )

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala

@@ -25,8 +25,7 @@
 package com.wordnik.client.model
 
 
-
 case class Tag (
   id: Option[Long],
-name: Option[String]
+  name: Option[String]
 )

samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala

@@ -25,14 +25,14 @@
 package com.wordnik.client.model
 
 
-
 case class User (
   id: Option[Long],
-username: Option[String],
+  username: Option[String],
-firstName: Option[String],
+  firstName: Option[String],
-lastName: Option[String],
+  lastName: Option[String],
-email: Option[String],
+  email: Option[String],
-password: Option[String],
+  password: Option[String],
-phone: Option[String],
+  phone: Option[String],
-userStatus: Option[Int]  // User Status
+  /* User Status */
+  userStatus: Option[Int]
 )