Remove as Call<Any> cast in ClientInvocationHandler (#1855)

* Remove as Call<Any> cast in ClientInvocationHandler * add test Co-authored-by: Jesse Wilson <jesse@swank.ca>
cashapp · Apr 15, 2021 · 9593078 · 9593078
1 parent ae89ecb
commit 9593078
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/misk/src/main/kotlin/misk/client/ClientInvocationHandler.kt b/misk/src/main/kotlin/misk/client/ClientInvocationHandler.kt
@@ -111,7 +111,7 @@ internal class ClientInvocationHandler(
       "no action corresponding to ${interfaceType.qualifiedName}#${method.name}"
     )
 
-    return method.invoke(retrofitProxy, *argsList.toTypedArray()) as Call<Any>
+    return method.invoke(retrofitProxy, *argsList.toTypedArray())
   }
 }
 

diff --git a/misk/src/test/kotlin/misk/client/TypedHttpClientTest.kt b/misk/src/test/kotlin/misk/client/TypedHttpClientTest.kt
@@ -5,6 +5,7 @@ import com.google.inject.Injector
 import com.google.inject.Provides
 import com.google.inject.name.Names
 import helpers.protos.Dinosaur
+import kotlinx.coroutines.runBlocking
 import misk.MiskTestingServiceModule
 import misk.inject.KAbstractModule
 import misk.inject.getInstance
@@ -103,11 +104,27 @@ internal class TypedHttpClientTest {
     )
   }
 
+  @Test
+  fun suspendingMethod() {
+    val client: ReturnADinosaurNonBlocking = clientInjector.getInstance(
+      Names.named("nonblockingDinosaur")
+    )
+    val response = runBlocking {
+      client.getDinosaur(Dinosaur.Builder().name("trex").build())
+    }
+    assertThat(response.name!!).isEqualTo("supertrex")
+  }
+
   interface ReturnADinosaur {
     @POST("/cooldinos")
     fun getDinosaur(@Body request: Dinosaur): Call<Dinosaur>
   }
 
+  interface ReturnADinosaurNonBlocking {
+    @POST("/cooldinos")
+    suspend fun getDinosaur(@Body request: Dinosaur): Dinosaur
+  }
+
   class ReturnADinosaurAction @Inject constructor() : WebAction {
     @Post("/cooldinos")
     @RequestContentType(MediaTypes.APPLICATION_JSON)
@@ -150,6 +167,10 @@ internal class TypedHttpClientTest {
     override fun configure() {
       install(MiskTestingServiceModule())
       install(TypedHttpClientModule.create<ReturnADinosaur>("dinosaur", Names.named("dinosaur")))
+      install(TypedHttpClientModule.create<ReturnADinosaurNonBlocking>(
+        "dinosaur",
+        Names.named("nonblockingDinosaur")
+      ))
       install(
         TypedHttpClientModule.create<ReturnAProtoDinosaur>("protoDino", Names.named("protoDino"))
       )