Merge pull request #2 from stardogventures/retry-response-and-file-upload

Retry response and file upload

Author: eonwhite

modules/swagger-codegen/src/main/resources/kotlin-client/api.mustache

@@ -50,6 +50,7 @@ class {{classname}}(basePath: kotlin.String = "{{{basePath}}}", baseHeaders: Map
             ResponseType.Success -> {{#returnType}}(response as Success<*>).data as {{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
             ResponseType.Informational -> TODO()
             ResponseType.Redirection -> TODO()
+            ResponseType.Retry -> throw RetryException((response as RetryResponse<*>).body as? String ?: "Retry request")
             ResponseType.ClientError -> throw ClientException((response as ClientError<*>).body as? String ?: "Client error")
             ResponseType.ServerError -> throw ServerException((response as ServerError<*>).message ?: "Server error")
             else -> throw kotlin.IllegalStateException("Undefined ResponseType.")

modules/swagger-codegen/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache

@@ -5,7 +5,7 @@ import java.io.File
 import java.io.IOException
 import java.util.regex.Pattern
 
-open class ApiClient(val baseUrl: String, val baseHeaders: Map<String,String> = emptyMap()) {
+open class ApiClient(val baseUrl: String, val baseHeaders: Map<String, String> = emptyMap()) {
     companion object {
         protected val ContentType = "Content-Type"
         protected val Accept = "Accept"
@@ -38,15 +38,14 @@ open class ApiClient(val baseUrl: String, val baseHeaders: Map<String,String> =
 
             // content's type *must* be Map<String, Any>
             @Suppress("UNCHECKED_CAST")
-            (content as Map<String,Any>).forEach { key, value ->
+            (content as Map<String, Any>).forEach { (key, value) ->
                 if(value::class == File::class) {
                     val file = value as File
                     requestBodyBuilder.addFormDataPart(key, file.name, RequestBody.create(MediaType.parse("application/octet-stream"), file))
                 } else {
                     val stringValue = value as String
                     requestBodyBuilder.addFormDataPart(key, stringValue)
                 }
-                TODO("Handle other types inside FormDataMediaType")
             }
 
             return requestBodyBuilder.build()
@@ -63,9 +62,9 @@ open class ApiClient(val baseUrl: String, val baseHeaders: Map<String,String> =
     }
 
     inline protected fun <reified T: Any?> responseBody(response: Response, mediaType: String = JsonMediaType): T? {
-        if(response.body() == null) return null
+        if (response.body() == null) return null
         
-        if(T::class.java == java.io.File::class.java){
+        if (T::class.java == java.io.File::class.java) {
             return downloadFileFromResponse(response) as T
         } else if(T::class == kotlin.Unit::class) {
             return kotlin.Unit as T
@@ -77,7 +76,7 @@ open class ApiClient(val baseUrl: String, val baseHeaders: Map<String,String> =
             contentType = JsonMediaType
         }
 
-		if(isJsonMime(contentType)){
+        if (isJsonMime(contentType)) {
             return Serializer.moshi.adapter(T::class.java).fromJson(response.body()?.source())
         } else if(contentType.equals(String.javaClass)){
             return response.body().toString() as T
@@ -144,6 +143,11 @@ open class ApiClient(val baseUrl: String, val baseHeaders: Map<String,String> =
                     response.code(),
                     response.headers().toMultimap()
             )
+            response.code() == 202 -> return RetryResponse(
+                    responseBody(response, accept),
+                    response.code(),
+                    response.headers().toMultimap()
+            )
             response.isSuccessful -> return Success(
                     responseBody(response, accept),
                     response.code(),

modules/swagger-codegen/src/main/resources/kotlin-client/infrastructure/ApiInfrastructureResponse.kt.mustache

@@ -1,7 +1,7 @@
 package {{packageName}}.infrastructure
 
 enum class ResponseType {
-    Success, Informational, Redirection, ClientError, ServerError
+    Success, Retry, Informational, Redirection, ClientError, ServerError
 }
 
 abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType) {
@@ -37,4 +37,10 @@ class ServerError<T>(
         val body: Any? = null,
         override val statusCode: Int = -1,
         override val headers: Map<String, List<String>>
-): ApiInfrastructureResponse<T>(ResponseType.ServerError)
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
+
+class RetryResponse<T>(
+        val body: Any? = null,
+        override val statusCode: Int = -1,
+        override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Success)

modules/swagger-codegen/src/main/resources/kotlin-client/infrastructure/Errors.kt.mustache

@@ -39,4 +39,23 @@ open class ServerException : RuntimeException {
     companion object {
         private const val serialVersionUID: Long = 456L
     }
+}
+
+open class RetryException : RuntimeException {
+
+    /**
+     * Constructs an [RetryException] with no detail message.
+     */
+    constructor() : super()
+
+    /**
+     * Constructs an [RetryException] with the specified detail message.
+
+     * @param   message   the detail message.
+     */
+    constructor(message: kotlin.String) : super(message)
+
+    companion object {
+        private const val serialVersionUID: Long = 789L
+    }
 }

modules/swagger-codegen/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache

@@ -1,8 +1,8 @@
 package {{packageName}}.infrastructure
 
-import com.squareup.moshi.KotlinJsonAdapterFactory
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Rfc3339DateJsonAdapter
+import com.squareup.moshi.*
+import java.math.BigDecimal
+import java.time.LocalDate
 import java.util.*
 
 object Serializer {

modules/swagger-codegen/src/test/java/io/swagger/codegen/kotlin/KotlinClientCodegenModelTest.java

@@ -165,10 +165,10 @@ public void arrayPropertyTest() {
         Assert.assertEquals(property.baseName, "examples");
         Assert.assertEquals(property.getter, "getExamples");
         Assert.assertEquals(property.setter, "setExamples");
-        Assert.assertEquals(property.datatype, "kotlin.Array<kotlin.String>");
+        Assert.assertEquals(property.datatype, "kotlin.collections.List<kotlin.String>");
         Assert.assertEquals(property.name, "examples");
         Assert.assertEquals(property.defaultValue, "null");
-        Assert.assertEquals(property.baseType, "kotlin.Array");
+        Assert.assertEquals(property.baseType, "kotlin.collections.List");
         Assert.assertEquals(property.containerType, "array");
         Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);

pom.xml

@@ -938,7 +938,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.49-SNAPSHOT</swagger-parser-version>
+        <swagger-parser-version>1.0.49</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
         <swagger-core-version>1.6.1-SNAPSHOT</swagger-core-version>