Merge pull request quarkusio#45736 from alesj/grpc_item_dups1

Squash GrpcClientBuildItem's ClientInfo set per clientName
holly-cummins · Jan 21, 2025 · f59ea88 · f59ea88
2 parents e707431 + 33c3015
commit f59ea88
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
@@ -218,24 +218,33 @@ void discoverInjectedClients(BeanDiscoveryFinishedBuildItem beanDiscovery,
     public void generateGrpcClientProducers(List<GrpcClientBuildItem> clients,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeans) {
 
+        // squash all GrpcClientBuildItem's ClientInfo(s) per clientName
+        // so any extension could add own GrpcClientBuildItem(s) as well
+        Map<String, Set<ClientInfo>> clientsMap = new HashMap<>();
         for (GrpcClientBuildItem client : clients) {
-            for (ClientInfo clientInfo : client.getClients()) {
+            Set<ClientInfo> infos = clientsMap.computeIfAbsent(client.getClientName(), cn -> new HashSet<>());
+            infos.addAll(client.getClients());
+        }
+
+        for (Map.Entry<String, Set<ClientInfo>> entry : clientsMap.entrySet()) {
+            String clientName = entry.getKey();
+            for (ClientInfo clientInfo : entry.getValue()) {
                 if (clientInfo.type == ClientType.CHANNEL) {
                     // channel
 
                     // IMPORTANT: the channel producer relies on the io.quarkus.grpc.runtime.supports.GrpcClientConfigProvider
                     // bean that provides the GrpcClientConfiguration for the specific service.
 
                     ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem.configure(GrpcDotNames.CHANNEL)
-                            .addQualifier().annotation(GrpcDotNames.GRPC_CLIENT).addValue("value", client.getClientName())
+                            .addQualifier().annotation(GrpcDotNames.GRPC_CLIENT).addValue("value", clientName)
                             .done()
                             .scope(Singleton.class)
                             .unremovable()
                             .forceApplicationClass()
                             .creator(new Consumer<>() {
                                 @Override
                                 public void accept(MethodCreator mc) {
-                                    GrpcClientProcessor.this.generateChannelProducer(mc, client.getClientName(), clientInfo);
+                                    GrpcClientProcessor.this.generateChannelProducer(mc, clientName, clientInfo);
                                 }
                             })
                             .destroyer(Channels.ChannelDestroyer.class);
@@ -250,7 +259,6 @@ public void accept(MethodCreator mc) {
                     syntheticBeans.produce(configurator.done());
                 } else {
                     // blocking stub, mutiny stub, mutiny client
-                    String clientName = client.getClientName();
                     ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem.configure(clientInfo.className)
                             .addQualifier().annotation(GrpcDotNames.GRPC_CLIENT).addValue("value", clientName).done()
                             // Only the mutiny client can use the Application scope, the others are "final" and so need Singleton.