From d1eda02be69625b41365a4d0f9dc0b4e4b6bc3d0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 15 Dec 2020 09:52:51 +0800 Subject: [PATCH] update samples --- .../main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 3 ++- .../src/main/kotlin/org/openapitools/model/InlineObject.kt | 1 + .../main/kotlin/org/openapitools/model/InlineObject1.kt | 2 ++ .../main/kotlin/org/openapitools/model/ModelApiResponse.kt | 1 + .../src/main/kotlin/org/openapitools/model/Order.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 7 +++++-- .../src/main/kotlin/org/openapitools/model/Tag.kt | 1 + .../src/main/kotlin/org/openapitools/model/User.kt | 1 + 11 files changed, 17 insertions(+), 6 deletions(-) diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt index 6e1ceb2d458..d54d3090b74 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -8,7 +8,7 @@ import java.util.Optional; @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class PetApiController( - @org.springframework.beans.factory.annotation.Autowired(required = false) delegate: PetApiDelegate + @org.springframework.beans.factory.annotation.Autowired(required = false) delegate: PetApiDelegate? ) : PetApi { private val delegate: PetApiDelegate diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 032a3b3aed8..61e0896b172 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -8,7 +8,7 @@ import java.util.Optional; @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class StoreApiController( - @org.springframework.beans.factory.annotation.Autowired(required = false) delegate: StoreApiDelegate + @org.springframework.beans.factory.annotation.Autowired(required = false) delegate: StoreApiDelegate? ) : StoreApi { private val delegate: StoreApiDelegate diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt index 67d92ac04f8..a3f243b7552 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -8,7 +8,7 @@ import java.util.Optional; @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class UserApiController( - @org.springframework.beans.factory.annotation.Autowired(required = false) delegate: UserApiDelegate + @org.springframework.beans.factory.annotation.Autowired(required = false) delegate: UserApiDelegate? ) : UserApi { private val delegate: UserApiDelegate diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt index c62a3ec6c6e..42348e7084a 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -9,6 +9,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** @@ -20,7 +21,7 @@ data class Category( @ApiModelProperty(example = "null", value = "") @field:JsonProperty("id") val id: kotlin.Long? = null, -@get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(example = "null", value = "") @field:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject.kt index 25c53cf08b8..257970fa6be 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject.kt @@ -9,6 +9,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject1.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject1.kt index 8dfd458743b..60e6e76df23 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject1.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/InlineObject1.kt @@ -9,6 +9,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** @@ -21,6 +22,7 @@ data class InlineObject1( @ApiModelProperty(example = "null", value = "Additional data to pass to server") @field:JsonProperty("additionalMetadata") val additionalMetadata: kotlin.String? = null, + @field:Valid @ApiModelProperty(example = "null", value = "file to upload") @field:JsonProperty("file") val file: org.springframework.core.io.Resource? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 6ac03ab610e..6ada956e84e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -9,6 +9,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt index 83f4ba45421..203292a60ee 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -10,6 +10,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index de74ce56054..3b7d8a1918e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -12,6 +12,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** @@ -25,20 +26,22 @@ import io.swagger.annotations.ApiModelProperty */ data class Pet( - @get:NotNull + @get:NotNull @ApiModelProperty(example = "doggie", required = true, value = "") @field:JsonProperty("name") val name: kotlin.String, - @get:NotNull + @get:NotNull @ApiModelProperty(example = "null", required = true, value = "") @field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", value = "") @field:JsonProperty("id") val id: kotlin.Long? = null, + @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonProperty("category") val category: Category? = null, + @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonProperty("tags") val tags: kotlin.collections.List? = null, diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index 7e7d1234984..ab8e8348498 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -9,6 +9,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /** diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt index dc58873346e..c083bd85dba 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -9,6 +9,7 @@ import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size +import javax.validation.Valid import io.swagger.annotations.ApiModelProperty /**