Skip to content

Commit 081ff08

Browse files
wing328wing328
committed
update kotlin samples
1 parent 1419ad0 commit 081ff08

7 files changed

Lines changed: 42 additions & 0 deletions

File tree

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,10 @@
166166
<version>${kotlin-test-junit5.version}</version>
167167
<scope>test</scope>
168168
</dependency>
169+
<dependency>
170+
<groupId>org.springframework.boot</groupId>
171+
<artifactId>spring-boot-starter-test</artifactId>
172+
<scope>test</scope>
173+
</dependency>
169174
</dependencies>
170175
</project>

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package org.openapitools.model
22

33
import java.util.Objects
44
import com.fasterxml.jackson.annotation.JsonProperty
5+
import com.fasterxml.jackson.annotation.JsonSetter
6+
import com.fasterxml.jackson.annotation.Nulls
57
import jakarta.validation.constraints.DecimalMax
68
import jakarta.validation.constraints.DecimalMin
79
import jakarta.validation.constraints.Email
@@ -21,10 +23,12 @@ import io.swagger.v3.oas.annotations.media.Schema
2123
data class Category(
2224

2325
@Schema(example = "null", description = "")
26+
@field:JsonSetter(nulls = Nulls.FAIL)
2427
@get:JsonProperty("id") val id: kotlin.Long? = null,
2528

2629
@get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")
2730
@Schema(example = "null", description = "")
31+
@field:JsonSetter(nulls = Nulls.FAIL)
2832
@get:JsonProperty("name") val name: kotlin.String? = null
2933
) : java.io.Serializable {
3034

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package org.openapitools.model
22

33
import java.util.Objects
44
import com.fasterxml.jackson.annotation.JsonProperty
5+
import com.fasterxml.jackson.annotation.JsonSetter
6+
import com.fasterxml.jackson.annotation.Nulls
57
import jakarta.validation.constraints.DecimalMax
68
import jakarta.validation.constraints.DecimalMin
79
import jakarta.validation.constraints.Email
@@ -22,12 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema
2224
data class ModelApiResponse(
2325

2426
@Schema(example = "null", description = "")
27+
@field:JsonSetter(nulls = Nulls.FAIL)
2528
@get:JsonProperty("code") val code: kotlin.Int? = null,
2629

2730
@Schema(example = "null", description = "")
31+
@field:JsonSetter(nulls = Nulls.FAIL)
2832
@get:JsonProperty("type") val type: kotlin.String? = null,
2933

3034
@Schema(example = "null", description = "")
35+
@field:JsonSetter(nulls = Nulls.FAIL)
3136
@get:JsonProperty("message") val message: kotlin.String? = null
3237
) : java.io.Serializable {
3338

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package org.openapitools.model
33
import java.util.Objects
44
import com.fasterxml.jackson.annotation.JsonCreator
55
import com.fasterxml.jackson.annotation.JsonProperty
6+
import com.fasterxml.jackson.annotation.JsonSetter
67
import com.fasterxml.jackson.annotation.JsonValue
8+
import com.fasterxml.jackson.annotation.Nulls
79
import jakarta.validation.constraints.DecimalMax
810
import jakarta.validation.constraints.DecimalMin
911
import jakarta.validation.constraints.Email
@@ -27,21 +29,27 @@ import io.swagger.v3.oas.annotations.media.Schema
2729
data class Order(
2830

2931
@Schema(example = "null", description = "")
32+
@field:JsonSetter(nulls = Nulls.FAIL)
3033
@get:JsonProperty("id") val id: kotlin.Long? = null,
3134

3235
@Schema(example = "null", description = "")
36+
@field:JsonSetter(nulls = Nulls.FAIL)
3337
@get:JsonProperty("petId") val petId: kotlin.Long? = null,
3438

3539
@Schema(example = "null", description = "")
40+
@field:JsonSetter(nulls = Nulls.FAIL)
3641
@get:JsonProperty("quantity") val quantity: kotlin.Int? = null,
3742

3843
@Schema(example = "null", description = "")
44+
@field:JsonSetter(nulls = Nulls.FAIL)
3945
@get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null,
4046

4147
@Schema(example = "null", description = "Order Status")
48+
@field:JsonSetter(nulls = Nulls.FAIL)
4249
@get:JsonProperty("status") val status: Order.Status? = null,
4350

4451
@Schema(example = "null", description = "")
52+
@field:JsonSetter(nulls = Nulls.FAIL)
4553
@get:JsonProperty("complete") val complete: kotlin.Boolean? = false
4654
) : java.io.Serializable {
4755

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package org.openapitools.model
33
import java.util.Objects
44
import com.fasterxml.jackson.annotation.JsonCreator
55
import com.fasterxml.jackson.annotation.JsonProperty
6+
import com.fasterxml.jackson.annotation.JsonSetter
67
import com.fasterxml.jackson.annotation.JsonValue
8+
import com.fasterxml.jackson.annotation.Nulls
79
import org.openapitools.model.Category
810
import org.openapitools.model.Tag
911
import jakarta.validation.constraints.DecimalMax
@@ -35,18 +37,22 @@ data class Pet(
3537
@get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List<kotlin.String>,
3638

3739
@Schema(example = "null", description = "")
40+
@field:JsonSetter(nulls = Nulls.FAIL)
3841
@get:JsonProperty("id") val id: kotlin.Long? = null,
3942

4043
@field:Valid
4144
@Schema(example = "null", description = "")
45+
@field:JsonSetter(nulls = Nulls.FAIL)
4246
@get:JsonProperty("category") val category: Category? = null,
4347

4448
@field:Valid
4549
@Schema(example = "null", description = "")
50+
@field:JsonSetter(nulls = Nulls.FAIL)
4651
@get:JsonProperty("tags") val tags: kotlin.collections.List<Tag>? = null,
4752

4853
@Schema(example = "null", description = "pet status in the store")
4954
@Deprecated(message = "")
55+
@field:JsonSetter(nulls = Nulls.FAIL)
5056
@get:JsonProperty("status") val status: Pet.Status? = null
5157
) : java.io.Serializable {
5258

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package org.openapitools.model
22

33
import java.util.Objects
44
import com.fasterxml.jackson.annotation.JsonProperty
5+
import com.fasterxml.jackson.annotation.JsonSetter
6+
import com.fasterxml.jackson.annotation.Nulls
57
import jakarta.validation.constraints.DecimalMax
68
import jakarta.validation.constraints.DecimalMin
79
import jakarta.validation.constraints.Email
@@ -21,9 +23,11 @@ import io.swagger.v3.oas.annotations.media.Schema
2123
data class Tag(
2224

2325
@Schema(example = "null", description = "")
26+
@field:JsonSetter(nulls = Nulls.FAIL)
2427
@get:JsonProperty("id") val id: kotlin.Long? = null,
2528

2629
@Schema(example = "null", description = "")
30+
@field:JsonSetter(nulls = Nulls.FAIL)
2731
@get:JsonProperty("name") val name: kotlin.String? = null
2832
) : java.io.Serializable {
2933

‎samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package org.openapitools.model
22

33
import java.util.Objects
44
import com.fasterxml.jackson.annotation.JsonProperty
5+
import com.fasterxml.jackson.annotation.JsonSetter
6+
import com.fasterxml.jackson.annotation.Nulls
57
import jakarta.validation.constraints.DecimalMax
68
import jakarta.validation.constraints.DecimalMin
79
import jakarta.validation.constraints.Email
@@ -27,27 +29,35 @@ import io.swagger.v3.oas.annotations.media.Schema
2729
data class User(
2830

2931
@Schema(example = "null", description = "")
32+
@field:JsonSetter(nulls = Nulls.FAIL)
3033
@get:JsonProperty("id") val id: kotlin.Long? = null,
3134

3235
@Schema(example = "null", description = "")
36+
@field:JsonSetter(nulls = Nulls.FAIL)
3337
@get:JsonProperty("username") val username: kotlin.String? = null,
3438

3539
@Schema(example = "null", description = "")
40+
@field:JsonSetter(nulls = Nulls.FAIL)
3641
@get:JsonProperty("firstName") val firstName: kotlin.String? = null,
3742

3843
@Schema(example = "null", description = "")
44+
@field:JsonSetter(nulls = Nulls.FAIL)
3945
@get:JsonProperty("lastName") val lastName: kotlin.String? = null,
4046

4147
@Schema(example = "null", description = "")
48+
@field:JsonSetter(nulls = Nulls.FAIL)
4249
@get:JsonProperty("email") val email: kotlin.String? = null,
4350

4451
@Schema(example = "null", description = "")
52+
@field:JsonSetter(nulls = Nulls.FAIL)
4553
@get:JsonProperty("password") val password: kotlin.String? = null,
4654

4755
@Schema(example = "null", description = "")
56+
@field:JsonSetter(nulls = Nulls.FAIL)
4857
@get:JsonProperty("phone") val phone: kotlin.String? = null,
4958

5059
@Schema(example = "null", description = "User Status")
60+
@field:JsonSetter(nulls = Nulls.FAIL)
5161
@get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null
5262
) : java.io.Serializable {
5363

0 commit comments

Comments
 (0)