rpc (fix): Fix generated client interface (#3830)

wvlet · Feb 12, 2025 · bbc9ba2 · bbc9ba2
1 parent 0ee8b7a
commit bbc9ba2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/airframe-http-codegen/src/main/scala/wvlet/airframe/http/codegen/HttpClientIR.scala b/airframe-http-codegen/src/main/scala/wvlet/airframe/http/codegen/HttpClientIR.scala
@@ -175,6 +175,13 @@ object HttpClientIR extends LogSupport {
   ) extends ClientCodeIR {
     def typeArgString =
       typeArgs
+        .map(arg =>
+          if (arg.rawType.isAssignableFrom(classOf[Rx[_]]) && arg.typeArgs.size > 0)
+            // Extract Rx element type
+            arg.typeArgs(0)
+          else
+            arg
+        )
         .map(arg => HttpClientGenerator.fullTypeNameOf(arg))
         .mkString(", ")
     def clientMethodName = {

diff --git a/...e-http-codegen/src/main/scala/wvlet/airframe/http/codegen/client/RPCClientGenerator.scala b/...e-http-codegen/src/main/scala/wvlet/airframe/http/codegen/client/RPCClientGenerator.scala
@@ -164,7 +164,7 @@ object RPCClientGenerator extends HttpClientGenerator {
             m.httpMethod match {
               case HttpMethod.GET =>
                 s"""def ${m.name}(${inputArgs.mkString(", ")}): ${returnType} = {
-                   |  client.readAs[${m.returnType.fullTypeName}](Http.GET(s"${m.path}"))
+                   |  client.readAs[${returnElementType}](Http.GET(s"${m.path}"))
                    |}""".stripMargin
               case _ =>
                 val args = Seq.newBuilder[String]