Migrate all scala generators to use OAS3 (#6407)

* migrate all scala generators to use oas3

* add back pom.xml for scala-sttp

* skip form model in scalaz

* fix scala lagom tests

* add new files

* skip form models in scala finch petstore

* update samples
This commit is contained in:
William Cheng
2020-05-25 23:09:34 +08:00
committed by GitHub
parent db4c4917e2
commit 6abc4fdab2
95 changed files with 1194 additions and 1715 deletions

View File

@@ -1 +1 @@
4.3.1-SNAPSHOT
5.0.0-SNAPSHOT

View File

@@ -30,8 +30,8 @@ class PetApi(
lazy val route: Route =
path("pet") {
post {
entity(as[Pet]){ body =>
petService.addPet(body = body)
entity(as[Pet]){ pet =>
petService.addPet(pet = pet)
}
}
} ~
@@ -63,8 +63,8 @@ class PetApi(
} ~
path("pet") {
put {
entity(as[Pet]){ body =>
petService.updatePet(body = body)
entity(as[Pet]){ pet =>
petService.updatePet(pet = pet)
}
}
} ~
@@ -95,12 +95,16 @@ class PetApi(
trait PetApiService {
def addPet200(responsePet: Pet)(implicit toEntityMarshallerPet: ToEntityMarshaller[Pet]): Route =
complete((200, responsePet))
def addPet405: Route =
complete((405, "Invalid input"))
/**
* Code: 200, Message: successful operation, DataType: Pet
* Code: 405, Message: Invalid input
*/
def addPet(body: Pet): Route
def addPet(pet: Pet)
(implicit toEntityMarshallerPet: ToEntityMarshaller[Pet]): Route
def deletePet400: Route =
complete((400, "Invalid pet value"))
@@ -145,6 +149,8 @@ trait PetApiService {
def getPetById(petId: Long)
(implicit toEntityMarshallerPet: ToEntityMarshaller[Pet]): Route
def updatePet200(responsePet: Pet)(implicit toEntityMarshallerPet: ToEntityMarshaller[Pet]): Route =
complete((200, responsePet))
def updatePet400: Route =
complete((400, "Invalid ID supplied"))
def updatePet404: Route =
@@ -152,11 +158,13 @@ trait PetApiService {
def updatePet405: Route =
complete((405, "Validation exception"))
/**
* Code: 200, Message: successful operation, DataType: Pet
* Code: 400, Message: Invalid ID supplied
* Code: 404, Message: Pet not found
* Code: 405, Message: Validation exception
*/
def updatePet(body: Pet): Route
def updatePet(pet: Pet)
(implicit toEntityMarshallerPet: ToEntityMarshaller[Pet]): Route
def updatePetWithForm405: Route =
complete((405, "Invalid input"))

View File

@@ -36,8 +36,8 @@ class StoreApi(
} ~
path("store" / "order") {
post {
entity(as[Order]){ body =>
storeService.placeOrder(body = body)
entity(as[Order]){ order =>
storeService.placeOrder(order = order)
}
}
}
@@ -85,7 +85,7 @@ trait StoreApiService {
* Code: 200, Message: successful operation, DataType: Order
* Code: 400, Message: Invalid Order
*/
def placeOrder(body: Order)
def placeOrder(order: Order)
(implicit toEntityMarshallerOrder: ToEntityMarshaller[Order]): Route
}

View File

@@ -21,22 +21,22 @@ class UserApi(
lazy val route: Route =
path("user") {
post {
entity(as[User]){ body =>
userService.createUser(body = body)
entity(as[User]){ user =>
userService.createUser(user = user)
}
}
} ~
path("user" / "createWithArray") {
post {
entity(as[Seq[User]]){ body =>
userService.createUsersWithArrayInput(body = body)
entity(as[Seq[User]]){ user =>
userService.createUsersWithArrayInput(user = user)
}
}
} ~
path("user" / "createWithList") {
post {
entity(as[Seq[User]]){ body =>
userService.createUsersWithListInput(body = body)
entity(as[Seq[User]]){ user =>
userService.createUsersWithListInput(user = user)
}
}
} ~
@@ -64,8 +64,8 @@ class UserApi(
} ~
path("user" / Segment) { (username) =>
put {
entity(as[User]){ body =>
userService.updateUser(username = username, body = body)
entity(as[User]){ user =>
userService.updateUser(username = username, user = user)
}
}
}
@@ -79,21 +79,21 @@ trait UserApiService {
/**
* Code: 0, Message: successful operation
*/
def createUser(body: User): Route
def createUser(user: User): Route
def createUsersWithArrayInputDefault(statusCode: Int): Route =
complete((statusCode, "successful operation"))
/**
* Code: 0, Message: successful operation
*/
def createUsersWithArrayInput(body: Seq[User]): Route
def createUsersWithArrayInput(user: Seq[User]): Route
def createUsersWithListInputDefault(statusCode: Int): Route =
complete((statusCode, "successful operation"))
/**
* Code: 0, Message: successful operation
*/
def createUsersWithListInput(body: Seq[User]): Route
def createUsersWithListInput(user: Seq[User]): Route
def deleteUser400: Route =
complete((400, "Invalid username supplied"))
@@ -144,7 +144,7 @@ trait UserApiService {
* Code: 400, Message: Invalid user supplied
* Code: 404, Message: User not found
*/
def updateUser(username: String, body: User): Route
def updateUser(username: String, user: User): Route
}

View File

@@ -0,0 +1,12 @@
package org.openapitools.server.model
/**
* @param name Updated name of the pet for example: ''null''
* @param status Updated status of the pet for example: ''null''
*/
final case class InlineObject (
name: Option[String],
status: Option[String]
)

View File

@@ -0,0 +1,13 @@
package org.openapitools.server.model
import java.io.File
/**
* @param additionalMetadata Additional data to pass to server for example: ''null''
* @param file file to upload for example: ''null''
*/
final case class InlineObject1 (
additionalMetadata: Option[String],
file: Option[File]
)