loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-06 15:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

better format of model properties

Browse Source
This commit is contained in:
wing328 2016-09-11 18:44:36 +08:00
parent bd3a15e273
commit ac69f45ddc
24 changed files with 98 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,24 +11,33 @@ import org.joda.time.DateTime
{{#models}} {{#models}}
{{#model}} {{#model}}
case class {{classname}} ( 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}} {{#hasEnums}}
object {{classname}}Enums { 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}} {{#_enum}}
val {{#fnEnumEntry}}{{.}}{{/fnEnumEntry}} = Value("{{.}}") val {{#fnEnumEntry}}{{.}}{{/fnEnumEntry}} = Value("{{.}}")
{{/_enum}} {{/_enum}}
} }
{{/isEnum}}{{/vars}} {{/isEnum}}
{{/vars}}
} }
{{/hasEnums}} {{/hasEnums}}
{{/model}} {{/model}}

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

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

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

@ -6,10 +6,13 @@ package {{package}}
{{/imports}} {{/imports}}
{{#models}} {{#models}}
{{#model}} {{#model}}
case class {{classname}} ( 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}} {{/vars}}
) )
{{/model}} {{/model}}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -25,8 +25,6 @@
package io.swagger.client.model package io.swagger.client.model
case class Pet ( case class Pet (
id: Long, id: Long,
category: Category, category: Category,
@ -34,4 +32,5 @@ 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
)

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

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

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

@ -25,8 +25,6 @@
package io.swagger.client.model package io.swagger.client.model
case class User ( case class User (
id: Long, id: Long,
username: String, username: String,
@ -36,4 +34,5 @@ email: String,
password: String, password: String,
phone: String, phone: String,
/* User Status */ /* User Status */
userStatus: Integer) userStatus: Integer
)

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

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

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

@ -25,7 +25,6 @@
package com.wordnik.client.model package com.wordnik.client.model
case class ApiResponse ( case class ApiResponse (
code: Option[Int], code: Option[Int],
_type: Option[String], _type: Option[String],

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

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

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

@ -26,12 +26,12 @@ package com.wordnik.client.model
import java.util.Date import java.util.Date
case class Order ( case class Order (
id: Option[Long], 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 */
status: Option[String],
complete: Option[Boolean] complete: Option[Boolean]
) )

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

@ -25,12 +25,12 @@
package com.wordnik.client.model package com.wordnik.client.model
case class Pet ( case class Pet (
id: Option[Long], 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]
) )

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

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

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

@ -25,7 +25,6 @@
package com.wordnik.client.model package com.wordnik.client.model
case class User ( case class User (
id: Option[Long], id: Option[Long],
username: Option[String], username: Option[String],
@ -34,5 +33,6 @@ 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]
) )