updates to kotlin client

charthop · Jan 24, 2020 · 849dc7c · 849dc7c
1 parent e2a0321
commit 849dc7c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/...les/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractKotlinCodegen.java b/...les/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractKotlinCodegen.java
@@ -145,8 +145,8 @@ public AbstractKotlinCodegen() {
         typeMapping.put("date-time", "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("array", "kotlin.collections.List");
+        typeMapping.put("list", "kotlin.collections.List");
         typeMapping.put("map", "kotlin.collections.Map");
         typeMapping.put("object", "kotlin.Any");
         typeMapping.put("binary", "kotlin.Array<kotlin.Byte>");

diff --git a/modules/swagger-codegen/src/main/resources/kotlin-client/api.mustache b/modules/swagger-codegen/src/main/resources/kotlin-client/api.mustache
@@ -20,13 +20,18 @@ class {{classname}}(basePath: kotlin.String = "{{{basePath}}}", baseHeaders: Map
     {{/allParams}}* @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
     */{{#returnType}}
     @Suppress("UNCHECKED_CAST"){{/returnType}}
-    fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
+    fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}? = null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}} {
         val localVariableBody: kotlin.Any? = {{#hasBodyParam}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}null{{/hasFormParams}}{{#hasFormParams}}mapOf({{#formParams}}"{{{baseName}}}" to {{paramName}}{{#hasMore}}, {{/hasMore}}{{/formParams}}){{/hasFormParams}}{{/hasBodyParam}}
-        val localVariableQuery: MultiValueMap = {{^hasQueryParams}}mapOf(){{/hasQueryParams}}{{#hasQueryParams}}mapOf({{#queryParams}}"{{baseName}}" to {{#isContainer}}toMultiValue({{paramName}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf("${{paramName}}"){{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/queryParams}}){{/hasQueryParams}}
-
+        val localVariableQuery = mutableMapOf<String,List<String>>()
+        {{#queryParams}}
+        if ({{baseName}} != null) {
+            localVariableQuery["{{baseName}}"] = listOf("${{baseName}}")
+        }
+        {{/queryParams}}
+
         val contentHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf({{#hasFormParams}}"Content-Type" to "multipart/form-data"{{/hasFormParams}})
         val acceptsHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf({{#hasProduces}}"Accept" to "{{#produces}}{{#isContainer}}{{mediaType}}.joinToString(separator = collectionDelimiter("{{collectionFormat}}"){{/isContainer}}{{^isContainer}}{{mediaType}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/produces}}"{{/hasProduces}})
-        val localVariableHeaders: kotlin.collections.MutableMap<kotlin.String,kotlin.String> = mutableMapOf({{#hasHeaderParams}}{{#headerParams}}"{{baseName}}" to {{#isContainer}}{{paramName}}.joinToString(separator = collectionDelimiter("{{collectionFormat}}"){{/isContainer}}{{^isContainer}}{{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/headerParams}}{{/hasHeaderParams}})
+        val localVariableHeaders: kotlin.collections.MutableMap<kotlin.String,kotlin.String?> = mutableMapOf({{#hasHeaderParams}}{{#headerParams}}"{{baseName}}" to {{#isContainer}}{{paramName}}.joinToString(separator = collectionDelimiter("{{collectionFormat}}"){{/isContainer}}{{^isContainer}}{{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/headerParams}}{{/hasHeaderParams}})
         localVariableHeaders.putAll(contentHeaders)
         localVariableHeaders.putAll(acceptsHeaders)
 

diff --git a/...swagger-codegen/src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache b/...swagger-codegen/src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache
@@ -11,5 +11,5 @@ package {{packageName}}.infrastructure
 data class RequestConfig(
         val method: RequestMethod,
         val path: String,
-        val headers: Map<String, String> = mapOf(),
+        val headers: Map<String, String?> = mapOf(),
         val query: Map<String, List<String>> = mapOf())
diff --git a/...es/swagger-codegen/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache b/...es/swagger-codegen/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache
@@ -10,5 +10,17 @@ object Serializer {
     val moshi: Moshi = Moshi.Builder()
             .add(KotlinJsonAdapterFactory())
             .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())
+            .add(LocalDateAdapter)
+            .add(BigDecimalAdapter)
             .build()
 }
+
+object LocalDateAdapter {
+    @FromJson fun fromJson(string: String) = LocalDate.parse(string)
+    @ToJson fun toJson(value: LocalDate) = value.toString()
+}
+
+object BigDecimalAdapter {
+    @FromJson fun fromJson(string: String) = BigDecimal(string)
+    @ToJson fun toJson(value: BigDecimal) = value.toString()
+}