Kotlin LocalDate and LocalDateTime parsing fix #516

Author: crazyk2

src/main/java/io/swagger/codegen/v3/generators/kotlin/AbstractKotlinCodegen.java

@@ -155,14 +155,14 @@ public AbstractKotlinCodegen() {
         typeMapping.put("double", "kotlin.Double");
         typeMapping.put("number", "java.math.BigDecimal");
         typeMapping.put("date-time", "java.time.LocalDateTime");
-        typeMapping.put("date", "java.time.LocalDateTime");
+        typeMapping.put("date", "java.time.LocalDate");
         typeMapping.put("file", "java.io.File");
         typeMapping.put("array", "kotlin.Array");
         typeMapping.put("list", "kotlin.Array");
         typeMapping.put("map", "kotlin.collections.Map");
         typeMapping.put("object", "kotlin.Any");
         typeMapping.put("binary", "kotlin.Array<kotlin.Byte>");
-        typeMapping.put("Date", "java.time.LocalDateTime");
+        typeMapping.put("Date", "java.time.LocalDate");
         typeMapping.put("DateTime", "java.time.LocalDateTime");
 
         instantiationTypes.put("array", "arrayOf");
@@ -500,7 +500,7 @@ public String toModelName(final String name) {
 
         modifiedName = titleCase(modifiedName);
 
-        if (modifiedName.equalsIgnoreCase("Companion")){
+        if (modifiedName.equalsIgnoreCase("Companion")) {
             modifiedName = "_" + modifiedName;
         }
 

src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinClientCodegen.java

@@ -129,5 +129,8 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("infrastructure/ResponseExtensions.kt.mustache", infrastructureFolder, "ResponseExtensions.kt"));
         supportingFiles.add(new SupportingFile("infrastructure/Serializer.kt.mustache", infrastructureFolder, "Serializer.kt"));
         supportingFiles.add(new SupportingFile("infrastructure/Errors.kt.mustache", infrastructureFolder, "Errors.kt"));
+        supportingFiles.add(new SupportingFile("infrastructure/LocalDateAdapter.kt.mustache", infrastructureFolder, "LocalDateAdapter.kt"));
+        supportingFiles.add(new SupportingFile("infrastructure/LocalDateTimeAdapter.kt.mustache", infrastructureFolder, "LocalDateTimeAdapter.kt"));
+
     }
 }

src/main/resources/handlebars/kotlin-client/infrastructure/LocalDateAdapter.kt.mustache

@@ -0,0 +1,24 @@
+package {{packageName}}.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+{{^threetenbp}}
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+{{/threetenbp}}
+{{#threetenbp}}
+import org.threeten.bp.LocalDate
+import org.threeten.bp.format.DateTimeFormatter
+{{/threetenbp}}
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+}

src/main/resources/handlebars/kotlin-client/infrastructure/LocalDateTimeAdapter.kt.mustache

@@ -0,0 +1,25 @@
+package {{packageName}}.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+{{^threetenbp}}
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+{{/threetenbp}}
+{{#threetenbp}}
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.format.DateTimeFormatter
+{{/threetenbp}}
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}

src/main/resources/handlebars/kotlin-client/infrastructure/Serializer.kt.mustache

@@ -1,14 +1,16 @@
 package {{packageName}}.infrastructure
 
-import com.squareup.moshi.KotlinJsonAdapterFactory
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.Rfc3339DateJsonAdapter
-import java.util.*
+import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
 
 object Serializer {
     @JvmStatic
     val moshi: Moshi = Moshi.Builder()
             .add(KotlinJsonAdapterFactory())
             .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())
+            .add(LocalDateTimeAdapter())
+            .add(LocalDateAdapter())
             .build()
-}
+}