Skip to content
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

[kotlin][client] remove tabs usage #6526

Merged
merged 2 commits into from
Jun 4, 2020
Merged

[kotlin][client] remove tabs usage #6526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3232d95
[kotlin] remove tabs
4brunu Jun 3, 2020
a40bbe5
[kotlin][client] update pet projects
4brunu Jun 3, 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
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ import java.io.Serializable
){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#vendorExtensions.x-has-data-class-body}} {
{{/vendorExtensions.x-has-data-class-body}}
{{#serializableModel}}
{{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
private const val serialVersionUID: Long = 123
}
{{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
private const val serialVersionUID: Long = 123
}
{{/serializableModel}}
{{#discriminator}}{{#vars}}{{#required}}
{{>interface_req_var}}{{/required}}{{^required}}
Expand Down
10 changes: 5 additions & 5 deletions modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ import kotlinx.serialization.internal.CommonEnumSerializer

{{/enumVars}}{{/allowableValues}}

/**
This override toString avoids using the enum var name and uses the actual api value instead.
In cases the var name and value are different, the client would send incorrect enums to the server.
**/
override fun toString(): String {
/**
This override toString avoids using the enum var name and uses the actual api value instead.
In cases the var name and value are different, the client would send incorrect enums to the server.
**/
override fun toString(): String {
return value{{^isString}}.toString(){{/isString}}
}

Expand Down
6 changes: 3 additions & 3 deletions ...tlin-jvm-okhttp4-coroutines/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 @@ -29,9 +29,9 @@ data class ApiResponse (
@SerializedName("message")
val message: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions .../kotlin-jvm-okhttp4-coroutines/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 @@ -26,9 +26,9 @@ data class Category (
@SerializedName("name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...ore/kotlin-jvm-okhttp4-coroutines/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 @@ -39,9 +39,9 @@ data class Order (
@SerializedName("complete")
val complete: kotlin.Boolean? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* Order Status
Expand Down
6 changes: 3 additions & 3 deletions ...store/kotlin-jvm-okhttp4-coroutines/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 @@ -41,9 +41,9 @@ data class Pet (
@SerializedName("status")
val status: Pet.Status? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* pet status in the store
Expand Down
6 changes: 3 additions & 3 deletions ...store/kotlin-jvm-okhttp4-coroutines/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 @@ -26,9 +26,9 @@ data class Tag (
@SerializedName("name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...tore/kotlin-jvm-okhttp4-coroutines/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 @@ -45,9 +45,9 @@ data class User (
@SerializedName("userStatus")
val userStatus: kotlin.Int? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...nt/petstore/kotlin-nullable/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 @@ -29,9 +29,9 @@ data class ApiResponse (
@Json(name = "message")
val message: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...lient/petstore/kotlin-nullable/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 @@ -26,9 +26,9 @@ data class Category (
@Json(name = "name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...s/client/petstore/kotlin-nullable/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 @@ -39,9 +39,9 @@ data class Order (
@Json(name = "complete")
val complete: kotlin.Boolean? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* Order Status
Expand Down
6 changes: 3 additions & 3 deletions ...les/client/petstore/kotlin-nullable/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 @@ -41,9 +41,9 @@ data class Pet (
@Json(name = "status")
val status: Pet.Status? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* pet status in the store
Expand Down
6 changes: 3 additions & 3 deletions ...les/client/petstore/kotlin-nullable/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 @@ -26,9 +26,9 @@ data class Tag (
@Json(name = "name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...es/client/petstore/kotlin-nullable/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 @@ -45,9 +45,9 @@ data class User (
@Json(name = "userStatus")
val userStatus: kotlin.Int? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...ient/petstore/kotlin-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 @@ -29,9 +29,9 @@ data class ApiResponse (
@Json(name = "message")
val message: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions .../client/petstore/kotlin-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 @@ -26,9 +26,9 @@ data class Category (
@Json(name = "name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions ...les/client/petstore/kotlin-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 @@ -39,9 +39,9 @@ data class Order (
@Json(name = "complete")
val complete: kotlin.Boolean? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* Order Status
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin-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 @@ -41,9 +41,9 @@ data class Pet (
@Json(name = "status")
val status: Pet.Status? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* pet status in the store
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin-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 @@ -26,9 +26,9 @@ data class Tag (
@Json(name = "name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin-string/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 @@ -45,9 +45,9 @@ data class User (
@Json(name = "userStatus")
val userStatus: kotlin.Int? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin/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 @@ -29,9 +29,9 @@ data class ApiResponse (
@Json(name = "message")
val message: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin/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 @@ -26,9 +26,9 @@ data class Category (
@Json(name = "name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin/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 @@ -39,9 +39,9 @@ data class Order (
@Json(name = "complete")
val complete: kotlin.Boolean? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* Order Status
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin/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 @@ -41,9 +41,9 @@ data class Pet (
@Json(name = "status")
val status: Pet.Status? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

/**
* pet status in the store
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin/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 @@ -26,9 +26,9 @@ data class Tag (
@Json(name = "name")
val name: kotlin.String? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

6 changes: 3 additions & 3 deletions samples/client/petstore/kotlin/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 @@ -45,9 +45,9 @@ data class User (
@Json(name = "userStatus")
val userStatus: kotlin.Int? = null
) : Serializable {
companion object {
private const val serialVersionUID: Long = 123
}
companion object {
private const val serialVersionUID: Long = 123
}

}

Loading