add "java.io.Serializable" directly via x-kotlin-implements

Author: Picazsoo

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

@@ -839,6 +839,7 @@ protected boolean needToImport(String type) {
     @Override
     public CodegenModel fromModel(String name, Schema schema) {
         CodegenModel m = super.fromModel(name, schema);
+        m.getVendorExtensions().putIfAbsent(VendorExtension.X_KOTLIN_IMPLEMENTS.getName(), List.of());
         List<String> implementedInterfacesClasses = (List<String>) m.getVendorExtensions().getOrDefault(VendorExtension.X_KOTLIN_IMPLEMENTS.getName(), List.of());
         List<String> implementedInterfacesFields = Optional.ofNullable((List<String>) m.getVendorExtensions().get(VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS.getName()))
                 .map(xKotlinImplementsFields -> {
@@ -849,6 +850,13 @@ public CodegenModel fromModel(String name, Schema schema) {
                     }
                     return xKotlinImplementsFields;
                 }).orElse(List.of());
+        if (serializableModel) {
+            if (!implementedInterfacesClasses.contains("java.io.Serializable")) {
+                var implementedInterfacesClassesWithSerializable = new ArrayList<>(implementedInterfacesClasses);
+                implementedInterfacesClassesWithSerializable.add("java.io.Serializable");
+                m.getVendorExtensions().put(VendorExtension.X_KOTLIN_IMPLEMENTS.getName(), implementedInterfacesClassesWithSerializable);
+            }
+        }
         m.optionalVars = m.optionalVars.stream().distinct().collect(Collectors.toList());
         // Update allVars/requiredVars/optionalVars with isInherited
         // Each of these lists contains elements that are similar, but they are all cloned

modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache

@@ -19,31 +19,13 @@
 {{/-last}}{{/optionalVars}}
 ){{/discriminator}}{{! no newline
 }}{{#parent}} : {{{.}}}{{#isMap}}(){{/isMap}}{{! no newline
-    }}{{#serializableModel}}{{! no newline
-      }}{{^vendorExtensions.x-kotlin-implements}}, Serializable{{/vendorExtensions.x-kotlin-implements}}{{! no newline
-      }}{{#vendorExtensions.x-kotlin-implements}}, Serializable, {{! no newline
-      }}{{#-first}} {{{.}}}{{/-first}}{{! no newline
-      }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline
-      }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline
-  }}{{/serializableModel}}{{! no newline
-  }}{{^serializableModel}}{{! no newline
-      }}{{#vendorExtensions.x-kotlin-implements}}, {{{.}}}{{/vendorExtensions.x-kotlin-implements}}{{! no newline
-  }}{{/serializableModel}}{{! no newline
+      }}{{#vendorExtensions.x-kotlin-implements}}, {{{.}}}{{/vendorExtensions.x-kotlin-implements}}{{! <- serializableModel is also handled via x-kotlin-implements
 }}{{/parent}}{{! no newline
 }}{{^parent}}{{! no newline
-  }}{{#serializableModel}}{{! no newline
-      }}{{^vendorExtensions.x-kotlin-implements}} : Serializable{{/vendorExtensions.x-kotlin-implements}}{{! no newline
-      }}{{#vendorExtensions.x-kotlin-implements}}{{! no newline
-      }}{{#-first}} : Serializable, {{{.}}}{{/-first}}{{! no newline
-      }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline
-      }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline
-  }}{{/serializableModel}}{{! no newline
-  }}{{^serializableModel}}{{! no newline
     }}{{#vendorExtensions.x-kotlin-implements}}{{! no newline
     }}{{#-first}} : {{{.}}}{{/-first}}{{! no newline
       }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline
     }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline
-  }}{{/serializableModel}}{{! no newline
 }}{{/parent}} {
 {{#discriminator}}
     {{#requiredVars}}

modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache

@@ -3,9 +3,6 @@ package {{package}}
 import java.util.Objects
 {{#imports}}import {{import}}
 {{/imports}}
-{{#serializableModel}}
-import java.io.Serializable
-{{/serializableModel}}
 {{#useBeanValidation}}
 import {{javaxPackage}}.validation.constraints.DecimalMax
 import {{javaxPackage}}.validation.constraints.DecimalMin

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

@@ -1003,8 +1003,7 @@ public void generateSerializableModel() throws Exception {
         Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Pet.kt");
         assertFileContains(
                 path,
-                "import java.io.Serializable",
-                ") : Serializable {",
+                ") : java.io.Serializable {",
                 "private const val serialVersionUID: kotlin.Long = 1"
         );
     }
@@ -1035,9 +1034,8 @@ public void generateSerializableModelWithXimplements() throws Exception {
         Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Dog.kt");
         assertFileContains(
                 path,
-                "import java.io.Serializable",
                 "@get:JsonProperty(\"likesFetch\", required = true) override val likesFetch: kotlin.Boolean,",
-                ") : Pet, Serializable,  com.some.pack.Fetchable {",
+                ") : Pet, com.some.pack.Fetchable, java.io.Serializable {",
                 "private const val serialVersionUID: kotlin.Long = 1"
         );
     }

samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt

@@ -2,7 +2,6 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import java.io.Serializable
 import javax.validation.constraints.DecimalMax
 import javax.validation.constraints.DecimalMin
 import javax.validation.constraints.Email
@@ -24,7 +23,7 @@ data class Category(
 
     @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")
     @get:JsonProperty("name") val name: kotlin.String? = null
-) : Serializable {
+) : java.io.Serializable {
 
     companion object {
         private const val serialVersionUID: kotlin.Long = 1

samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt

@@ -2,7 +2,6 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import java.io.Serializable
 import javax.validation.constraints.DecimalMax
 import javax.validation.constraints.DecimalMin
 import javax.validation.constraints.Email
@@ -26,7 +25,7 @@ data class ModelApiResponse(
     @get:JsonProperty("type") val type: kotlin.String? = null,
 
     @get:JsonProperty("message") val message: kotlin.String? = null
-) : Serializable {
+) : java.io.Serializable {
 
     companion object {
         private const val serialVersionUID: kotlin.Long = 1

samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt

@@ -4,7 +4,6 @@ import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
-import java.io.Serializable
 import javax.validation.constraints.DecimalMax
 import javax.validation.constraints.DecimalMin
 import javax.validation.constraints.Email
@@ -37,7 +36,7 @@ data class Order(
     @get:JsonProperty("status") val status: Order.Status? = null,
 
     @get:JsonProperty("complete") val complete: kotlin.Boolean? = false
-) : Serializable {
+) : java.io.Serializable {
 
     /**
     * Order Status

samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
 import org.openapitools.model.Category
 import org.openapitools.model.Tag
-import java.io.Serializable
 import javax.validation.constraints.DecimalMax
 import javax.validation.constraints.DecimalMin
 import javax.validation.constraints.Email
@@ -42,7 +41,7 @@ data class Pet(
 
     @Deprecated(message = "")
     @get:JsonProperty("status") val status: Pet.Status? = null
-) : Serializable {
+) : java.io.Serializable {
 
     /**
     * pet status in the store

samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt

@@ -2,7 +2,6 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import java.io.Serializable
 import javax.validation.constraints.DecimalMax
 import javax.validation.constraints.DecimalMin
 import javax.validation.constraints.Email
@@ -23,7 +22,7 @@ data class Tag(
     @get:JsonProperty("id") val id: kotlin.Long? = null,
 
     @get:JsonProperty("name") val name: kotlin.String? = null
-) : Serializable {
+) : java.io.Serializable {
 
     companion object {
         private const val serialVersionUID: kotlin.Long = 1

samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt

@@ -2,7 +2,6 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import java.io.Serializable
 import javax.validation.constraints.DecimalMax
 import javax.validation.constraints.DecimalMin
 import javax.validation.constraints.Email
@@ -41,7 +40,7 @@ data class User(
     @get:JsonProperty("phone") val phone: kotlin.String? = null,
 
     @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null
-) : Serializable {
+) : java.io.Serializable {
 
     companion object {
         private const val serialVersionUID: kotlin.Long = 1