[kotlin] fix Date types usages (#8594)

* [kotlin] fix Date types usages

samples/openapi3/client/petstore/kotlin/.openapi-generator/FILES

@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/200Response.md
@@ -28,12 +27,6 @@ docs/Foo.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
-docs/InlineObject3.md
-docs/InlineObject4.md
-docs/InlineObject5.md
 docs/InlineResponseDefault.md
 docs/List.md
 docs/MapTest.md
@@ -100,12 +93,6 @@ src/main/kotlin/org/openapitools/client/models/Foo.kt
 src/main/kotlin/org/openapitools/client/models/FormatTest.kt
 src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
 src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
-src/main/kotlin/org/openapitools/client/models/InlineObject.kt
-src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
-src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
-src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
-src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
-src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
 src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
 src/main/kotlin/org/openapitools/client/models/List.kt
 src/main/kotlin/org/openapitools/client/models/MapTest.kt

samples/openapi3/client/petstore/kotlin/.openapi-generator/VERSION

@@ -1 +1 @@
-5.0.0-SNAPSHOT
+5.0.1-SNAPSHOT

samples/openapi3/client/petstore/kotlin/README.md

@@ -101,12 +101,6 @@ Class | Method | HTTP request | Description
  - [org.openapitools.client.models.FormatTest](docs/FormatTest.md)
  - [org.openapitools.client.models.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [org.openapitools.client.models.HealthCheckResult](docs/HealthCheckResult.md)
- - [org.openapitools.client.models.InlineObject](docs/InlineObject.md)
- - [org.openapitools.client.models.InlineObject1](docs/InlineObject1.md)
- - [org.openapitools.client.models.InlineObject2](docs/InlineObject2.md)
- - [org.openapitools.client.models.InlineObject3](docs/InlineObject3.md)
- - [org.openapitools.client.models.InlineObject4](docs/InlineObject4.md)
- - [org.openapitools.client.models.InlineObject5](docs/InlineObject5.md)
  - [org.openapitools.client.models.InlineResponseDefault](docs/InlineResponseDefault.md)
  - [org.openapitools.client.models.List](docs/List.md)
  - [org.openapitools.client.models.MapTest](docs/MapTest.md)

samples/openapi3/client/petstore/kotlin/build.gradle

@@ -29,11 +29,9 @@ test {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.moshi:moshi-kotlin:1.9.2"
     compile "com.squareup.moshi:moshi-adapters:1.9.2"
     compile "com.squareup.okhttp3:okhttp:4.2.2"
-    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
 }

samples/openapi3/client/petstore/kotlin/docs/FakeApi.md

@@ -551,13 +551,13 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**kotlin.collections.List<kotlin.String>**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to "-efg"] [enum: _abc, -efg, (xyz)]
+ **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
  **enumQueryStringArray** | [**kotlin.collections.List<kotlin.String>**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to "-efg"] [enum: _abc, -efg, (xyz)]
+ **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.collections.List<kotlin.String>**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to "$"] [enum: >, $]
- **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to "-efg"] [enum: _abc, -efg, (xyz)]
+ **enumFormStringArray** | [**kotlin.collections.List<kotlin.String>**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
+ **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
 
 ### Return type
 

samples/openapi3/client/petstore/kotlin/docs/FormatTest.md

@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **int64** | **kotlin.Long** |  |  [optional]
 **float** | **kotlin.Float** |  |  [optional]
 **double** | **kotlin.Double** |  |  [optional]
+**decimal** | [**java.math.BigDecimal**](java.math.BigDecimal.md) |  |  [optional]
 **string** | **kotlin.String** |  |  [optional]
 **binary** | [**java.io.File**](java.io.File.md) |  |  [optional]
 **dateTime** | [**java.time.OffsetDateTime**](java.time.OffsetDateTime.md) |  |  [optional]

samples/openapi3/client/petstore/kotlin/docs/List.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**`123minusList`** | **kotlin.String** |  |  [optional]
+**`123list`** | **kotlin.String** |  |  [optional]
 
 
 

samples/openapi3/client/petstore/kotlin/docs/SpecialModelName.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket** | **kotlin.Long** |  |  [optional]
+**dollarSpecialPropertyName** | **kotlin.Long** |  |  [optional]
 
 
 

samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt

@@ -98,7 +98,8 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
                     put("query_1", listOf(query1.toString()))
                 }
             }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("header_1" to header1.toString())
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        header1?.apply { localVariableHeaders["header_1"] = this.toString() }
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
             "/fake/http-signature-test",
@@ -471,13 +472,13 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * To test enum parameters
     * To test enum parameters
     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
-    * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
+    * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
-    * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
+    * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
     * @param enumQueryInteger Query parameter enum test (double) (optional)
     * @param enumQueryDouble Query parameter enum test (double) (optional)
-    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
-    * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
+    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
+    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
     * @return void
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
@@ -501,7 +502,9 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
                     put("enum_query_double", listOf(enumQueryDouble.toString()))
                 }
             }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded", "enum_header_string_array" to enumHeaderStringArray.joinToString(separator = collectionDelimiter("csv")), "enum_header_string" to enumHeaderString.toString())
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        enumHeaderStringArray?.apply { localVariableHeaders["enum_header_string_array"] = this.joinToString(separator = collectionDelimiter("csv")) }
+        enumHeaderString?.apply { localVariableHeaders["enum_header_string"] = this.toString() }
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
             "/fake",
@@ -556,7 +559,9 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
                     put("int64_group", listOf(int64Group.toString()))
                 }
             }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("required_boolean_group" to requiredBooleanGroup.toString(), "boolean_group" to booleanGroup.toString())
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        requiredBooleanGroup?.apply { localVariableHeaders["required_boolean_group"] = this.toString() }
+        booleanGroup?.apply { localVariableHeaders["boolean_group"] = this.toString() }
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
             "/fake",

samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

@@ -88,7 +88,8 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("api_key" to apiKey.toString())
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
             "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),

samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt

@@ -10,6 +10,7 @@ val Response.isInformational : Boolean get() = this.code in 100..199
 /**
  * Provides an extension to evaluation whether the response is a 3xx code
  */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 val Response.isRedirect : Boolean get() = this.code in 300..399
 
 /**

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

@@ -1,14 +1,12 @@
 package org.openapitools.client.infrastructure
 
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import java.util.Date
 
 object Serializer {
     @JvmStatic
     val moshiBuilder: Moshi.Builder = Moshi.Builder()
-        .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())
         .add(OffsetDateTimeAdapter())
         .add(LocalDateTimeAdapter())
         .add(LocalDateAdapter())

samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt

@@ -26,6 +26,7 @@ import java.io.Serializable
  * @param int64 
  * @param float 
  * @param double 
+ * @param decimal 
  * @param string 
  * @param binary 
  * @param dateTime 
@@ -53,6 +54,8 @@ data class FormatTest (
     val float: kotlin.Float? = null,
     @Json(name = "double")
     val double: kotlin.Double? = null,
+    @Json(name = "decimal")
+    val decimal: java.math.BigDecimal? = null,
     @Json(name = "string")
     val string: kotlin.String? = null,
     @Json(name = "binary")

samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt

@@ -17,12 +17,12 @@ import java.io.Serializable
 
 /**
  * 
- * @param `123minusList` 
+ * @param `123list` 
  */
 
 data class List (
     @Json(name = "123-list")
-    val `123minusList`: kotlin.String? = null
+    val `123list`: kotlin.String? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123

samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt

@@ -17,12 +17,12 @@ import java.io.Serializable
 
 /**
  * 
- * @param dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket 
+ * @param dollarSpecialPropertyName 
  */
 
 data class SpecialModelname (
     @Json(name = "\$special[property.name]")
-    val dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket: kotlin.Long? = null
+    val dollarSpecialPropertyName: kotlin.Long? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123