Merge pull request #9 from armanbilge/fix/method-name

Use correct `methodName` in generated code
http4s · Mar 10, 2023 · 235e6ff · 235e6ff
2 parents 3f0250e + b30fcc5
commit 235e6ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/codegen/generator/src/main/scala/org/http4s/grpc/generator/Http4sGrpcServicePrinter.scala b/codegen/generator/src/main/scala/org/http4s/grpc/generator/Http4sGrpcServicePrinter.scala
@@ -59,7 +59,7 @@ class Http4sGrpcServicePrinter(service: ServiceDescriptor, di: DescriptorImplici
     val encode = s"$Codec.codecForGenerated(_root_.${method.inputType.scalaType})"
     val decode = s"$Codec.codecForGenerated(_root_.${method.outputType.scalaType})"
     val serviceName = method.getService.getFullName
-    val methodName = method.name
+    val methodName = method.getName
     s"""$ClientGrpc.${handleMethod(method)}($encode, $decode, "$serviceName", "$methodName")(client, baseUri)(request, ctx)"""
   }
 
@@ -78,9 +78,9 @@ class Http4sGrpcServicePrinter(service: ServiceDescriptor, di: DescriptorImplici
     val decode = s"$Codec.codecForGenerated(${method.inputType.scalaType})"
     val encode = s"$Codec.codecForGenerated(${method.outputType.scalaType})"
     val serviceName = method.getService.getFullName
-    val methodName = method.name
+    val methodName = method.getName
 
-    p.add(s""".combineK($ServerGrpc.${handleMethod(method)}($decode, $encode, "$serviceName", "$methodName")(serviceImpl.$methodName(_, _)))""")
+    p.add(s""".combineK($ServerGrpc.${handleMethod(method)}($decode, $encode, "$serviceName", "$methodName")(serviceImpl.${method.name}(_, _)))""")
   }
 
   private[this] def serviceMethods: PrinterEndo = _.seq(service.methods.map(serviceMethodSignature))

diff --git a/codegen/testing/src/main/protobuf/test_service.proto b/codegen/testing/src/main/protobuf/test_service.proto
@@ -9,4 +9,5 @@ service TestService {
   rpc clientStreaming (stream TestMessage) returns (TestMessage);
   rpc serverStreaming (TestMessage) returns (stream TestMessage);
   rpc bothStreaming (stream TestMessage) returns (stream TestMessage);
+  rpc Export (TestMessage) returns (TestMessage);
 }
diff --git a/codegen/testing/src/test/scala/hello/world/TestServiceSuite.scala b/codegen/testing/src/test/scala/hello/world/TestServiceSuite.scala
@@ -24,6 +24,8 @@ class TestServiceSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
 
     def bothStreaming(request: Stream[IO, TestMessage], ctx: Headers): Stream[IO, TestMessage] =
       request
+
+    def `export`(request: TestMessage, ctx: Headers): IO[TestMessage] = IO(request)
   }
 
   implicit val arbitraryTestMessage: Arbitrary[TestMessage] = Arbitrary(