Merge pull request #29339 from cescoffier/verify-fix-for-weird-grpc-m…

…ethod-names Verify the generation when using odd gRPC method names
quarkusio · Nov 18, 2022 · 3c17989 · 3c17989
2 parents d7fdd87 + bef0beb
commit 3c17989
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 0 deletions.
diff --git a/...sions/grpc/deployment/src/test/java/io/quarkus/grpc/client/BlockingStubInjectionTest.java b/...sions/grpc/deployment/src/test/java/io/quarkus/grpc/client/BlockingStubInjectionTest.java
@@ -36,6 +36,9 @@ public class BlockingStubInjectionTest {
     public void test() {
         String neo = service.invoke("neo");
         assertThat(neo).isEqualTo("Hello neo");
+
+        neo = service.invokeWeird("neo");
+        assertThat(neo).isEqualTo("Hello neo");
     }
 
     @ApplicationScoped
@@ -49,5 +52,10 @@ public String invoke(String s) {
                     .getMessage();
         }
 
+        public String invokeWeird(String s) {
+            return service.wEIRD(HelloRequest.newBuilder().setName(s).build())
+                    .getMessage();
+        }
+
     }
 }
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ChannelInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ChannelInjectionTest.java
@@ -37,6 +37,9 @@ public class ChannelInjectionTest {
     public void test() {
         String neo = service.invoke("neo-channel");
         assertThat(neo).isEqualTo("Hello neo-channel");
+
+        neo = service.invokeWeird("neo-weird");
+        assertThat(neo).isEqualTo("Hello neo-weird");
     }
 
     @ApplicationScoped
@@ -51,5 +54,11 @@ public String invoke(String s) {
                     .getMessage();
         }
 
+        public String invokeWeird(String s) {
+            return GreeterGrpc.newBlockingStub(channel)
+                    .wEIRD(HelloRequest.newBuilder().setName(s).build())
+                    .getMessage();
+        }
+
     }
 }
diff --git a/...rpc/deployment/src/test/java/io/quarkus/grpc/client/ClientWithoutConfigInjectionTest.java b/...rpc/deployment/src/test/java/io/quarkus/grpc/client/ClientWithoutConfigInjectionTest.java
@@ -41,12 +41,19 @@ public class ClientWithoutConfigInjectionTest {
     public void testHelloWithBlockingClient() {
         HelloReply reply = client.sayHello(HelloRequest.newBuilder().setName("neo").build());
         assertThat(reply.getMessage()).isEqualTo("Hello neo");
+
+        reply = client.wEIRD(HelloRequest.newBuilder().setName("neo").build());
+        assertThat(reply.getMessage()).isEqualTo("Hello neo");
     }
 
     @Test
     public void testHelloWithMutinyClient() {
         Uni<HelloReply> reply = mutinyClient
                 .sayHello(HelloRequest.newBuilder().setName("neo").build());
         assertThat(reply.await().atMost(TIMEOUT).getMessage()).isEqualTo("Hello neo");
+
+        reply = mutinyClient
+                .wEIRD(HelloRequest.newBuilder().setName("neo").build());
+        assertThat(reply.await().atMost(TIMEOUT).getMessage()).isEqualTo("Hello neo");
     }
 }
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/deadline/HelloService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/deadline/HelloService.java
@@ -17,4 +17,9 @@ public Uni<HelloReply> sayHello(HelloRequest request) {
                 .by(Duration.ofMillis(400));
     }
 
+    @Override
+    public Uni<HelloReply> wEIRD(HelloRequest request) {
+        return sayHello(request);
+    }
+
 }
diff --git a/...t/src/test/java/io/quarkus/grpc/server/interceptors/GlobalAndServiceInterceptorsTest.java b/...t/src/test/java/io/quarkus/grpc/server/interceptors/GlobalAndServiceInterceptorsTest.java
@@ -107,6 +107,11 @@ public static class ServiceA implements Greeter {
         public Uni<HelloReply> sayHello(HelloRequest request) {
             return Uni.createFrom().item(HelloReply.newBuilder().setMessage("Hello, " + request.getName()).build());
         }
+
+        @Override
+        public Uni<HelloReply> wEIRD(HelloRequest request) {
+            return sayHello(request);
+        }
     }
 
     @GrpcService
@@ -117,6 +122,11 @@ public static class ServiceB implements Greeter3 {
         public Uni<HelloReply3> sayHello(HelloRequest3 request) {
             return Uni.createFrom().item(HelloReply3.newBuilder().setMessage("Hello3, " + request.getName()).build());
         }
+
+        @Override
+        public Uni<HelloReply3> wEIRD(HelloRequest3 request) {
+            return sayHello(request);
+        }
     }
 
     @io.quarkus.grpc.GlobalInterceptor

diff --git a/...c/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MyInterceptedGreeting.java b/...c/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MyInterceptedGreeting.java
@@ -15,4 +15,10 @@ public Uni<HelloReply> sayHello(HelloRequest request) {
         return Uni.createFrom().item(() -> HelloReply.newBuilder()
                 .setMessage("hello " + MyFirstInterceptor.KEY_1.get() + " - " + MyFirstInterceptor.KEY_2.get()).build());
     }
+
+    @Override
+    @Blocking
+    public Uni<HelloReply> wEIRD(HelloRequest request) {
+        return sayHello(request);
+    }
 }
diff --git a/...ment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorProducerTest.java b/...ment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorProducerTest.java
@@ -77,6 +77,11 @@ public static class MyService implements Greeter {
         public Uni<HelloReply> sayHello(HelloRequest request) {
             return Uni.createFrom().item(HelloReply.newBuilder().setMessage("Hello, " + request.getName()).build());
         }
+
+        @Override
+        public Uni<HelloReply> wEIRD(HelloRequest request) {
+            return sayHello(request);
+        }
     }
 
     @Singleton

diff --git a/.../deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyHelloService.java b/.../deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyHelloService.java
@@ -18,4 +18,10 @@ public Uni<HelloReply> sayHello(HelloRequest request) {
                 .map(s -> Thread.currentThread().getName() + " " + s)
                 .map(s -> HelloReply.newBuilder().setMessage(s).build());
     }
+
+    @Override
+    @Blocking
+    public Uni<HelloReply> wEIRD(HelloRequest request) {
+        return sayHello(request);
+    }
 }
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/HelloService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/HelloService.java
@@ -14,4 +14,9 @@ public void sayHello(HelloRequest request, StreamObserver<HelloReply> responseOb
         responseObserver.onNext(HelloReply.newBuilder().setMessage("Hello " + request.getName()).build());
         responseObserver.onCompleted();
     }
+
+    @Override
+    public void wEIRD(HelloRequest request, StreamObserver<HelloReply> responseObserver) {
+        sayHello(request, responseObserver);
+    }
 }
diff --git a/...ons/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyHelloService.java b/...ons/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyHelloService.java
@@ -15,4 +15,9 @@ public Uni<HelloReply> sayHello(HelloRequest request) {
                 .map(s -> "Hello " + s)
                 .map(s -> HelloReply.newBuilder().setMessage(s).build());
     }
+
+    @Override
+    public Uni<HelloReply> wEIRD(HelloRequest request) {
+        return sayHello(request);
+    }
 }
diff --git a/extensions/grpc/deployment/src/test/proto/helloworld.proto b/extensions/grpc/deployment/src/test/proto/helloworld.proto
@@ -11,6 +11,8 @@ package helloworld;
 service Greeter {
     // Sends a greeting
     rpc SayHello (HelloRequest) returns (HelloReply) {}
+    rpc WEI_RD (HelloRequest) returns (HelloReply) {}
+
 }
 
 // The request message containing the user's name.

diff --git a/extensions/grpc/deployment/src/test/proto/helloworld3.proto b/extensions/grpc/deployment/src/test/proto/helloworld3.proto
@@ -11,6 +11,9 @@ package helloworld;
 service Greeter3 {
   // Sends a greeting
   rpc SayHello (HelloRequest3) returns (HelloReply3) {}
+
+  rpc WEI_RD (HelloRequest3) returns (HelloReply3) {}
+
 }
 
 // The request message containing the user's name.