Skip to content

Fix explicit KSerializer's name & generation when used in container #20093

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
merged 2 commits into from
Nov 14, 2024
Merged

Fix explicit KSerializer's name & generation when used in container #20093

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
0756382
[kotlin][client] properly reference the same custom serializer name
hrach Nov 12, 2024
6ca974c
[kotlin][client] properly use correct type when enum in container
hrach Nov 12, 2024
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
8 changes: 4 additions & 4 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 @@ -111,7 +111,7 @@ import {{packageName}}.infrastructure.ITransformForStorage
*/
{{^multiplatform}}
{{#kotlinx_serialization}}
{{#serializableModel}}@KSerializable{{/serializableModel}}{{^serializableModel}}@Serializable{{#enumUnknownDefaultCase}}(with = {{classname}}Serializer::class){{/enumUnknownDefaultCase}}{{/serializableModel}}
{{#serializableModel}}@KSerializable{{/serializableModel}}{{^serializableModel}}@Serializable{{#enumUnknownDefaultCase}}(with = {{{nameInPascalCase}}}Serializer::class){{/enumUnknownDefaultCase}}{{/serializableModel}}
{{/kotlinx_serialization}}
{{#moshi}}
@JsonClass(generateAdapter = false)
Expand Down Expand Up @@ -148,16 +148,16 @@ import {{packageName}}.infrastructure.ITransformForStorage

@Serializer(forClass = {{{nameInPascalCase}}}::class)
internal object {{nameInPascalCase}}Serializer : KSerializer<{{nameInPascalCase}}> {
override val descriptor = {{{dataType}}}.serializer().descriptor
override val descriptor = {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}.serializer().descriptor

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

override fun serialize(encoder: Encoder, value: {{nameInPascalCase}}) {
encoder.encodeSerializableValue({{{dataType}}}.serializer(), value.value)
encoder.encodeSerializableValue({{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}.serializer(), value.value)
}
}
{{/enumUnknownDefaultCase}}
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 @@ -68,7 +68,7 @@ data class Order (
*
* Values: placed,approved,delivered,unknown_default_open_api
*/
@Serializable(with = OrderSerializer::class)
@Serializable(with = StatusSerializer::class)
enum class Status(val value: kotlin.String) {
@SerialName(value = "placed") placed("placed"),
@SerialName(value = "approved") approved("approved"),
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 @@ -70,7 +70,7 @@ data class Pet (
*
* Values: available,pending,sold,unknown_default_open_api
*/
@Serializable(with = PetSerializer::class)
@Serializable(with = StatusSerializer::class)
enum class Status(val value: kotlin.String) {
@SerialName(value = "available") available("available"),
@SerialName(value = "pending") pending("pending"),
Expand Down
Loading