Skip to content

[kotlin][client] Add Jackson to interface properties and remove extra line feed #5459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Mar 24, 2020
Merged

[kotlin][client] Add Jackson to interface properties and remove extra line feed #5459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f570f3
[kotlin][client] Ensure Jackson annotations are consistent with inter…
mtraynham Feb 26, 2020
3f385ae
[kotlin][client] Rebuild samples
mtraynham Feb 26, 2020
0309c96
[kotlin][client] Some kotlin client enhancements
mtraynham Feb 27, 2020
ce0aa42
[kotlin][client] Rebuild kotlin samples
mtraynham Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[kotlin][client] Rebuild samples
  • Loading branch information
@mtraynham
mtraynham committed Feb 26, 2020
commit 3f385ae96b31037f346310e5a508070abb954e70
7 changes: 2 additions & 5 deletions ...client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@ import com.google.gson.annotations.SerializedName

data class ApiResponse (
@SerializedName("code")
val code: kotlin.Int? = null
,
val code: kotlin.Int? = null,
@SerializedName("type")
val type: kotlin.String? = null
,
val type: kotlin.String? = null,
@SerializedName("message")
val message: kotlin.String? = null

)

4 changes: 1 addition & 3 deletions ...es/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ import com.google.gson.annotations.SerializedName

data class Category (
@SerializedName("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@SerializedName("name")
val name: kotlin.String? = null

)

16 changes: 5 additions & 11 deletions samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,18 @@ import com.google.gson.annotations.SerializedName

data class Order (
@SerializedName("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@SerializedName("petId")
val petId: kotlin.Long? = null
,
val petId: kotlin.Long? = null,
@SerializedName("quantity")
val quantity: kotlin.Int? = null
,
val quantity: kotlin.Int? = null,
@SerializedName("shipDate")
val shipDate: java.time.OffsetDateTime? = null
,
val shipDate: java.time.OffsetDateTime? = null,
/* Order Status */
@SerializedName("status")
val status: Order.Status? = null
,
val status: Order.Status? = null,
@SerializedName("complete")
val complete: kotlin.Boolean? = null

) {

/**
Expand Down
16 changes: 5 additions & 11 deletions samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,18 @@ import com.google.gson.annotations.SerializedName

data class Pet (
@SerializedName("name")
val name: kotlin.String
,
val name: kotlin.String,
@SerializedName("photoUrls")
val photoUrls: kotlin.Array<kotlin.String>
,
val photoUrls: kotlin.Array<kotlin.String>,
@SerializedName("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@SerializedName("category")
val category: Category? = null
,
val category: Category? = null,
@SerializedName("tags")
val tags: kotlin.Array<Tag>? = null
,
val tags: kotlin.Array<Tag>? = null,
/* pet status in the store */
@SerializedName("status")
val status: Pet.Status? = null

) {

/**
Expand Down
4 changes: 1 addition & 3 deletions samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ import com.google.gson.annotations.SerializedName

data class Tag (
@SerializedName("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@SerializedName("name")
val name: kotlin.String? = null

)

22 changes: 7 additions & 15 deletions samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,21 @@ import com.google.gson.annotations.SerializedName

data class User (
@SerializedName("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@SerializedName("username")
val username: kotlin.String? = null
,
val username: kotlin.String? = null,
@SerializedName("firstName")
val firstName: kotlin.String? = null
,
val firstName: kotlin.String? = null,
@SerializedName("lastName")
val lastName: kotlin.String? = null
,
val lastName: kotlin.String? = null,
@SerializedName("email")
val email: kotlin.String? = null
,
val email: kotlin.String? = null,
@SerializedName("password")
val password: kotlin.String? = null
,
val password: kotlin.String? = null,
@SerializedName("phone")
val phone: kotlin.String? = null
,
val phone: kotlin.String? = null,
/* User Status */
@SerializedName("userStatus")
val userStatus: kotlin.Int? = null

)

7 changes: 2 additions & 5 deletions ...ent/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ import com.fasterxml.jackson.annotation.JsonFormat

data class ApiResponse (
@JsonProperty("code")
val code: kotlin.Int? = null
,
val code: kotlin.Int? = null,
@JsonProperty("type")
val type: kotlin.String? = null
,
val type: kotlin.String? = null,
@JsonProperty("message")
val message: kotlin.String? = null

)

4 changes: 1 addition & 3 deletions ...client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ import com.fasterxml.jackson.annotation.JsonFormat

data class Category (
@JsonProperty("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@JsonProperty("name")
val name: kotlin.String? = null

)

19 changes: 6 additions & 13 deletions ...es/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,19 @@ import com.fasterxml.jackson.annotation.JsonFormat

data class Order (
@JsonProperty("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@JsonProperty("petId")
val petId: kotlin.Long? = null
,
val petId: kotlin.Long? = null,
@JsonProperty("quantity")
val quantity: kotlin.Int? = null
,
@JsonFormat
(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy hh:mm:ss")
val quantity: kotlin.Int? = null,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy hh:mm:ss")
@JsonProperty("shipDate")
val shipDate: java.time.OffsetDateTime? = null
,
val shipDate: java.time.OffsetDateTime? = null,
/* Order Status */
@JsonProperty("status")
val status: Order.Status? = null
,
val status: Order.Status? = null,
@JsonProperty("complete")
val complete: kotlin.Boolean? = null

) {

/**
Expand Down
16 changes: 5 additions & 11 deletions samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,18 @@ import com.fasterxml.jackson.annotation.JsonFormat

data class Pet (
@JsonProperty("name")
val name: kotlin.String
,
val name: kotlin.String,
@JsonProperty("photoUrls")
val photoUrls: kotlin.Array<kotlin.String>
,
val photoUrls: kotlin.Array<kotlin.String>,
@JsonProperty("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@JsonProperty("category")
val category: Category? = null
,
val category: Category? = null,
@JsonProperty("tags")
val tags: kotlin.Array<Tag>? = null
,
val tags: kotlin.Array<Tag>? = null,
/* pet status in the store */
@JsonProperty("status")
val status: Pet.Status? = null

) {

/**
Expand Down
4 changes: 1 addition & 3 deletions samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ import com.fasterxml.jackson.annotation.JsonFormat

data class Tag (
@JsonProperty("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@JsonProperty("name")
val name: kotlin.String? = null

)

22 changes: 7 additions & 15 deletions ...les/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,21 @@ import com.fasterxml.jackson.annotation.JsonFormat

data class User (
@JsonProperty("id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@JsonProperty("username")
val username: kotlin.String? = null
,
val username: kotlin.String? = null,
@JsonProperty("firstName")
val firstName: kotlin.String? = null
,
val firstName: kotlin.String? = null,
@JsonProperty("lastName")
val lastName: kotlin.String? = null
,
val lastName: kotlin.String? = null,
@JsonProperty("email")
val email: kotlin.String? = null
,
val email: kotlin.String? = null,
@JsonProperty("password")
val password: kotlin.String? = null
,
val password: kotlin.String? = null,
@JsonProperty("phone")
val phone: kotlin.String? = null
,
val phone: kotlin.String? = null,
/* User Status */
@JsonProperty("userStatus")
val userStatus: kotlin.Int? = null

)

7 changes: 2 additions & 5 deletions .../kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@ import com.squareup.moshi.Json

data class ApiResponse (
@Json(name = "code")
val code: kotlin.Int? = null
,
val code: kotlin.Int? = null,
@Json(name = "type")
val type: kotlin.String? = null
,
val type: kotlin.String? = null,
@Json(name = "message")
val message: kotlin.String? = null

)

4 changes: 1 addition & 3 deletions ...ore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ import com.squareup.moshi.Json

data class Category (
@Json(name = "id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@Json(name = "name")
val name: kotlin.String? = null

)

16 changes: 5 additions & 11 deletions ...tstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,18 @@ import com.squareup.moshi.Json

data class Order (
@Json(name = "id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@Json(name = "petId")
val petId: kotlin.Long? = null
,
val petId: kotlin.Long? = null,
@Json(name = "quantity")
val quantity: kotlin.Int? = null
,
val quantity: kotlin.Int? = null,
@Json(name = "shipDate")
val shipDate: java.time.OffsetDateTime? = null
,
val shipDate: java.time.OffsetDateTime? = null,
/* Order Status */
@Json(name = "status")
val status: Order.Status? = null
,
val status: Order.Status? = null,
@Json(name = "complete")
val complete: kotlin.Boolean? = null

) {

/**
Expand Down
16 changes: 5 additions & 11 deletions ...petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,18 @@ import com.squareup.moshi.Json

data class Pet (
@Json(name = "name")
val name: kotlin.String
,
val name: kotlin.String,
@Json(name = "photoUrls")
val photoUrls: kotlin.Array<kotlin.String>
,
val photoUrls: kotlin.Array<kotlin.String>,
@Json(name = "id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@Json(name = "category")
val category: Category? = null
,
val category: Category? = null,
@Json(name = "tags")
val tags: kotlin.Array<Tag>? = null
,
val tags: kotlin.Array<Tag>? = null,
/* pet status in the store */
@Json(name = "status")
val status: Pet.Status? = null

) {

/**
Expand Down
4 changes: 1 addition & 3 deletions ...petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ import com.squareup.moshi.Json

data class Tag (
@Json(name = "id")
val id: kotlin.Long? = null
,
val id: kotlin.Long? = null,
@Json(name = "name")
val name: kotlin.String? = null

)

Loading