Skip to content

Commit aabe12e

Browse files
fehguyfehguy
committed
merged from develop
1 parent bfa98dd commit aabe12e

File tree

10 files changed

+111
-231
lines changed

10 files changed

+111
-231
lines changed

‎samples/scala-play2/app/Global.scala‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import play.api._
2+
3+
import com.wordnik.swagger.config._
4+
import com.wordnik.swagger.model._
5+
6+
7+
object Global extends GlobalSettings {
8+
val info = ApiInfo(
9+
title = "Swagger Sample App",
10+
description = """This is a sample server Petstore server. You can find out more about Swagger
11+
at <a href="http://swagger.wordnik.com">http://swagger.wordnik.com</a> or on irc.freenode.net, #swagger. For this sample,
12+
you can use the api key "special-key" to test the authorization filters""",
13+
termsOfServiceUrl = "http://helloreverb.com/terms/",
14+
contact = "[email protected]",
15+
license = "Apache 2.0",
16+
licenseUrl = "http://www.apache.org/licenses/LICENSE-2.0.html")
17+
18+
ConfigFactory.config.info = Some(info)
19+
}

‎samples/scala-play2/app/api/PetData.scala‎

Lines changed: 20 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,29 @@ class PetData {
2929
val categories: ListBuffer[Category] = new ListBuffer[Category]()
3030

3131
{
32-
categories += createCategory(1, "Dogs")
33-
categories += createCategory(2, "Cats")
34-
categories += createCategory(3, "Rabbits")
35-
categories += createCategory(4, "Lions")
32+
categories += Category(1, "Dogs")
33+
categories += Category(2, "Cats")
34+
categories += Category(3, "Rabbits")
35+
categories += Category(4, "Lions")
3636

37-
pets += createPet(1, categories(1), "Cat 1", List("url1", "url2"), List("tag1", "tag2"), "available")
38-
pets += createPet(2, categories(1), "Cat 2", List("url1", "url2"), List("tag2", "tag3"), "available")
39-
pets += createPet(3, categories(1), "Cat 3", List("url1", "url2"), List("tag3", "tag4"), "pending")
37+
pets += Pet(1, categories(1), "Cat 1", List("url1", "url2"), List(Tag(1, "tag1"), Tag(2, "tag2")), "available")
38+
pets += Pet(2, categories(1), "Cat 2", List("url1", "url2"), List(Tag(2, "tag2"), Tag(3, "tag3")), "available")
39+
pets += Pet(3, categories(1), "Cat 3", List("url1", "url2"), List(Tag(3, "tag3"), Tag(4, "tag4")), "pending")
4040

41-
pets += createPet(4, categories(0), "Dog 1", List("url1", "url2"), List("tag1", "tag2"), "available")
42-
pets += createPet(5, categories(0), "Dog 2", List("url1", "url2"), List("tag2", "tag3"), "sold")
43-
pets += createPet(6, categories(0), "Dog 3", List("url1", "url2"), List("tag3", "tag4"), "pending")
41+
pets += Pet(4, categories(0), "Dog 1", List("url1", "url2"), List(Tag(1, "tag1"), Tag(2, "tag2")), "available")
42+
pets += Pet(5, categories(0), "Dog 2", List("url1", "url2"), List(Tag(2, "tag2"), Tag(3, "tag3")), "sold")
43+
pets += Pet(6, categories(0), "Dog 3", List("url1", "url2"), List(Tag(3, "tag3"), Tag(4, "tag4")), "pending")
4444

45-
pets += createPet(7, categories(3), "Lion 1", List("url1", "url2"), List("tag1", "tag2"), "available")
46-
pets += createPet(8, categories(3), "Lion 2", List("url1", "url2"), List("tag2", "tag3"), "available")
47-
pets += createPet(9, categories(3), "Lion 3", List("url1", "url2"), List("tag3", "tag4"), "available")
45+
pets += Pet(7, categories(3), "Lion 1", List("url1", "url2"), List(Tag(1, "tag1"), Tag(2, "tag2")), "available")
46+
pets += Pet(8, categories(3), "Lion 2", List("url1", "url2"), List(Tag(2, "tag2"), Tag(3, "tag3")), "available")
47+
pets += Pet(9, categories(3), "Lion 3", List("url1", "url2"), List(Tag(3, "tag3"), Tag(4, "tag4")), "available")
4848

49-
pets += createPet(10, categories(2), "Rabbit 1", List("url1", "url2"), List("tag3", "tag4"), "available")
49+
pets += Pet(10, categories(2), "Rabbit 1", List("url1", "url2"), List(Tag(3, "tag3"), Tag(4, "tag4")), "available")
5050

5151
}
5252

5353
def getPetbyId(petId: Long): Option[Pet] = {
54-
pets.filter(pet => pet.getId == petId) match {
54+
pets.filter(pet => pet.id == petId) match {
5555
case pets if(pets.size) > 0 => Some(pets.head)
5656
case _ => None
5757
}
@@ -61,7 +61,7 @@ class PetData {
6161
var statues = status.split(",")
6262
var result = new java.util.ArrayList[Pet]()
6363
for (pet <- pets) {
64-
if (statues.contains(pet.getStatus())) {
64+
if (statues.contains(pet.status)) {
6565
result.add(pet)
6666
}
6767
}
@@ -72,9 +72,9 @@ class PetData {
7272
var tagList = tags.split(",")
7373
var result = new java.util.ArrayList[Pet]()
7474
for (pet <- pets) {
75-
if (null != pet.getTags()) {
76-
for (tag <- pet.getTags()) {
77-
if (tagList.contains(tag.getName)) {
75+
if (null != pet.tags) {
76+
for (tag <- pet.tags) {
77+
if (tagList.contains(tag.name)) {
7878
result.add(pet)
7979
}
8080
}
@@ -84,46 +84,7 @@ class PetData {
8484
}
8585

8686
def addPet(pet: Pet): Unit = {
87-
pets --= pets.filter(existing => existing.getId == pet.getId)
87+
pets --= pets.filter(existing => existing.id == pet.id)
8888
pets += pet
8989
}
90-
91-
private def createPet(id: Long, cat: Category, name: String, urls: List[String], tags: List[String], status: String): Pet = {
92-
val pet = new Pet
93-
pet.setId(id)
94-
pet.setCategory(cat)
95-
pet.setName(name)
96-
if (null != urls) {
97-
var urlObjs: java.util.List[String] = new java.util.ArrayList[String]()
98-
for (urlString <- urls) {
99-
urlObjs.add(urlString)
100-
}
101-
pet.setPhotoUrls(urlObjs)
102-
}
103-
var tagObjs: java.util.List[Tag] = new java.util.ArrayList[Tag]()
104-
var i = 0
105-
if (null != tags) {
106-
for (tagString <- tags) {
107-
i = i + 1
108-
val tag = new Tag()
109-
tag.setId(i)
110-
tag.setName(tagString)
111-
tagObjs.add(tag)
112-
}
113-
}
114-
pet.setTags(tagObjs)
115-
pet.setStatus(status)
116-
pet
117-
}
118-
119-
private def createCategory(id: Long, name: String): Category = {
120-
val category = new Category
121-
category.setId(id)
122-
category.setName(name)
123-
category
124-
}
12590
}
126-
127-
class PetStoreApi {
128-
129-
}

‎samples/scala-play2/app/api/StoreData.scala‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,24 @@ import java.util.Date
2525
class StoreData {
2626
val orders: ListBuffer[Order] = new ListBuffer[Order]()
2727

28-
{
29-
orders += createOrder(1, 1, 2, new Date(), "placed")
30-
orders += createOrder(2, 1, 2, new Date(), "delivered")
31-
orders += createOrder(3, 2, 2, new Date(), "placed")
32-
orders += createOrder(4, 2, 2, new Date(), "delivered")
33-
orders += createOrder(5, 3, 2, new Date(), "placed")
34-
}
28+
orders += Order(1, 1, 2, new Date(), "placed")
29+
orders += Order(2, 1, 2, new Date(), "delivered")
30+
orders += Order(3, 2, 2, new Date(), "placed")
31+
orders += Order(4, 2, 2, new Date(), "delivered")
32+
orders += Order(5, 3, 2, new Date(), "placed")
3533

3634
def findOrderById(orderId: Long): Option[Order] = {
37-
orders.filter(order => order.getId == orderId) match {
35+
orders.filter(order => order.id == orderId) match {
3836
case orders if (orders.size) > 0 => Some(orders.head)
3937
case _ => None
4038
}
4139
}
4240

4341
def placeOrder(order: Order) = {
44-
// remove any pets with same id
45-
orders --= orders.filter(o => o.getId == order.getId)
42+
// remove any orders with same id
43+
orders --= orders.filter(o => o.id == order.id)
4644
orders += order
4745
}
4846

49-
def deleteOrder(orderId: Long): Unit = {
50-
orders --= orders.filter(o => o.getId == orderId)
51-
}
52-
53-
private def createOrder(id: Long, petId: Long, quantity: Int, shipDate: Date, status: String): Order = {
54-
val order = new Order()
55-
order.setId(id)
56-
order.setPetId(petId)
57-
order.setQuantity(quantity)
58-
order.setShipDate(shipDate)
59-
order.setStatus(status)
60-
order
61-
}
47+
def deleteOrder(orderId: Long) = orders --= orders.filter(o => o.id == orderId)
6248
}

‎samples/scala-play2/app/api/UserData.scala‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,50 +25,37 @@ class UserData {
2525
val users: ListBuffer[User] = new ListBuffer[User]()
2626

2727
{
28-
users += createUser(1, "user1", "first name 1", "last name 1", "[email protected]", "123-456-7890", 1)
29-
users += createUser(2, "user2", "first name 2", "last name 2", "[email protected]", "123-456-7890", 2)
30-
users += createUser(3, "user3", "first name 3", "last name 3", "[email protected]", "123-456-7890", 3)
31-
users += createUser(4, "user4", "first name 4", "last name 4", "[email protected]", "123-456-7890", 1)
32-
users += createUser(5, "user5", "first name 5", "last name 5", "[email protected]", "123-456-7890", 2)
33-
users += createUser(6, "user6", "first name 6", "last name 6", "[email protected]", "123-456-7890", 3)
34-
users += createUser(7, "user7", "first name 7", "last name 7", "[email protected]", "123-456-7890", 1)
35-
users += createUser(8, "user8", "first name 8", "last name 8", "[email protected]", "123-456-7890", 2)
36-
users += createUser(9, "user9", "first name 9", "last name 9", "[email protected]", "123-456-7890", 3)
37-
users += createUser(10, "user10", "first name 10", "last name 10", "[email protected]", "123-456-7890", 1)
38-
users += createUser(11, "user?10", "first name ?10", "last name ?10", "[email protected]", "123-456-7890", 1)
28+
users += User(1, "user1", "first name 1", "last name 1", "[email protected]", "xxxx", "123-456-7890", 1)
29+
users += User(2, "user2", "first name 2", "last name 2", "[email protected]", "xxxx", "123-456-7890", 2)
30+
users += User(3, "user3", "first name 3", "last name 3", "[email protected]", "xxxx", "123-456-7890", 3)
31+
users += User(4, "user4", "first name 4", "last name 4", "[email protected]", "xxxx", "123-456-7890", 1)
32+
users += User(5, "user5", "first name 5", "last name 5", "[email protected]", "xxxx", "123-456-7890", 2)
33+
users += User(6, "user6", "first name 6", "last name 6", "[email protected]", "xxxx", "123-456-7890", 3)
34+
users += User(7, "user7", "first name 7", "last name 7", "[email protected]", "xxxx", "123-456-7890", 1)
35+
users += User(8, "user8", "first name 8", "last name 8", "[email protected]", "xxxx", "123-456-7890", 2)
36+
users += User(9, "user9", "first name 9", "last name 9", "[email protected]", "xxxx", "123-456-7890", 3)
37+
users += User(10, "user10", "first name 10", "last name 10", "[email protected]", "xxxx", "123-456-7890", 1)
38+
users += User(11, "user?10", "first name ?10", "last name ?10", "[email protected]", "xxxx", "123-456-7890", 1)
3939

4040
}
4141

4242
def findUserByName(username: String): Option[User] = {
43-
users.filter(user => user.getUsername == username) match {
43+
users.filter(user => user.username == username) match {
4444
case user if (user.size) > 0 => Some(user.head)
4545
case _ => None
4646
}
4747
}
4848

4949
def addUser(user: User): Unit = {
50-
users --= users.filter(u => u.getId == user.getId)
50+
users --= users.filter(u => u.id == user.id)
5151
users += user
5252
}
5353

5454
def removeUser(username: String): Unit = {
5555
for (user <- users) {
56-
if (user.getUsername() == username) {
56+
if (user.username == username) {
5757
users -= user
5858
}
5959
}
6060
}
61-
62-
private def createUser(id: Long, username: String, firstName: String, lastName: String, email: String, phone: String, userStatus: Int): User = {
63-
var user = new User
64-
user.setId(id)
65-
user.setUsername(username)
66-
user.setFirstName(firstName)
67-
user.setLastName(lastName)
68-
user.setEmail(email)
69-
user.setPassword("XXXXXXXXXXX")
70-
user.setPhone(phone)
71-
user.setUserStatus(userStatus)
72-
user
73-
}
7461
}

‎samples/scala-play2/app/models/Category.scala‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@
1616

1717
package models
1818

19-
import javax.xml.bind.annotation.{ XmlRootElement, XmlElement }
19+
import com.wordnik.swagger.annotations._
2020

21-
import scala.reflect.BeanProperty
21+
import scala.annotation.target.field
2222

23-
@XmlRootElement(name = "Category")
24-
class Category() {
25-
@XmlElement(name = "id")
26-
@BeanProperty
27-
var id: Long = 0
28-
29-
@XmlRootElement(name = "name")
30-
@BeanProperty
31-
var name: String = _
32-
}
23+
@ApiModel(value="Category",description="category of a pet")
24+
case class Category(
25+
@(ApiModelProperty @field)(position=1)id: Long,
26+
@(ApiModelProperty @field)(position=2)name: String)

‎samples/scala-play2/app/models/Order.scala‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,14 @@ package models
1919
import com.wordnik.swagger.annotations._
2020

2121
import java.util.Date
22-
import javax.xml.bind.annotation._
2322

24-
import scala.reflect.BeanProperty
23+
import scala.annotation.target.field
2524

26-
@XmlRootElement(name = "Order")
27-
class Order {
28-
@XmlElement(name = "id")
29-
@BeanProperty
30-
var id: Long = 0
31-
32-
@XmlElement(name = "petId")
33-
@BeanProperty
34-
var petId: Long = 0
35-
36-
@XmlElement(name = "quantity")
37-
@BeanProperty
38-
var quantity: Int = 0
39-
40-
@XmlElement(name = "shipDate")
41-
@BeanProperty
42-
var shipDate: Date = null
43-
44-
@XmlElement(name = "status")
45-
@ApiModelProperty(value = "Order Status", allowableValues = "placed,approved,delivered")
46-
@BeanProperty
47-
var status: String = null
48-
}
25+
@ApiModel("Order")
26+
case class Order (
27+
@(ApiModelProperty @field)(position=1)id: Long,
28+
@(ApiModelProperty @field)(position=2)petId: Long,
29+
@(ApiModelProperty @field)(position=3)quantity: Int,
30+
@(ApiModelProperty @field)(position=4)shipDate: Date,
31+
@(ApiModelProperty @field)(position=5)status: String
32+
)

‎samples/scala-play2/app/models/Pet.scala‎

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,14 @@ package models
1818

1919
import com.wordnik.swagger.annotations._
2020

21-
import java.util.{ List, ArrayList }
22-
import javax.xml.bind.annotation._
23-
24-
import scala.reflect.BeanProperty
25-
26-
@XmlRootElement(name = "Pet")
27-
class Pet() {
28-
@XmlElement(name = "id")
29-
@BeanProperty
30-
var id: Long = 0
31-
32-
@XmlElement(name = "category")
33-
@BeanProperty
34-
var category: Category = null
35-
36-
@XmlElement(name = "name")
37-
@BeanProperty
38-
var name: String = null
39-
40-
@XmlElement(name = "photoUrls")
41-
@BeanProperty
42-
var photoUrls: List[String] = new ArrayList[String]()
43-
44-
@XmlElement(name = "tags")
45-
@BeanProperty
46-
var tags: List[Tag] = new ArrayList[Tag]()
47-
48-
@XmlElement(name = "status")
49-
@ApiModelProperty(value = "pet status in the store", allowableValues = "available,pending,sold")
50-
@BeanProperty
51-
var status: String = null
52-
}
21+
import scala.annotation.target.field
22+
23+
@ApiModel("Pet")
24+
case class Pet(
25+
@(ApiModelProperty @field)(position=1, value="id")id: Long,
26+
@(ApiModelProperty @field)(position=2)category: Category,
27+
@(ApiModelProperty @field)(position=3)name: String,
28+
@(ApiModelProperty @field)(position=4)photoUrls: List[String],
29+
@(ApiModelProperty @field)(position=5)tags: List[Tag],
30+
@(ApiModelProperty @field)(position=6)status: String
31+
)

‎samples/scala-play2/app/models/Tag.scala‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@
1616

1717
package models
1818

19-
import javax.xml.bind.annotation.{ XmlRootElement, XmlElement }
19+
import com.wordnik.swagger.annotations._
2020

21-
import scala.reflect.BeanProperty
21+
import scala.annotation.target.field
2222

23-
@XmlRootElement(name = "Tag")
24-
class Tag {
25-
@XmlElement(name = "id")
26-
@BeanProperty
27-
var id: Long = 0
2823

29-
@XmlRootElement(name = "name")
30-
@BeanProperty
31-
var name: String = _
32-
}
24+
@ApiModel("Tag")
25+
case class Tag (
26+
@(ApiModelProperty @field)(position=1)id: Long,
27+
@(ApiModelProperty @field)(position=2)name: String)

0 commit comments

Comments
 (0)