Merge pull request OpenAPITools#3 from fullkomnun/kotlinx_date_librar…

…y_conditional_generation Kotlinx date library conditional generation
justasm · Jan 1, 2021 · d264d0f · d264d0f
2 parents 5bb6a79 + e2e7107
commit d264d0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...or/src/main/java/org/openapitools/codegen/languages/KotlinMultiplatformClientCodegen.java b/...or/src/main/java/org/openapitools/codegen/languages/KotlinMultiplatformClientCodegen.java
@@ -368,7 +368,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile(infraSrc + "HttpResponse.kt.mustache", infraDest, "HttpResponse.kt"));
         supportingFiles.add(new SupportingFile(infraSrc + "OctetByteArray.kt.mustache", infraDest, "OctetByteArray.kt"));
         if (dateLibrary == Options.DateLibrary.KOTLINX) {
-            supportingFiles.add(new SupportingFile(infraSrc + "dateTime.kt.mustache", infraDest, "dateTime.kt"));
+            supportingFiles.add(new SupportingFile(infraSrc + "DateTime.kt.mustache", infraDest, "DateTime.kt"));
         }
 
         // Auth

diff --git a/.../main/infrastructure/dateTime.kt.mustache → .../main/infrastructure/DateTime.kt.mustache b/.../main/infrastructure/dateTime.kt.mustache → .../main/infrastructure/DateTime.kt.mustache
diff --git a/modules/openapi-generator/src/main/resources/kotlin-multiplatform-client/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-multiplatform-client/model.mustache
@@ -1,13 +1,15 @@
 {{>licenseInfo}}
-@file:UseSerializers(InstantSerializer::class, LocalDateTimeSerializer::class, LocalDateSerializer::class)
+{{#dateLibraryKotlinx}}@file:UseSerializers(InstantSerializer::class, LocalDateTimeSerializer::class, LocalDateSerializer::class){{/dateLibraryKotlinx}}
 @file:Suppress("UnusedImport", "RemoveRedundantQualifierName")
 
 package {{modelPackage}}
 
+{{#dateLibraryKotlinx}}
 import kotlinx.serialization.UseSerializers
 import {{packageName}}.infrastructure.LocalDateTimeSerializer
 import {{packageName}}.infrastructure.InstantSerializer
 import {{packageName}}.infrastructure.LocalDateSerializer
+{{/dateLibraryKotlinx}}
 {{#imports}}import {{import}}
 {{/imports}}