Skip to content

Commit 182fc6b

Browse files
nutgaardnutgaard
committed
avoid intersection type
avoid intersection type by splitting the statements into separate code-branches. for each branch the type of `value` is therefor no longer an intersection Fixes #20636
1 parent eb8ce73 commit 182fc6b

File tree

25 files changed

+125
-50
lines changed
  • modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure
  • samples/client
    • echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure
    • others
      • kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure
    • petstore
      • kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-explicit/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-kotlinx-datetime/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-name-parameter-mappings/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure
      • kotlin/src/main/kotlin/org/openapitools/client/infrastructure

25 files changed

+125
-50
lines changed

‎modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,11 @@ import com.squareup.moshi.adapter
484484
null -> ""
485485
is Array<*> -> toMultiValue(value, "csv").toString()
486486
is Iterable<*> -> toMultiValue(value, "csv").toString()
487-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
488-
parseDateToQueryString(value)
487+
is OffsetDateTime -> parseDateToQueryString(value)
488+
is OffsetTime -> parseDateToQueryString(value)
489+
is LocalDateTime -> parseDateToQueryString(value)
490+
is LocalDate -> parseDateToQueryString(value)
491+
is LocalTime -> parseDateToQueryString(value)
489492
else -> value.toString()
490493
}
491494

‎samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
358358
null -> ""
359359
is Array<*> -> toMultiValue(value, "csv").toString()
360360
is Iterable<*> -> toMultiValue(value, "csv").toString()
361-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
362-
parseDateToQueryString(value)
361+
is OffsetDateTime -> parseDateToQueryString(value)
362+
is OffsetTime -> parseDateToQueryString(value)
363+
is LocalDateTime -> parseDateToQueryString(value)
364+
is LocalDate -> parseDateToQueryString(value)
365+
is LocalTime -> parseDateToQueryString(value)
363366
else -> value.toString()
364367
}
365368

‎samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
360360
null -> ""
361361
is Array<*> -> toMultiValue(value, "csv").toString()
362362
is Iterable<*> -> toMultiValue(value, "csv").toString()
363-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
364-
parseDateToQueryString(value)
363+
is OffsetDateTime -> parseDateToQueryString(value)
364+
is OffsetTime -> parseDateToQueryString(value)
365+
is LocalDateTime -> parseDateToQueryString(value)
366+
is LocalDate -> parseDateToQueryString(value)
367+
is LocalTime -> parseDateToQueryString(value)
365368
else -> value.toString()
366369
}
367370

‎samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
341341
null -> ""
342342
is Array<*> -> toMultiValue(value, "csv").toString()
343343
is Iterable<*> -> toMultiValue(value, "csv").toString()
344-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
345-
parseDateToQueryString(value)
344+
is OffsetDateTime -> parseDateToQueryString(value)
345+
is OffsetTime -> parseDateToQueryString(value)
346+
is LocalDateTime -> parseDateToQueryString(value)
347+
is LocalDate -> parseDateToQueryString(value)
348+
is LocalTime -> parseDateToQueryString(value)
346349
else -> value.toString()
347350
}
348351

‎samples/client/others/kotlin-jvm-okhttp-path-comments/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
351351
null -> ""
352352
is Array<*> -> toMultiValue(value, "csv").toString()
353353
is Iterable<*> -> toMultiValue(value, "csv").toString()
354-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
355-
parseDateToQueryString(value)
354+
is OffsetDateTime -> parseDateToQueryString(value)
355+
is OffsetTime -> parseDateToQueryString(value)
356+
is LocalDateTime -> parseDateToQueryString(value)
357+
is LocalDate -> parseDateToQueryString(value)
358+
is LocalTime -> parseDateToQueryString(value)
356359
else -> value.toString()
357360
}
358361

‎samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
341341
null -> ""
342342
is Array<*> -> toMultiValue(value, "csv").toString()
343343
is Iterable<*> -> toMultiValue(value, "csv").toString()
344-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
345-
parseDateToQueryString(value)
344+
is OffsetDateTime -> parseDateToQueryString(value)
345+
is OffsetTime -> parseDateToQueryString(value)
346+
is LocalDateTime -> parseDateToQueryString(value)
347+
is LocalDate -> parseDateToQueryString(value)
348+
is LocalTime -> parseDateToQueryString(value)
346349
else -> value.toString()
347350
}
348351

‎samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
341341
null -> ""
342342
is Array<*> -> toMultiValue(value, "csv").toString()
343343
is Iterable<*> -> toMultiValue(value, "csv").toString()
344-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
345-
parseDateToQueryString(value)
344+
is OffsetDateTime -> parseDateToQueryString(value)
345+
is OffsetTime -> parseDateToQueryString(value)
346+
is LocalDateTime -> parseDateToQueryString(value)
347+
is LocalDate -> parseDateToQueryString(value)
348+
is LocalTime -> parseDateToQueryString(value)
346349
else -> value.toString()
347350
}
348351

‎samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
341341
null -> ""
342342
is Array<*> -> toMultiValue(value, "csv").toString()
343343
is Iterable<*> -> toMultiValue(value, "csv").toString()
344-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
345-
parseDateToQueryString(value)
344+
is OffsetDateTime -> parseDateToQueryString(value)
345+
is OffsetTime -> parseDateToQueryString(value)
346+
is LocalDateTime -> parseDateToQueryString(value)
347+
is LocalDate -> parseDateToQueryString(value)
348+
is LocalTime -> parseDateToQueryString(value)
346349
else -> value.toString()
347350
}
348351

‎samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
341341
null -> ""
342342
is Array<*> -> toMultiValue(value, "csv").toString()
343343
is Iterable<*> -> toMultiValue(value, "csv").toString()
344-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
345-
parseDateToQueryString(value)
344+
is OffsetDateTime -> parseDateToQueryString(value)
345+
is OffsetTime -> parseDateToQueryString(value)
346+
is LocalDateTime -> parseDateToQueryString(value)
347+
is LocalDate -> parseDateToQueryString(value)
348+
is LocalTime -> parseDateToQueryString(value)
346349
else -> value.toString()
347350
}
348351

‎samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
341341
null -> ""
342342
is Array<*> -> toMultiValue(value, "csv").toString()
343343
is Iterable<*> -> toMultiValue(value, "csv").toString()
344-
is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
345-
parseDateToQueryString(value)
344+
is OffsetDateTime -> parseDateToQueryString(value)
345+
is OffsetTime -> parseDateToQueryString(value)
346+
is LocalDateTime -> parseDateToQueryString(value)
347+
is LocalDate -> parseDateToQueryString(value)
348+
is LocalTime -> parseDateToQueryString(value)
346349
else -> value.toString()
347350
}
348351

0 commit comments

Comments
 (0)