Skip to content

[Kotlin][Client] Migrate Enum.values() to Enum.entities #22852

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 1 commit into from
Feb 2, 2026
Merged

[Kotlin][Client] Migrate Enum.values() to Enum.entities #22852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 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 @@ -176,7 +176,7 @@ import {{packageName}}.infrastructure.ITransformForStorage

override fun deserialize(decoder: Decoder): {{nameInPascalCase}} {
val value = decoder.decodeSerializableValue({{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}.serializer())
return {{nameInPascalCase}}.values().firstOrNull { it.value == value }
return {{nameInPascalCase}}.entries.firstOrNull { it.value == value }
?: {{nameInPascalCase}}.{{#allowableValues}}{{#enumVars}}{{#-last}}{{&name}}{{/-last}}{{/enumVars}}{{/allowableValues}}
}

Expand Down Expand Up @@ -360,14 +360,14 @@ import {{packageName}}.infrastructure.ITransformForStorage
{{#isEnum}}
{{#required}}
// validate the required field `{{{baseName}}}`
require({{{datatypeWithEnum}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
require({{{datatypeWithEnum}}}.entries.any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{datatypeWithEnum}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
}
{{/required}}
{{^required}}
// validate the optional field `{{{baseName}}}`
if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
require({{{datatypeWithEnum}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
require({{{datatypeWithEnum}}}.entries.any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{datatypeWithEnum}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
}
}
Expand All @@ -376,14 +376,14 @@ import {{packageName}}.infrastructure.ITransformForStorage
{{#isEnumRef}}
{{#required}}
// validate the required field `{{{baseName}}}`
require({{{dataType}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
require({{{dataType}}}.entries.any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{dataType}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
}
{{/required}}
{{^required}}
// validate the optional field `{{{baseName}}}`
if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
require({{{dataType}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
require({{{dataType}}}.entries.any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{dataType}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
}
}
Expand Down
8 changes: 4 additions & 4 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 @@ -109,7 +109,7 @@ import kotlinx.serialization.*
{{^jackson}}
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}fun decode(data: kotlin.Any?): {{classname}}? = data?.let {
val normalizedData = "$it".lowercase()
values().firstOrNull { value ->
entries.firstOrNull { value ->
it == value || normalizedData == "$value".lowercase()
}
}
Expand All @@ -127,7 +127,7 @@ import kotlinx.serialization.*
{{/isNullable}}
}
val normalizedData = "$data".lowercase()
return values().firstOrNull { value ->
return entries.firstOrNull { value ->
data == value || normalizedData == "$value".lowercase()
}{{#isNullable}}{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}
?: {{#allowableValues}}{{#enumVars}}{{#-last}}{{&name}}{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}
Expand All @@ -142,7 +142,7 @@ internal object {{classname}}Serializer : KSerializer<{{classname}}> {

override fun deserialize(decoder: Decoder): {{classname}} {
val value = decoder.decodeSerializableValue({{{dataType}}}.serializer())
return {{classname}}.values().firstOrNull { it.value == value }
return {{classname}}.entries.firstOrNull { it.value == value }
{{#isString}}
?: {{classname}}.{{#allowableValues}}{{#enumVars}}{{#-last}}{{&name}}{{/-last}}{{/enumVars}}{{/allowableValues}}
{{/isString}}
Expand All @@ -162,7 +162,7 @@ internal object {{classname}}Serializer : KSerializer<{{classname}}> {

override fun deserialize(decoder: Decoder): {{classname}} {
val value = decoder.decodeSerializableValue({{{dataType}}}.serializer())
return {{classname}}.values().firstOrNull { it.value == value }
return {{classname}}.entries.firstOrNull { it.value == value }
?: throw IllegalArgumentException("Unknown enum value: $value")
}

Expand Down
2 changes: 1 addition & 1 deletion ..._api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/models/ApiStringEnumRef.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ enum class ApiStringEnumRef(val value: kotlin.String) {
*/
fun decode(data: kotlin.Any?): ApiStringEnumRef? = data?.let {
val normalizedData = "$it".lowercase()
values().firstOrNull { value ->
entries.firstOrNull { value ->
it == value || normalizedData == "$value".lowercase()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...n-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/StringEnumRef.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ enum class StringEnumRef(@get:JsonValue val value: kotlin.String) {
throw IllegalArgumentException("Value for StringEnumRef cannot be null")
}
val normalizedData = "$data".lowercase()
return values().firstOrNull { value ->
return entries.firstOrNull { value ->
data == value || normalizedData == "$value".lowercase()
}
?: unknown_default_open_api
Expand Down
2 changes: 1 addition & 1 deletion ...in-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/StringEnumRef.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ enum class StringEnumRef(@get:JsonValue val value: kotlin.String) {
throw IllegalArgumentException("Value for StringEnumRef cannot be null")
}
val normalizedData = "$data".lowercase()
return values().firstOrNull { value ->
return entries.firstOrNull { value ->
data == value || normalizedData == "$value".lowercase()
}
?: unknown_default_open_api
Expand Down
2 changes: 1 addition & 1 deletion ...l-prefix-type-mappings/src/main/kotlin/org/openapitools/client/models/ApiStringEnumRef.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum class ApiStringEnumRef(val value: kotlin.String) {
*/
fun decode(data: kotlin.Any?): ApiStringEnumRef? = data?.let {
val normalizedData = "$it".lowercase()
values().firstOrNull { value ->
entries.firstOrNull { value ->
it == value || normalizedData == "$value".lowercase()
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/models/Code.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ enum class Code(val value: kotlin.Int) {
*/
fun decode(data: kotlin.Any?): Code? = data?.let {
val normalizedData = "$it".lowercase()
values().firstOrNull { value ->
entries.firstOrNull { value ->
it == value || normalizedData == "$value".lowercase()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/models/StringCode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ enum class StringCode(val value: kotlin.String) {
*/
fun decode(data: kotlin.Any?): StringCode? = data?.let {
val normalizedData = "$it".lowercase()
values().firstOrNull { value ->
entries.firstOrNull { value ->
it == value || normalizedData == "$value".lowercase()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -81,7 +81,7 @@ data class Order (

override fun deserialize(decoder: Decoder): Status {
val value = decoder.decodeSerializableValue(kotlin.String.serializer())
return Status.values().firstOrNull { it.value == value }
return Status.entries.firstOrNull { it.value == value }
?: Status.unknown_default_open_api
}

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -83,7 +83,7 @@ data class Pet (

override fun deserialize(decoder: Decoder): Status {
val value = decoder.decodeSerializableValue(kotlin.String.serializer())
return Status.values().firstOrNull { it.value == value }
return Status.entries.firstOrNull { it.value == value }
?: Status.unknown_default_open_api
}

Expand Down
2 changes: 1 addition & 1 deletion ...lin-model-prefix-type-mappings/src/main/kotlin/org/openapitools/client/models/ApiOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ data class ApiOrder (
}
// validate the optional field `status`
if (jsonObj["status"] != null && !jsonObj["status"].isJsonNull) {
require(Status.values().any { it.value == jsonObj["status"].asString }) {
require(Status.entries.any { it.value == jsonObj["status"].asString }) {
String.format("Expected the field `status` to be valid `Status` enum value in the JSON string but got `%s`", jsonObj["status"].toString())
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...otlin-model-prefix-type-mappings/src/main/kotlin/org/openapitools/client/models/ApiPet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ data class ApiPet (
}
// validate the optional field `status`
if (jsonObj["status"] != null && !jsonObj["status"].isJsonNull) {
require(Status.values().any { it.value == jsonObj["status"].asString }) {
require(Status.entries.any { it.value == jsonObj["status"].asString }) {
String.format("Expected the field `status` to be valid `Status` enum value in the JSON string but got `%s`", jsonObj["status"].toString())
}
}
Expand Down
4 changes: 2 additions & 2 deletions .../petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum class PetEnum(val value: kotlin.String) {
*/
fun decode(data: kotlin.Any?): PetEnum? = data?.let {
val normalizedData = "$it".lowercase()
values().firstOrNull { value ->
entries.firstOrNull { value ->
it == value || normalizedData == "$value".lowercase()
}
}
Expand All @@ -74,7 +74,7 @@ internal object PetEnumSerializer : KSerializer<PetEnum> {

override fun deserialize(decoder: Decoder): PetEnum {
val value = decoder.decodeSerializableValue(kotlin.String.serializer())
return PetEnum.values().firstOrNull { it.value == value }
return PetEnum.entries.firstOrNull { it.value == value }
?: PetEnum.UNKNOWN_DEFAULT_OPEN_API
}

Expand Down
Loading