use 3.0 petstore test spec

Author: wing328

bin/configs/kotlin-spring-boot-reactive.yaml

@@ -1,7 +1,7 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-springboot-reactive
 library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: springdoc

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt

@@ -40,16 +40,18 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         operationId = "addPet",
         description = """""",
         responses = [
+            ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Pet::class))]),
             ApiResponse(responseCode = "405", description = "Invalid input") ],
         security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ]
     )
     @RequestMapping(
         method = [RequestMethod.POST],
         value = ["/pet"],
+        produces = ["application/xml", "application/json"],
         consumes = ["application/json", "application/xml"]
     )
-    suspend fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity<Unit> {
-        return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405))
+    suspend fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity<Pet> {
+        return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200))
     }
 
     @Operation(
@@ -75,14 +77,14 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         responses = [
             ApiResponse(responseCode = "200", description = "successful operation", content = [Content(array = ArraySchema(schema = Schema(implementation = Pet::class)))]),
             ApiResponse(responseCode = "400", description = "Invalid status value") ],
-        security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ]
+        security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ]
     )
     @RequestMapping(
         method = [RequestMethod.GET],
         value = ["/pet/findByStatus"],
         produces = ["application/xml", "application/json"]
     )
-    fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List<kotlin.String>): ResponseEntity<Flow<Pet>> {
+    fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List<kotlin.String>): ResponseEntity<List<Pet>> {
         return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200))
     }
 
@@ -93,14 +95,14 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         responses = [
             ApiResponse(responseCode = "200", description = "successful operation", content = [Content(array = ArraySchema(schema = Schema(implementation = Pet::class)))]),
             ApiResponse(responseCode = "400", description = "Invalid tag value") ],
-        security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ]
+        security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ]
     )
     @RequestMapping(
         method = [RequestMethod.GET],
         value = ["/pet/findByTags"],
         produces = ["application/xml", "application/json"]
     )
-    fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List<kotlin.String>): ResponseEntity<Flow<Pet>> {
+    fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List<kotlin.String>): ResponseEntity<List<Pet>> {
         return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200))
     }
 
@@ -128,6 +130,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         operationId = "updatePet",
         description = """""",
         responses = [
+            ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Pet::class))]),
             ApiResponse(responseCode = "400", description = "Invalid ID supplied"),
             ApiResponse(responseCode = "404", description = "Pet not found"),
             ApiResponse(responseCode = "405", description = "Validation exception") ],
@@ -136,10 +139,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
     @RequestMapping(
         method = [RequestMethod.PUT],
         value = ["/pet"],
+        produces = ["application/xml", "application/json"],
         consumes = ["application/json", "application/xml"]
     )
-    suspend fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity<Unit> {
-        return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400))
+    suspend fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity<Pet> {
+        return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200))
     }
 
     @Operation(

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt

@@ -8,15 +8,18 @@ interface PetApiService {
 
     /**
      * POST /pet : Add a new pet to the store
+     * 
      *
-     * @param body Pet object that needs to be added to the store (required)
-     * @return Invalid input (status code 405)
+     * @param pet Pet object that needs to be added to the store (required)
+     * @return successful operation (status code 200)
+     *         or Invalid input (status code 405)
      * @see PetApi#addPet
      */
-    suspend fun addPet(body: Pet): Unit
+    suspend fun addPet(pet: Pet): Pet
 
     /**
      * DELETE /pet/{petId} : Deletes a pet
+     * 
      *
      * @param petId Pet id to delete (required)
      * @param apiKey  (optional)
@@ -34,7 +37,7 @@ interface PetApiService {
      *         or Invalid status value (status code 400)
      * @see PetApi#findPetsByStatus
      */
-    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): Flow<Pet>
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): List<Pet>
 
     /**
      * GET /pet/findByTags : Finds Pets by tags
@@ -46,7 +49,7 @@ interface PetApiService {
      * @deprecated
      * @see PetApi#findPetsByTags
      */
-    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): Flow<Pet>
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): List<Pet>
 
     /**
      * GET /pet/{petId} : Find pet by ID
@@ -62,17 +65,22 @@ interface PetApiService {
 
     /**
      * PUT /pet : Update an existing pet
+     * 
      *
-     * @param body Pet object that needs to be added to the store (required)
-     * @return Invalid ID supplied (status code 400)
+     * @param pet Pet object that needs to be added to the store (required)
+     * @return successful operation (status code 200)
+     *         or Invalid ID supplied (status code 400)
      *         or Pet not found (status code 404)
      *         or Validation exception (status code 405)
+     * API documentation for the updatePet operation
+     * @see <a href="http://petstore.swagger.io/v2/doc/updatePet">Update an existing pet Documentation</a>
      * @see PetApi#updatePet
      */
-    suspend fun updatePet(body: Pet): Unit
+    suspend fun updatePet(pet: Pet): Pet
 
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
+     * 
      *
      * @param petId ID of pet that needs to be updated (required)
      * @param name Updated name of the pet (optional)
@@ -84,6 +92,7 @@ interface PetApiService {
 
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
+     * 
      *
      * @param petId ID of pet to update (required)
      * @param additionalMetadata Additional data to pass to server (optional)

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt

@@ -7,27 +7,27 @@ import org.springframework.stereotype.Service
 @Service
 class PetApiServiceImpl : PetApiService {
 
-    override suspend fun addPet(body: Pet): Unit {
+    override suspend fun addPet(pet: Pet): Pet {
         TODO("Implement me")
     }
 
     override suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit {
         TODO("Implement me")
     }
 
-    override fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): Flow<Pet> {
+    override fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): List<Pet> {
         TODO("Implement me")
     }
 
-    override fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): Flow<Pet> {
+    override fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): List<Pet> {
         TODO("Implement me")
     }
 
     override suspend fun getPetById(petId: kotlin.Long): Pet {
         TODO("Implement me")
     }
 
-    override suspend fun updatePet(body: Pet): Unit {
+    override suspend fun updatePet(pet: Pet): Pet {
         TODO("Implement me")
     }
 

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt

@@ -96,9 +96,10 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @RequestMapping(
         method = [RequestMethod.POST],
         value = ["/store/order"],
-        produces = ["application/xml", "application/json"]
+        produces = ["application/xml", "application/json"],
+        consumes = ["application/json"]
     )
-    suspend fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity<Order> {
-        return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200))
+    suspend fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity<Order> {
+        return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200))
     }
 }

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt

@@ -39,11 +39,12 @@ interface StoreApiService {
 
     /**
      * POST /store/order : Place an order for a pet
+     * 
      *
-     * @param body order placed for purchasing the pet (required)
+     * @param order order placed for purchasing the pet (required)
      * @return successful operation (status code 200)
      *         or Invalid Order (status code 400)
      * @see StoreApi#placeOrder
      */
-    suspend fun placeOrder(body: Order): Order
+    suspend fun placeOrder(order: Order): Order
 }

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt

@@ -18,7 +18,7 @@ class StoreApiServiceImpl : StoreApiService {
         TODO("Implement me")
     }
 
-    override suspend fun placeOrder(body: Order): Order {
+    override suspend fun placeOrder(order: Order): Order {
         TODO("Implement me")
     }
 }

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt

@@ -39,44 +39,50 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         operationId = "createUser",
         description = """This can only be done by the logged in user.""",
         responses = [
-            ApiResponse(responseCode = "200", description = "successful operation") ]
+            ApiResponse(responseCode = "200", description = "successful operation") ],
+        security = [ SecurityRequirement(name = "api_key") ]
     )
     @RequestMapping(
         method = [RequestMethod.POST],
-        value = ["/user"]
+        value = ["/user"],
+        consumes = ["application/json"]
     )
-    suspend fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity<Unit> {
-        return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200))
+    suspend fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity<Unit> {
+        return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200))
     }
 
     @Operation(
         summary = "Creates list of users with given input array",
         operationId = "createUsersWithArrayInput",
         description = """""",
         responses = [
-            ApiResponse(responseCode = "200", description = "successful operation") ]
+            ApiResponse(responseCode = "200", description = "successful operation") ],
+        security = [ SecurityRequirement(name = "api_key") ]
     )
     @RequestMapping(
         method = [RequestMethod.POST],
-        value = ["/user/createWithArray"]
+        value = ["/user/createWithArray"],
+        consumes = ["application/json"]
     )
-    suspend fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: Flow<User>): ResponseEntity<Unit> {
-        return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200))
+    suspend fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow<User>): ResponseEntity<Unit> {
+        return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200))
     }
 
     @Operation(
         summary = "Creates list of users with given input array",
         operationId = "createUsersWithListInput",
         description = """""",
         responses = [
-            ApiResponse(responseCode = "200", description = "successful operation") ]
+            ApiResponse(responseCode = "200", description = "successful operation") ],
+        security = [ SecurityRequirement(name = "api_key") ]
     )
     @RequestMapping(
         method = [RequestMethod.POST],
-        value = ["/user/createWithList"]
+        value = ["/user/createWithList"],
+        consumes = ["application/json"]
     )
-    suspend fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: Flow<User>): ResponseEntity<Unit> {
-        return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200))
+    suspend fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow<User>): ResponseEntity<Unit> {
+        return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200))
     }
 
     @Operation(
@@ -85,7 +91,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         description = """This can only be done by the logged in user.""",
         responses = [
             ApiResponse(responseCode = "400", description = "Invalid username supplied"),
-            ApiResponse(responseCode = "404", description = "User not found") ]
+            ApiResponse(responseCode = "404", description = "User not found") ],
+        security = [ SecurityRequirement(name = "api_key") ]
     )
     @RequestMapping(
         method = [RequestMethod.DELETE],
@@ -126,7 +133,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = ["/user/login"],
         produces = ["application/xml", "application/json"]
     )
-    suspend fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity<kotlin.String> {
+    suspend fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity<kotlin.String> {
         return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200))
     }
 
@@ -135,7 +142,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         operationId = "logoutUser",
         description = """""",
         responses = [
-            ApiResponse(responseCode = "200", description = "successful operation") ]
+            ApiResponse(responseCode = "200", description = "successful operation") ],
+        security = [ SecurityRequirement(name = "api_key") ]
     )
     @RequestMapping(
         method = [RequestMethod.GET],
@@ -151,13 +159,15 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         description = """This can only be done by the logged in user.""",
         responses = [
             ApiResponse(responseCode = "400", description = "Invalid user supplied"),
-            ApiResponse(responseCode = "404", description = "User not found") ]
+            ApiResponse(responseCode = "404", description = "User not found") ],
+        security = [ SecurityRequirement(name = "api_key") ]
     )
     @RequestMapping(
         method = [RequestMethod.PUT],
-        value = ["/user/{username}"]
+        value = ["/user/{username}"],
+        consumes = ["application/json"]
     )
-    suspend fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity<Unit> {
-        return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400))
+    suspend fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity<Unit> {
+        return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400))
     }
 }