Running ./bin/generate-samples.sh

modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache

@@ -64,8 +64,7 @@ import java.util.Date
 {{/moshi}}
 {{#gson}}
     @JvmStatic
-    var gsonBuilder = GsonFireBuilder()
-    {{#models}}{{#model}}{{#discriminator}}
+    var gsonBuilder = GsonFireBuilder(){{#models}}{{#model}}{{#discriminator}}
         .registerTypeSelector<{{classname}}>({{classname}}::class.java, TypeSelector<{{classname}}?> { readElement ->
             val classByDiscriminatorValue: MutableMap<String, Any?> = HashMap()
             {{#mappedModels}}
@@ -77,8 +76,7 @@ import java.util.Date
                 classByDiscriminatorValue,
                 getDiscriminatorValue(readElement, "{{propertyName}}")) as Class<out {{classname}}?>?
                 } catch (ex: IllegalArgumentException) { return@TypeSelector {{classname}}::class.java}
-        })
-    {{/discriminator}}{{/model}}{{/models}}
+        }){{/discriminator}}{{/model}}{{/models}}
         .createGsonBuilder()
         .registerTypeAdapter(Date::class.java, DateAdapter())
         .registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())

samples/client/petstore/kotlin-gson/build.gradle

@@ -30,6 +30,7 @@ test {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "com.google.code.gson:gson:2.8.6"
+    compile "io.gsonfire:gson-fire:1.8.0"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.okhttp3:okhttp:4.2.2"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"

samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt

@@ -2,23 +2,47 @@ package org.openapitools.client.infrastructure
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.google.gson.JsonElement
+import io.gsonfire.GsonFireBuilder
+import io.gsonfire.TypeSelector
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
 import java.util.UUID
+import org.openapitools.client.models.*
+import kotlin.collections.HashMap
+import kotlin.collections.MutableMap
+import kotlin.collections.get
+import kotlin.collections.set
+import kotlin.collections.toTypedArray
 import java.util.Date
 
 object Serializer {
     @JvmStatic
-    val gsonBuilder: GsonBuilder = GsonBuilder()
+    var gsonBuilder = GsonFireBuilder()
+        .createGsonBuilder()
         .registerTypeAdapter(Date::class.java, DateAdapter())
         .registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
         .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
         .registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())
         .registerTypeAdapter(ByteArray::class.java, ByteArrayAdapter())
-    
+
     @JvmStatic
     val gson: Gson by lazy {
         gsonBuilder.create()
     }
+
+    fun getDiscriminatorValue(readElement: JsonElement, discriminatorField: String?): String? {
+        val element: JsonElement = readElement.getAsJsonObject().get(discriminatorField)
+            ?: throw IllegalArgumentException("missing discriminator field: <$discriminatorField>")
+        return element.getAsString()
+    }
+
+    fun getClassByDiscriminator(
+        classByDiscriminatorValue: Map<*, *>,
+        discriminatorValue: String?
+    ): Class<*>? {
+        return classByDiscriminatorValue[discriminatorValue?.toUpperCase()] as Class<*>?
+            ?: throw IllegalArgumentException("cannot determine model class of name: <$discriminatorValue>")
+    }
 }

samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle

@@ -30,6 +30,7 @@ test {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "com.google.code.gson:gson:2.8.6"
+    compile "io.gsonfire:gson-fire:1.8.0"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.okhttp3:okhttp:4.2.2"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"

samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt

@@ -2,23 +2,47 @@ package org.openapitools.client.infrastructure
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.google.gson.JsonElement
+import io.gsonfire.GsonFireBuilder
+import io.gsonfire.TypeSelector
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
 import java.util.UUID
+import org.openapitools.client.models.*
+import kotlin.collections.HashMap
+import kotlin.collections.MutableMap
+import kotlin.collections.get
+import kotlin.collections.set
+import kotlin.collections.toTypedArray
 import java.util.Date
 
 object Serializer {
     @JvmStatic
-    val gsonBuilder: GsonBuilder = GsonBuilder()
+    var gsonBuilder = GsonFireBuilder()
+        .createGsonBuilder()
         .registerTypeAdapter(Date::class.java, DateAdapter())
         .registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
         .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
         .registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())
         .registerTypeAdapter(ByteArray::class.java, ByteArrayAdapter())
-    
+
     @JvmStatic
     val gson: Gson by lazy {
         gsonBuilder.create()
     }
+
+    fun getDiscriminatorValue(readElement: JsonElement, discriminatorField: String?): String? {
+        val element: JsonElement = readElement.getAsJsonObject().get(discriminatorField)
+            ?: throw IllegalArgumentException("missing discriminator field: <$discriminatorField>")
+        return element.getAsString()
+    }
+
+    fun getClassByDiscriminator(
+        classByDiscriminatorValue: Map<*, *>,
+        discriminatorValue: String?
+    ): Class<*>? {
+        return classByDiscriminatorValue[discriminatorValue?.toUpperCase()] as Class<*>?
+            ?: throw IllegalArgumentException("cannot determine model class of name: <$discriminatorValue>")
+    }
 }