loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Kotlin] Fix default value for kotlin class (#10407)

Browse Source 
* Fix default value for kotlin class

* fix style: remove trailing line

* fix ktorm schema
This commit is contained in:
Surya Asriadie 2021-09-17 02:12:41 +09:00 committed by GitHub
parent f9320cae68
commit 0936b43dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache vendored
View File

@ -18,4 +18,4 @@
{{#deprecated}} {{#deprecated}}
@Deprecated(message = "This property is deprecated.") @Deprecated(message = "This property is deprecated.")
{{/deprecated}} {{/deprecated}}
{{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#uniqueItems}}kotlin.collections.Set{{/uniqueItems}}{{^uniqueItems}}kotlin.collections.List{{/uniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInCamelCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#uniqueItems}}kotlin.collections.Set{{/uniqueItems}}{{^uniqueItems}}kotlin.collections.List{{/uniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInCamelCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}}

2
modules/openapi-generator/src/main/resources/kotlin-server-deprecated/data_class_opt_var.mustache vendored
View File

@ -1,4 +1,4 @@
{{#description}} {{#description}}
/* {{{.}}} */ /* {{{.}}} */
{{/description}} {{/description}}
{{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}}

2
modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache vendored
View File

@ -1,4 +1,4 @@
{{#description}} {{#description}}
/* {{{.}}} */ /* {{{.}}} */
{{/description}} {{/description}}
{{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}}

2
modules/openapi-generator/src/main/resources/kotlin-spring/interfaceOptVar.mustache vendored
View File

@ -1,3 +1,3 @@
{{#swaggerAnnotations}} {{#swaggerAnnotations}}
@ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}
{{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? {{^discriminator}}= {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/discriminator}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? {{^discriminator}}= {{defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/discriminator}}

2
modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class_opt_var.mustache vendored
View File

@ -1,4 +1,4 @@
{{#description}} {{#description}}
/* {{{.}}} */ /* {{{.}}} */
{{/description}} {{/description}}
{{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}}

2
modules/openapi-generator/src/main/resources/ktorm-schema/data_class_bind_field_opt.mustache vendored
View File

@ -1 +1 @@
{{#vendorExtensions}}{{#x-ktorm-schema}}{{#columnDefinition}} {{{name}}} = row[{{{name}}}] {{#defaultvalue}}?: {{{.}}}{{/defaultvalue}} /* {{{colKotlinType}}}? */{{/columnDefinition}}{{/x-ktorm-schema}}{{/vendorExtensions}}{{#description}} /* {{{.}}} */{{/description}} {{#vendorExtensions}}{{#x-ktorm-schema}}{{#columnDefinition}} {{{name}}} = row[{{{name}}}] {{#defaultValue}}?: {{{.}}}{{/defaultValue}} /* {{{colKotlinType}}}? */{{/columnDefinition}}{{/x-ktorm-schema}}{{/vendorExtensions}}{{#description}} /* {{{.}}} */{{/description}}

2
samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@SerializedName("complete") @SerializedName("complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@field:JsonProperty("complete") @field:JsonProperty("complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -56,7 +56,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Parcelable { ) : Parcelable {

2
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -54,7 +54,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@SerializedName("complete") @SerializedName("complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Serializable { ) : Serializable {
companion object { companion object {

2
samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -54,7 +54,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
View File

@ -49,7 +49,7 @@ data class Order (
/* Order Status */ /* Order Status */
@SerialName(value = "status") val status: Order.Status? = null, @SerialName(value = "status") val status: Order.Status? = null,
@SerialName(value = "complete") val complete: kotlin.Boolean? = null @SerialName(value = "complete") val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ internal data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -54,7 +54,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Serializable { ) : Serializable {
companion object { companion object {

2
samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -56,7 +56,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@SerialName(value = "complete") @SerialName(value = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Serializable { ) : Serializable {
companion object { companion object {

2
samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -54,7 +54,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Serializable { ) : Serializable {
companion object { companion object {

2
samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -53,7 +53,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) { ) {

2
samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
View File

@ -54,7 +54,7 @@ data class Order (
val status: Order.Status? = null, val status: Order.Status? = null,
@Json(name = "complete") @Json(name = "complete")
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Serializable { ) : Serializable {
companion object { companion object {

2
samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Order.kt
View File

@ -44,7 +44,7 @@ object Orders : BaseTable<Order>("Order") {
quantity = row[quantity] /* kotlin.Int? */, quantity = row[quantity] /* kotlin.Int? */,
shipDate = row[shipDate] /* java.time.LocalDateTime? */, shipDate = row[shipDate] /* java.time.LocalDateTime? */,
status = row[status] /* kotlin.String? */ /* Order Status */, status = row[status] /* kotlin.String? */ /* Order Status */,
complete = row[complete] /* kotlin.Boolean? */ complete = row[complete] ?: false /* kotlin.Boolean? */
) )
/** /**

2
samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt
View File

@ -29,7 +29,7 @@ data class Order(
val shipDate: java.time.OffsetDateTime? = null, val shipDate: java.time.OffsetDateTime? = null,
/* Order Status */ /* Order Status */
val status: Order.Status? = null, val status: Order.Status? = null,
val complete: kotlin.Boolean? = null val complete: kotlin.Boolean? = false
) : Serializable ) : Serializable
{ {
companion object { companion object {