Skip to content

Commit 45fc023

Browse files
4brunu4brunu
authored
[kotlin] fix Date types usages (#8594)
* [kotlin] fix Date types usages
1 parent b78d4fc commit 45fc023

151 files changed

Lines changed: 660 additions & 790 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/generators/kotlin-server.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
3232
| Type/Alias | Imports |
3333
| ---------- | ------- |
3434
|BigDecimal|java.math.BigDecimal|
35-
|Date|java.util.Date|
36-
|DateTime|java.time.LocalDateTime|
35+
|Date|java.time.LocalDate|
36+
|DateTime|java.time.OffsetDateTime|
3737
|File|java.io.File|
3838
|LocalDate|java.time.LocalDate|
3939
|LocalDateTime|java.time.LocalDateTime|

‎docs/generators/kotlin-vertx.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2626
| Type/Alias | Imports |
2727
| ---------- | ------- |
2828
|BigDecimal|java.math.BigDecimal|
29-
|Date|java.util.Date|
30-
|DateTime|java.time.LocalDateTime|
29+
|Date|java.time.LocalDate|
30+
|DateTime|java.time.OffsetDateTime|
3131
|File|java.io.File|
3232
|LocalDate|java.time.LocalDate|
3333
|LocalDateTime|java.time.LocalDateTime|

‎docs/generators/kotlin.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
3434
| Type/Alias | Imports |
3535
| ---------- | ------- |
3636
|BigDecimal|java.math.BigDecimal|
37-
|Date|java.util.Date|
38-
|DateTime|java.time.LocalDateTime|
37+
|Date|java.time.LocalDate|
38+
|DateTime|java.time.OffsetDateTime|
3939
|File|java.io.File|
4040
|LocalDate|java.time.LocalDate|
4141
|LocalDateTime|java.time.LocalDateTime|

‎docs/generators/ktorm-schema.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2727
| Type/Alias | Imports |
2828
| ---------- | ------- |
2929
|BigDecimal|java.math.BigDecimal|
30-
|Date|java.util.Date|
31-
|DateTime|java.time.LocalDateTime|
30+
|Date|java.time.LocalDate|
31+
|DateTime|java.time.OffsetDateTime|
3232
|File|java.io.File|
3333
|LocalDate|java.time.LocalDate|
3434
|LocalDateTime|java.time.LocalDateTime|

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public AbstractKotlinCodegen() {
153153
typeMapping.put("ByteArray", "kotlin.ByteArray");
154154
typeMapping.put("number", "java.math.BigDecimal");
155155
typeMapping.put("decimal", "java.math.BigDecimal");
156-
typeMapping.put("date-time", "java.time.LocalDateTime");
156+
typeMapping.put("date-time", "java.time.OffsetDateTime");
157157
typeMapping.put("date", "java.time.LocalDate");
158158
typeMapping.put("file", "java.io.File");
159159
typeMapping.put("array", "kotlin.Array");
@@ -163,7 +163,7 @@ public AbstractKotlinCodegen() {
163163
typeMapping.put("object", "kotlin.Any");
164164
typeMapping.put("binary", "kotlin.ByteArray");
165165
typeMapping.put("Date", "java.time.LocalDate");
166-
typeMapping.put("DateTime", "java.time.LocalDateTime");
166+
typeMapping.put("DateTime", "java.time.OffsetDateTime");
167167

168168
instantiationTypes.put("array", "kotlin.collections.ArrayList");
169169
instantiationTypes.put("list", "kotlin.collections.ArrayList");
@@ -174,9 +174,9 @@ public AbstractKotlinCodegen() {
174174
importMapping.put("UUID", "java.util.UUID");
175175
importMapping.put("URI", "java.net.URI");
176176
importMapping.put("File", "java.io.File");
177-
importMapping.put("Date", "java.util.Date");
177+
importMapping.put("Date", "java.time.LocalDate");
178178
importMapping.put("Timestamp", "java.sql.Timestamp");
179-
importMapping.put("DateTime", "java.time.LocalDateTime");
179+
importMapping.put("DateTime", "java.time.OffsetDateTime");
180180
importMapping.put("LocalDateTime", "java.time.LocalDateTime");
181181
importMapping.put("LocalDate", "java.time.LocalDate");
182182
importMapping.put("LocalTime", "java.time.LocalTime");

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,9 @@ public KotlinSpringServerCodegen() {
125125
typeMapping.put("array", "kotlin.collections.List");
126126
typeMapping.put("list", "kotlin.collections.List");
127127

128-
typeMapping.put("date", "java.time.LocalDate");
129-
typeMapping.put("date-time", "java.time.OffsetDateTime");
130-
typeMapping.put("Date", "java.time.LocalDate");
131-
typeMapping.put("DateTime", "java.time.OffsetDateTime");
132-
133128
// use resource for file handling
134129
typeMapping.put("file", "org.springframework.core.io.Resource");
135130

136-
importMapping.put("Date", "java.time.LocalDate");
137-
importMapping.put("DateTime", "java.time.OffsetDateTime");
138-
139131
addOption(TITLE, "server title name or client service name", title);
140132
addOption(BASE_PACKAGE, "base package (invokerPackage) for generated code", basePackage);
141133
addOption(SERVER_PORT, "configuration the port in which the sever is to run on", serverPort);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package {{packageName}}.infrastructure
22

33
{{#moshi}}
44
import com.squareup.moshi.Moshi
5-
import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
65
{{^moshiCodeGen}}
76
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
87
{{/moshiCodeGen}}
@@ -36,7 +35,6 @@ import java.util.Date
3635
{{#moshi}}
3736
@JvmStatic
3837
val moshiBuilder: Moshi.Builder = Moshi.Builder()
39-
.add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())
4038
.add(OffsetDateTimeAdapter())
4139
.add(LocalDateTimeAdapter())
4240
.add(LocalDateAdapter())
@@ -54,7 +52,6 @@ import java.util.Date
5452
{{#gson}}
5553
@JvmStatic
5654
val gsonBuilder: GsonBuilder = GsonBuilder()
57-
.registerTypeAdapter(Date::class.java, DateAdapter())
5855
.registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
5956
.registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
6057
.registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import java.util.Date
1111
object Serializer {
1212
@JvmStatic
1313
val gsonBuilder: GsonBuilder = GsonBuilder()
14-
.registerTypeAdapter(Date::class.java, DateAdapter())
1514
.registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
1615
.registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
1716
.registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())

‎samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package org.openapitools.client.infrastructure
22

33
import com.squareup.moshi.Moshi
4-
import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
54
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
65
import java.util.Date
76

87
object Serializer {
98
@JvmStatic
109
val moshiBuilder: Moshi.Builder = Moshi.Builder()
11-
.add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())
1210
.add(OffsetDateTimeAdapter())
1311
.add(LocalDateTimeAdapter())
1412
.add(LocalDateAdapter())

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import java.util.Date
1111
object Serializer {
1212
@JvmStatic
1313
val gsonBuilder: GsonBuilder = GsonBuilder()
14-
.registerTypeAdapter(Date::class.java, DateAdapter())
1514
.registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
1615
.registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
1716
.registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())

0 commit comments

Comments
 (0)