loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Kotlin] Fix parse error when using custom field names with @Json (#2944)

Browse Source 
* Fix to use isEmpty method

* Add KotlinJsonAdapterFactory to moshi adapter

* Update petstore sample
This commit is contained in:
Keiju Matsumoto 2019-05-22 20:58:38 +09:00 committed by Akihito Nakano
parent 6a1f33d2f8
commit 1e06d7fe88
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache vendored
View File

@ -1,6 +1,7 @@
package {{packageName}}.infrastructure package {{packageName}}.infrastructure
import com.squareup.moshi.FromJson import com.squareup.moshi.FromJson
import com.squareup.moshi.KotlinJsonAdapterFactory
import com.squareup.moshi.Moshi import com.squareup.moshi.Moshi
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -58,7 +59,7 @@ open class ApiClient(val baseUrl: String) {
return null return null
} }
val bodyContent = body.string() val bodyContent = body.string()
if (bodyContent.length == 0) { if (bodyContent.isEmpty()) {
return null return null
} }
return when(mediaType) { return when(mediaType) {
@ -69,6 +70,7 @@ open class ApiClient(val baseUrl: String) {
fun fromJson(s: String) = UUID.fromString(s) fun fromJson(s: String) = UUID.fromString(s)
}) })
.add(ByteArrayAdapter()) .add(ByteArrayAdapter())
.add(KotlinJsonAdapterFactory())
.build().adapter(T::class.java).fromJson(bodyContent) .build().adapter(T::class.java).fromJson(bodyContent)
else -> TODO("responseBody currently only supports JSON body.") else -> TODO("responseBody currently only supports JSON body.")
} }

4
samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -1,6 +1,7 @@
package org.openapitools.client.infrastructure package org.openapitools.client.infrastructure
import com.squareup.moshi.FromJson import com.squareup.moshi.FromJson
import com.squareup.moshi.KotlinJsonAdapterFactory
import com.squareup.moshi.Moshi import com.squareup.moshi.Moshi
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -58,7 +59,7 @@ open class ApiClient(val baseUrl: String) {
return null return null
} }
val bodyContent = body.string() val bodyContent = body.string()
if (bodyContent.length == 0) { if (bodyContent.isEmpty()) {
return null return null
} }
return when(mediaType) { return when(mediaType) {
@ -69,6 +70,7 @@ open class ApiClient(val baseUrl: String) {
fun fromJson(s: String) = UUID.fromString(s) fun fromJson(s: String) = UUID.fromString(s)
}) })
.add(ByteArrayAdapter()) .add(ByteArrayAdapter())
.add(KotlinJsonAdapterFactory())
.build().adapter(T::class.java).fromJson(bodyContent) .build().adapter(T::class.java).fromJson(bodyContent)
else -> TODO("responseBody currently only supports JSON body.") else -> TODO("responseBody currently only supports JSON body.")
} }

4
samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -1,6 +1,7 @@
package org.openapitools.client.infrastructure package org.openapitools.client.infrastructure
import com.squareup.moshi.FromJson import com.squareup.moshi.FromJson
import com.squareup.moshi.KotlinJsonAdapterFactory
import com.squareup.moshi.Moshi import com.squareup.moshi.Moshi
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -58,7 +59,7 @@ open class ApiClient(val baseUrl: String) {
return null return null
} }
val bodyContent = body.string() val bodyContent = body.string()
if (bodyContent.length == 0) { if (bodyContent.isEmpty()) {
return null return null
} }
return when(mediaType) { return when(mediaType) {
@ -69,6 +70,7 @@ open class ApiClient(val baseUrl: String) {
fun fromJson(s: String) = UUID.fromString(s) fun fromJson(s: String) = UUID.fromString(s)
}) })
.add(ByteArrayAdapter()) .add(ByteArrayAdapter())
.add(KotlinJsonAdapterFactory())
.build().adapter(T::class.java).fromJson(bodyContent) .build().adapter(T::class.java).fromJson(bodyContent)
else -> TODO("responseBody currently only supports JSON body.") else -> TODO("responseBody currently only supports JSON body.")
} }

4
samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -1,6 +1,7 @@
package org.openapitools.client.infrastructure package org.openapitools.client.infrastructure
import com.squareup.moshi.FromJson import com.squareup.moshi.FromJson
import com.squareup.moshi.KotlinJsonAdapterFactory
import com.squareup.moshi.Moshi import com.squareup.moshi.Moshi
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -58,7 +59,7 @@ open class ApiClient(val baseUrl: String) {
return null return null
} }
val bodyContent = body.string() val bodyContent = body.string()
if (bodyContent.length == 0) { if (bodyContent.isEmpty()) {
return null return null
} }
return when(mediaType) { return when(mediaType) {
@ -69,6 +70,7 @@ open class ApiClient(val baseUrl: String) {
fun fromJson(s: String) = UUID.fromString(s) fun fromJson(s: String) = UUID.fromString(s)
}) })
.add(ByteArrayAdapter()) .add(ByteArrayAdapter())
.add(KotlinJsonAdapterFactory())
.build().adapter(T::class.java).fromJson(bodyContent) .build().adapter(T::class.java).fromJson(bodyContent)
else -> TODO("responseBody currently only supports JSON body.") else -> TODO("responseBody currently only supports JSON body.")
} }