add x-duplicated-data-type guard to kotlinx_serialization oneOf/anyOf templates

The Gson path already uses {{^vendorExtensions.x-duplicated-data-type}} to skip
duplicate data types, but the new kotlinx_serialization path was missing this
guard. Without it, duplicate value class names would be generated if multiple
schemas resolve to the same Kotlin dataType, causing compilation errors.

Author: naokiwakata

modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache

@@ -105,9 +105,11 @@ import java.io.IOException
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}sealed interface {{classname}} {
 {{#composedSchemas}}
 {{#anyOf}}
+{{^vendorExtensions.x-duplicated-data-type}}
     @JvmInline
     {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}value class {{#fnToValueClassName}}{{{dataType}}}{{/fnToValueClassName}}(val value: {{{dataType}}}) : {{classname}}
 
+{{/vendorExtensions.x-duplicated-data-type}}
 {{/anyOf}}
 {{/composedSchemas}}
 }
@@ -121,6 +123,7 @@ import java.io.IOException
         when (value) {
             {{#composedSchemas}}
             {{#anyOf}}
+            {{^vendorExtensions.x-duplicated-data-type}}
             {{#isArray}}
             is {{classname}}.{{#fnToValueClassName}}{{{dataType}}}{{/fnToValueClassName}} -> jsonEncoder.encodeJsonElement(jsonEncoder.json.encodeToJsonElement(value.value))
             {{/isArray}}
@@ -153,6 +156,7 @@ import java.io.IOException
             is {{classname}}.{{#fnToValueClassName}}{{{dataType}}}{{/fnToValueClassName}} -> jsonEncoder.encodeSerializableValue({{{dataType}}}.serializer(), value.value)
             {{/isPrimitiveType}}
             {{/isArray}}
+            {{/vendorExtensions.x-duplicated-data-type}}
             {{/anyOf}}
             {{/composedSchemas}}
         }
@@ -166,6 +170,7 @@ import java.io.IOException
 
         {{#composedSchemas}}
         {{#anyOf}}
+        {{^vendorExtensions.x-duplicated-data-type}}
         {{#isArray}}
         if (jsonElement is JsonArray) {
             try {
@@ -210,6 +215,7 @@ import java.io.IOException
         }
         {{/isPrimitiveType}}
         {{/isArray}}
+        {{/vendorExtensions.x-duplicated-data-type}}
         {{/anyOf}}
         {{/composedSchemas}}
 

modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache

@@ -167,9 +167,11 @@ import java.io.IOException
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}sealed interface {{classname}} {
 {{#composedSchemas}}
 {{#oneOf}}
+{{^vendorExtensions.x-duplicated-data-type}}
     @JvmInline
     {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}value class {{#fnToValueClassName}}{{{dataType}}}{{/fnToValueClassName}}(val value: {{{dataType}}}) : {{classname}}
 
+{{/vendorExtensions.x-duplicated-data-type}}
 {{/oneOf}}
 {{/composedSchemas}}
 }
@@ -183,6 +185,7 @@ import java.io.IOException
         when (value) {
             {{#composedSchemas}}
             {{#oneOf}}
+            {{^vendorExtensions.x-duplicated-data-type}}
             {{#isArray}}
             is {{classname}}.{{#fnToValueClassName}}{{{dataType}}}{{/fnToValueClassName}} -> jsonEncoder.encodeJsonElement(jsonEncoder.json.encodeToJsonElement(value.value))
             {{/isArray}}
@@ -215,6 +218,7 @@ import java.io.IOException
             is {{classname}}.{{#fnToValueClassName}}{{{dataType}}}{{/fnToValueClassName}} -> jsonEncoder.encodeSerializableValue({{{dataType}}}.serializer(), value.value)
             {{/isPrimitiveType}}
             {{/isArray}}
+            {{/vendorExtensions.x-duplicated-data-type}}
             {{/oneOf}}
             {{/composedSchemas}}
         }
@@ -228,6 +232,7 @@ import java.io.IOException
 
         {{#composedSchemas}}
         {{#oneOf}}
+        {{^vendorExtensions.x-duplicated-data-type}}
         {{#isArray}}
         if (jsonElement is JsonArray) {
             try {
@@ -272,6 +277,7 @@ import java.io.IOException
         }
         {{/isPrimitiveType}}
         {{/isArray}}
+        {{/vendorExtensions.x-duplicated-data-type}}
         {{/oneOf}}
         {{/composedSchemas}}
 

samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/.openapi-generator/FILES

@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/AnyOfUserOrPet.md
@@ -41,12 +40,3 @@ src/main/kotlin/org/openapitools/client/models/StringOrLong.kt
 src/main/kotlin/org/openapitools/client/models/User.kt
 src/main/kotlin/org/openapitools/client/models/UserOrPet.kt
 src/main/kotlin/org/openapitools/client/models/UserOrPetOrArrayString.kt
-src/test/kotlin/org/openapitools/client/apis/TestApiTest.kt
-src/test/kotlin/org/openapitools/client/models/AnyOfUserOrPetOrArrayStringTest.kt
-src/test/kotlin/org/openapitools/client/models/AnyOfUserOrPetTest.kt
-src/test/kotlin/org/openapitools/client/models/BooleanOrLongTest.kt
-src/test/kotlin/org/openapitools/client/models/PetTest.kt
-src/test/kotlin/org/openapitools/client/models/StringOrLongTest.kt
-src/test/kotlin/org/openapitools/client/models/UserOrPetOrArrayStringTest.kt
-src/test/kotlin/org/openapitools/client/models/UserOrPetTest.kt
-src/test/kotlin/org/openapitools/client/models/UserTest.kt