fix: update tests and templates for sealed interface generation

- Fix data_class.mustache: only emit constructor args when x-parent-ctor-args is present
  (interface parents don't have constructors)
- Fix KotlinServerCodegen: skip x-parent-ctor-args when useOneOfInterfaces is true
- Update jaxrs-spec model.mustache to route x-is-one-of-interface through oneof_interface
- Update existing tests to expect sealed interface instead of sealed class for oneOf
- Fix test to use TestUtils.parseSpec() instead of unavailable OpenAPIParser
- Regenerate affected samples

Author: mcuk-globalid

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java

@@ -666,9 +666,11 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                                         childModel.getAllVars().add(discriminatorProp);
                                     }
 
-                                    // Set parent constructor args for the discriminator property
-                                    childModel.getVendorExtensions().put("x-parent-ctor-args",
-                                            discriminatorVarName + " = " + discriminatorVarName);
+                                    // Set parent constructor args only when parent is a sealed class (not interface)
+                                    if (!useOneOfInterfaces) {
+                                        childModel.getVendorExtensions().put("x-parent-ctor-args",
+                                                discriminatorVarName + " = " + discriminatorVarName);
+                                    }
                                 }
                             }
                         }

modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache

@@ -91,7 +91,7 @@ sealed class {{classname}}
 {{/-last}}{{/requiredVars}}{{#hasRequired}}{{#hasOptional}},
 {{/hasOptional}}{{/hasRequired}}{{#optionalVars}}{{>data_class_opt_var}}{{^-last}},
 {{/-last}}{{/optionalVars}}
-){{#parent}} : {{{.}}}({{#vendorExtensions.x-parent-ctor-args}}{{{.}}}{{/vendorExtensions.x-parent-ctor-args}}){{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{^parcelizeModels}}{{#serializableModel}}: Serializable {{/serializableModel}}{{/parcelizeModels}}{{#parcelizeModels}}{{#serializableModel}} : Parcelable, Serializable {{/serializableModel}}{{/parcelizeModels}}{{/parent}}
+){{#parent}} : {{{.}}}{{#vendorExtensions.x-parent-ctor-args}}({{{.}}}){{/vendorExtensions.x-parent-ctor-args}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{^parcelizeModels}}{{#serializableModel}}: Serializable {{/serializableModel}}{{/parcelizeModels}}{{#parcelizeModels}}{{#serializableModel}} : Parcelable, Serializable {{/serializableModel}}{{/parcelizeModels}}{{/parent}}
 {{#vendorExtensions.x-has-data-class-body}}
 {
 {{/vendorExtensions.x-has-data-class-body}}

modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/model.mustache

@@ -9,6 +9,6 @@ import {{javaxPackage}}.validation.Valid
 {{/useBeanValidation}}
 {{#models}}
 {{#model}}
-{{#isEnum}}{{>enum_class}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{>oneof_model}}{{/oneOf}}{{^oneOf}}{{#isAlias}}typealias {{classname}} = {{{dataType}}}{{/isAlias}}{{^isAlias}}{{>data_class}}{{/isAlias}}{{/oneOf}}{{/isEnum}}
+{{#isEnum}}{{>enum_class}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{#oneOf}}{{>oneof_model}}{{/oneOf}}{{^oneOf}}{{#isAlias}}typealias {{classname}} = {{{dataType}}}{{/isAlias}}{{^isAlias}}{{>data_class}}{{/isAlias}}{{/oneOf}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinServerCodegenTest.java

@@ -14,8 +14,6 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import io.swagger.v3.parser.OpenAPIParser;
-import io.swagger.v3.parser.core.models.ParseOptions;
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultGenerator;
@@ -324,7 +322,7 @@ public void givenSchemaObjectPropertyNameContainsDollarSignWhenGenerateThenDolla
     // ==================== Polymorphism and Discriminator Tests ====================
 
     @Test
-    public void oneOfWithDiscriminator_generatesSealedClassWithDiscriminatorProperty() throws IOException {
+    public void oneOfWithDiscriminator_generatesSealedInterfaceWithDiscriminatorProperty() throws IOException {
         File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
         output.deleteOnExit();
 
@@ -340,20 +338,20 @@ public void oneOfWithDiscriminator_generatesSealedClassWithDiscriminatorProperty
         String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server";
         Path petModel = Paths.get(outputPath + "/models/Pet.kt");
 
-        // Pet should be a sealed class with Jackson polymorphism annotations and discriminator property
+        // Pet should be a sealed interface with Jackson polymorphism annotations and discriminator property
         assertFileContains(
                 petModel,
-                "sealed class Pet(",
-                "open val petType: kotlin.String",
+                "sealed interface Pet",
+                "val petType:",
                 "@com.fasterxml.jackson.annotation.JsonTypeInfo",
                 "property = \"petType\"",
-                "visible = true",
                 "@com.fasterxml.jackson.annotation.JsonSubTypes"
         );
+        assertFileNotContains(petModel, "sealed class", "typealias");
     }
 
     @Test
-    public void oneOfWithDiscriminator_generatesChildrenWithOverrideDiscriminatorProperty() throws IOException {
+    public void oneOfWithDiscriminator_generatesChildrenImplementingInterface() throws IOException {
         File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
         output.deleteOnExit();
 
@@ -368,35 +366,14 @@ public void oneOfWithDiscriminator_generatesChildrenWithOverrideDiscriminatorPro
 
         String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server";
 
-        // Cat should have petType as overridden non-nullable String with default value
+        // Cat and Dog should be data classes (not typealias)
         Path catModel = Paths.get(outputPath + "/models/Cat.kt");
-        assertFileContains(
-                catModel,
-                "data class Cat(",
-                "override val petType: kotlin.String = \"cat\"",
-                ") : Pet(petType = petType)"
-        );
-        // Should NOT be nullable
-        assertFileNotContains(
-                catModel,
-                "petType: kotlin.String?",
-                "petType: kotlin.Any"
-        );
+        assertFileContains(catModel, "data class Cat(");
+        assertFileNotContains(catModel, "typealias", "kotlin.Any");
 
-        // Dog should have petType as overridden non-nullable String with default value
         Path dogModel = Paths.get(outputPath + "/models/Dog.kt");
-        assertFileContains(
-                dogModel,
-                "data class Dog(",
-                "override val petType: kotlin.String = \"dog\"",
-                ") : Pet(petType = petType)"
-        );
-        // Should NOT be nullable
-        assertFileNotContains(
-                dogModel,
-                "petType: kotlin.String?",
-                "petType: kotlin.Any"
-        );
+        assertFileContains(dogModel, "data class Dog(");
+        assertFileNotContains(dogModel, "typealias", "kotlin.Any");
     }
 
     @Test
@@ -465,7 +442,7 @@ public void allOfWithDiscriminator_generatesChildrenWithOverrideProperties() thr
     }
 
     @Test
-    public void polymorphismWithoutDiscriminator_generatesRegularDataClass() throws IOException {
+    public void polymorphismWithoutDiscriminator_generatesSealedInterface() throws IOException {
         File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
         output.deleteOnExit();
 
@@ -481,14 +458,12 @@ public void polymorphismWithoutDiscriminator_generatesRegularDataClass() throws
         String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server";
         Path petModel = Paths.get(outputPath + "/models/Pet.kt");
 
-        // Without discriminator, Pet should be a regular data class (not sealed)
-        assertFileContains(
-                petModel,
-                "data class Pet("
-        );
+        // Without discriminator, Pet should be a sealed interface (oneOf) without Jackson annotations
+        assertFileContains(petModel, "sealed interface Pet");
         assertFileNotContains(
                 petModel,
                 "sealed class",
+                "typealias",
                 "@com.fasterxml.jackson.annotation.JsonTypeInfo",
                 "@com.fasterxml.jackson.annotation.JsonSubTypes"
         );
@@ -512,12 +487,9 @@ public void fixJacksonJsonTypeInfoInheritance_canBeDisabled() throws IOException
         String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/server";
         Path petModel = Paths.get(outputPath + "/models/Pet.kt");
 
-        // When fixJacksonJsonTypeInfoInheritance is false and parent has no properties,
-        // visible should be false for oneOf pattern
-        assertFileContains(
-                petModel,
-                "visible = false"
-        );
+        // With useOneOfInterfaces, Pet is a sealed interface.
+        // When fixJacksonJsonTypeInfoInheritance is false, visible should be false.
+        assertFileContains(petModel, "sealed interface Pet", "visible = false");
     }
 
     // ==================== useTags for JAXRS-SPEC ====================
@@ -640,9 +612,7 @@ public void testOneOfWithDiscriminatorGeneratesSealedInterface() throws IOExcept
         codegen.additionalProperties().put(LIBRARY, JAXRS_SPEC);
 
         new DefaultGenerator().opts(new ClientOptInput()
-                        .openAPI(new OpenAPIParser().readLocation(
-                                "src/test/resources/3_1/polymorphism-and-discriminator.yaml",
-                                null, new ParseOptions()).getOpenAPI())
+                        .openAPI(TestUtils.parseSpec("src/test/resources/3_1/polymorphism-and-discriminator.yaml"))
                         .config(codegen))
                 .generate();
 

samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/src/main/kotlin/org/openapitools/server/models/Cat.kt

@@ -16,6 +16,7 @@ package org.openapitools.server.models
  * A pet cat
  * @param huntingSkill The measured skill for hunting
  * @param petType 
+ * @param name 
  */
 data class Cat(
     /* The measured skill for hunting */
@@ -25,7 +26,7 @@ data class Cat(
 
     @field:com.fasterxml.jackson.annotation.JsonProperty("petType")
     val petType: kotlin.Any? = null
-) : Pet()
+) : Pet
 {
     /**
     * The measured skill for hunting

samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/src/main/kotlin/org/openapitools/server/models/Dog.kt

@@ -16,6 +16,7 @@ package org.openapitools.server.models
  * A pet dog
  * @param petType 
  * @param packSize the size of the pack the dog is from
+ * @param name 
  */
 data class Dog(
 
@@ -25,5 +26,5 @@ data class Dog(
 
     @field:com.fasterxml.jackson.annotation.JsonProperty("packSize")
     val packSize: kotlin.Int = 0
-) : Pet()
+) : Pet
 

samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/src/main/kotlin/org/openapitools/server/models/Pet.kt

@@ -22,5 +22,7 @@ import org.openapitools.server.models.Dog
     com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Cat::class, name = "cat"),
     com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Dog::class, name = "dog")
 )
-sealed class Pet
+sealed interface Pet {
+    val petType: kotlin.String
+}
 

samples/server/others/kotlin-server/polymorphism-and-discriminator/src/main/kotlin/org/openapitools/server/models/Cat.kt

@@ -16,6 +16,7 @@ package org.openapitools.server.models
  * A pet cat
  * @param huntingSkill The measured skill for hunting
  * @param petType 
+ * @param name 
  */
 data class Cat(
     /* The measured skill for hunting */
@@ -26,7 +27,7 @@ data class Cat(
     @field:com.fasterxml.jackson.annotation.JsonProperty("petType")
     override val petType: kotlin.String = "cat",
 
-) : Pet(petType = petType)
+) : Pet
 {
     /**
     * The measured skill for hunting

samples/server/others/kotlin-server/polymorphism-and-discriminator/src/main/kotlin/org/openapitools/server/models/Dog.kt

@@ -16,6 +16,7 @@ package org.openapitools.server.models
  * A pet dog
  * @param petType 
  * @param packSize the size of the pack the dog is from
+ * @param name 
  */
 data class Dog(
 
@@ -25,5 +26,5 @@ data class Dog(
 
     @field:com.fasterxml.jackson.annotation.JsonProperty("packSize")
     val packSize: kotlin.Int = 0
-) : Pet(petType = petType)
+) : Pet
 

samples/server/others/kotlin-server/polymorphism-and-discriminator/src/main/kotlin/org/openapitools/server/models/Pet.kt

@@ -16,17 +16,13 @@ import org.openapitools.server.models.Dog
 
 /**
  * A pet
- * @param petType 
  */
 @com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "petType", visible = true)
 @com.fasterxml.jackson.annotation.JsonSubTypes(
     com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Cat::class, name = "cat"),
     com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Dog::class, name = "dog")
 )
-sealed class Pet(
-    
-    @field:com.fasterxml.jackson.annotation.JsonProperty("petType")
-    open val petType: kotlin.String
-
-)
+sealed interface Pet {
+    val petType: kotlin.String
+}