From 0936b43dfdaea9aa9cfca7e7e7a8f119e160a8b2 Mon Sep 17 00:00:00 2001 From: Surya Asriadie Date: Fri, 17 Sep 2021 02:12:41 +0900 Subject: [PATCH] [Kotlin] Fix default value for kotlin class (#10407) * Fix default value for kotlin class * fix style: remove trailing line * fix ktorm schema --- .../main/resources/kotlin-client/data_class_opt_var.mustache | 2 +- .../kotlin-server-deprecated/data_class_opt_var.mustache | 2 +- .../main/resources/kotlin-server/data_class_opt_var.mustache | 2 +- .../src/main/resources/kotlin-spring/interfaceOptVar.mustache | 2 +- .../resources/kotlin-vertx-server/data_class_opt_var.mustache | 2 +- .../resources/ktorm-schema/data_class_bind_field_opt.mustache | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../commonMain/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/client/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/database/models/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/server/models/Order.kt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache index 2929c361b1a..b1d925af613 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache @@ -18,4 +18,4 @@ {{#deprecated}} @Deprecated(message = "This property is 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}} \ No newline at end of file + {{#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}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-server-deprecated/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-server-deprecated/data_class_opt_var.mustache index 89e3b61240a..a8595b2b7f3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-server-deprecated/data_class_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-server-deprecated/data_class_opt_var.mustache @@ -1,4 +1,4 @@ {{#description}} /* {{{.}}} */ {{/description}} - {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file + {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache index 89e3b61240a..a8595b2b7f3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache @@ -1,4 +1,4 @@ {{#description}} /* {{{.}}} */ {{/description}} - {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file + {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/interfaceOptVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/interfaceOptVar.mustache index 0c560f12cff..354922c426f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/interfaceOptVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/interfaceOptVar.mustache @@ -1,3 +1,3 @@ {{#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}} \ No newline at end of file + {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? {{^discriminator}}= {{defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/discriminator}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class_opt_var.mustache index 89e3b61240a..a8595b2b7f3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class_opt_var.mustache @@ -1,4 +1,4 @@ {{#description}} /* {{{.}}} */ {{/description}} - {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file + {{>modelMutable}} {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{defaultValue}}{{^defaultValue}}null{{/defaultValue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/ktorm-schema/data_class_bind_field_opt.mustache b/modules/openapi-generator/src/main/resources/ktorm-schema/data_class_bind_field_opt.mustache index 4fae4293de5..6489b2bcc3c 100644 --- a/modules/openapi-generator/src/main/resources/ktorm-schema/data_class_bind_field_opt.mustache +++ b/modules/openapi-generator/src/main/resources/ktorm-schema/data_class_bind_field_opt.mustache @@ -1 +1 @@ -{{#vendorExtensions}}{{#x-ktorm-schema}}{{#columnDefinition}} {{{name}}} = row[{{{name}}}] {{#defaultvalue}}?: {{{.}}}{{/defaultvalue}} /* {{{colKotlinType}}}? */{{/columnDefinition}}{{/x-ktorm-schema}}{{/vendorExtensions}}{{#description}} /* {{{.}}} */{{/description}} \ No newline at end of file +{{#vendorExtensions}}{{#x-ktorm-schema}}{{#columnDefinition}} {{{name}}} = row[{{{name}}}] {{#defaultValue}}?: {{{.}}}{{/defaultValue}} /* {{{colKotlinType}}}? */{{/columnDefinition}}{{/x-ktorm-schema}}{{/vendorExtensions}}{{#description}} /* {{{.}}} */{{/description}} \ No newline at end of file diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt index 6f2bc958cfe..b27ec5ecc12 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ data class Order ( val status: Order.Status? = null, @SerializedName("complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index e3361219965..71200c0bbeb 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ data class Order ( val status: Order.Status? = null, @field:JsonProperty("complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt index c5066202ee3..e2bfdd701d1 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -56,7 +56,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Parcelable { diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt index e69b6f68ac7..36871a90e4b 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -54,7 +54,7 @@ data class Order ( val status: Order.Status? = null, @SerializedName("complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Serializable { companion object { diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt index 1afbd25c024..1cb16202c6d 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -54,7 +54,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt index 737e56528be..80db3efc716 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt @@ -49,7 +49,7 @@ data class Order ( /* Order Status */ @SerialName(value = "status") val status: Order.Status? = null, - @SerialName(value = "complete") val complete: kotlin.Boolean? = null + @SerialName(value = "complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt index 2ccfb38a9c6..1e71385a5cc 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ internal data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt index beaf9bbc2d3..049b45ab9ed 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -54,7 +54,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Serializable { companion object { diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt index 7e63926e7ff..1c87feb6972 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt index 7146ee9cc58..433a01d2427 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -56,7 +56,7 @@ data class Order ( val status: Order.Status? = null, @SerialName(value = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Serializable { companion object { diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt index 7e63926e7ff..1c87feb6972 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt index 7e63926e7ff..1c87feb6972 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt index 12de5d3d9f7..3527c1ea841 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -54,7 +54,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Serializable { companion object { diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt index 7c8f86f72cd..988ec7c78d3 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -53,7 +53,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) { diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt index beaf9bbc2d3..049b45ab9ed 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -54,7 +54,7 @@ data class Order ( val status: Order.Status? = null, @Json(name = "complete") - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Serializable { companion object { diff --git a/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Order.kt b/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Order.kt index 296046b8cfe..40b7b6cc537 100644 --- a/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Order.kt +++ b/samples/schema/petstore/ktorm/src/main/kotlin/org/openapitools/database/models/Order.kt @@ -44,7 +44,7 @@ object Orders : BaseTable("Order") { quantity = row[quantity] /* kotlin.Int? */, shipDate = row[shipDate] /* java.time.LocalDateTime? */, status = row[status] /* kotlin.String? */ /* Order Status */, - complete = row[complete] /* kotlin.Boolean? */ + complete = row[complete] ?: false /* kotlin.Boolean? */ ) /** diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt index 5e9e18b0328..79dce95e1e4 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt @@ -29,7 +29,7 @@ data class Order( val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ val status: Order.Status? = null, - val complete: kotlin.Boolean? = null + val complete: kotlin.Boolean? = false ) : Serializable { companion object {