Merge pull request #32015 from ozangunalp/fix_reactive_messaging_inco…

…mings Support repeatable Incomings annotation for reactive messaging
quarkusio · Mar 22, 2023 · 7d7bc87 · 7d7bc87
2 parents e34625b + ab62972
commit 7d7bc87
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 4 deletions.
diff --git a/...va/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java b/...va/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java
@@ -210,6 +210,13 @@ List<AnnotationInstance> findAnnotationsOnMethods(DotName annotation) {
                 .collect(Collectors.toList());
     }
 
+    List<AnnotationInstance> findRepeatableAnnotationsOnMethods(DotName annotation) {
+        return index.getAnnotationsWithRepeatable(annotation, index)
+                .stream()
+                .filter(it -> it.target().kind() == AnnotationTarget.Kind.METHOD)
+                .collect(Collectors.toList());
+    }
+
     List<AnnotationInstance> findAnnotationsOnInjectionPoints(DotName annotation) {
         return index.getAnnotations(annotation)
                 .stream()

diff --git a/.../smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java b/.../smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java
@@ -161,7 +161,7 @@ public void defaultChannelConfiguration(
 
         if (launchMode.getLaunchMode().isDevOrTest()) {
             if (!runtimeConfig.enableGracefulShutdownInDevAndTestMode) {
-                List<AnnotationInstance> incomings = discoveryState.findAnnotationsOnMethods(DotNames.INCOMING);
+                List<AnnotationInstance> incomings = discoveryState.findRepeatableAnnotationsOnMethods(DotNames.INCOMING);
                 List<AnnotationInstance> channels = discoveryState.findAnnotationsOnInjectionPoints(DotNames.CHANNEL);
                 List<AnnotationInstance> annotations = new ArrayList<>();
                 annotations.addAll(incomings);
@@ -188,7 +188,7 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery,
             BuildProducer<ReflectiveClassBuildItem> reflection) {
         Map<String, String> alreadyGeneratedSerializers = new HashMap<>();
         Map<String, String> alreadyGeneratedDeserializers = new HashMap<>();
-        for (AnnotationInstance annotation : discovery.findAnnotationsOnMethods(DotNames.INCOMING)) {
+        for (AnnotationInstance annotation : discovery.findRepeatableAnnotationsOnMethods(DotNames.INCOMING)) {
             String channelName = annotation.value().asString();
             if (!discovery.isKafkaConnector(channelsManagedByConnectors, true, channelName)) {
                 continue;

diff --git a/...t/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java b/...t/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -63,7 +64,9 @@ private static void doTest(Tuple[] expectations, Class<?>... classesToIndex) {
     private static void doTest(Config customConfig, Tuple[] expectations, Class<?>... classesToIndex) {
         List<RunTimeConfigurationDefaultBuildItem> configs = new ArrayList<>();
 
-        DefaultSerdeDiscoveryState discovery = new DefaultSerdeDiscoveryState(index(classesToIndex)) {
+        List<Class<?>> classes = new ArrayList<>(Arrays.asList(classesToIndex));
+        classes.add(Incoming.class);
+        DefaultSerdeDiscoveryState discovery = new DefaultSerdeDiscoveryState(index(classes)) {
             @Override
             Config getConfig() {
                 return customConfig != null ? customConfig : super.getConfig();
@@ -89,7 +92,7 @@ boolean isKafkaConnector(List<ConnectorManagedChannelBuildItem> list, boolean in
         }
     }
 
-    private static IndexView index(Class<?>... classes) {
+    private static IndexView index(List<Class<?>> classes) {
         Indexer indexer = new Indexer();
         for (Class<?> clazz : classes) {
             try {
@@ -2696,4 +2699,33 @@ private static class TransactionalProducer {
 
     }
 
+    @Test
+    void repeatableIncomings() {
+        Tuple[] expectations = {
+                tuple("mp.messaging.incoming.channel1.value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer"),
+                tuple("mp.messaging.incoming.channel2.value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer"),
+                tuple("mp.messaging.incoming.channel3.value.deserializer", "io.quarkus.kafka.client.serialization.JsonObjectDeserializer"),
+                tuple("mp.messaging.incoming.channel4.value.deserializer", "io.quarkus.kafka.client.serialization.JsonObjectDeserializer"),
+        };
+        doTest(expectations, RepeatableIncomingsChannels.class);
+    }
+
+
+    private static class RepeatableIncomingsChannels {
+
+        @Incoming("channel1")
+        @Incoming("channel2")
+        void method1(String msg) {
+
+        }
+
+        @Incoming("channel3")
+        @Incoming("channel4")
+        void method2(JsonObject msg) {
+
+        }
+
+    }
+
+
 }
diff --git a/.../io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java b/.../io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java
@@ -142,6 +142,9 @@ public List<UnremovableBeanBuildItem> removalExclusions() {
                 new UnremovableBeanBuildItem(
                         new BeanClassAnnotationExclusion(
                                 ReactiveMessagingDotNames.INCOMING)),
+                new UnremovableBeanBuildItem(
+                        new BeanClassAnnotationExclusion(
+                                ReactiveMessagingDotNames.INCOMINGS)),
                 new UnremovableBeanBuildItem(
                         new BeanClassAnnotationExclusion(
                                 ReactiveMessagingDotNames.OUTGOING)));

diff --git a/.../reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaRepeatableReceivers.java b/.../reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaRepeatableReceivers.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.kafka;
+
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+@ApplicationScoped
+public class KafkaRepeatableReceivers {
+
+    private final List<Double> prices = new CopyOnWriteArrayList<>();
+
+    @Incoming("prices-in")
+    @Incoming("prices-in2")
+    public CompletionStage<Void> consume(Message<Double> msg) {
+        prices.add(msg.getPayload());
+        return msg.ack();
+    }
+
+    public List<Double> getPrices() {
+        return prices;
+    }
+
+}
diff --git a/...tion-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PricesProducer.java b/...tion-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PricesProducer.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.kafka;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+
+import io.smallrye.mutiny.Multi;
+
+@ApplicationScoped
+public class PricesProducer {
+
+    @Outgoing("prices-out")
+    public Multi<Double> generatePrices() {
+        return Multi.createFrom().items(1.2, 2.2, 3.4);
+    }
+
+    @Outgoing("prices-out2")
+    public Multi<Double> generatePrices2() {
+        return Multi.createFrom().items(4.5, 5.6, 6.7);
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/main/resources/application.properties b/integration-tests/reactive-messaging-kafka/src/main/resources/application.properties
@@ -25,3 +25,9 @@ mp.messaging.outgoing.pets-out.topic=pets
 mp.messaging.incoming.pets-in.topic=pets
 
 quarkus.redis.my-redis.hosts=${quarkus.redis.hosts}
+
+mp.messaging.outgoing.prices-out.topic=prices
+mp.messaging.outgoing.prices-out2.topic=prices2
+
+mp.messaging.incoming.prices-in.topic=prices
+mp.messaging.incoming.prices-in2.topic=prices2
diff --git a/...-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java b/...-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java
@@ -8,7 +8,9 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.arc.Arc;
 import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.DisabledOnIntegrationTest;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kafka.KafkaCompanionResource;
 import io.restassured.common.mapper.TypeRef;
@@ -48,4 +50,11 @@ public void testFruits() {
         await().untilAsserted(() -> Assertions.assertEquals(get("/kafka/fruits").as(TYPE_REF).size(), 4));
     }
 
+    @Test
+    @DisabledOnIntegrationTest
+    public void testPrices() {
+        KafkaRepeatableReceivers repeatableReceivers = Arc.container().instance(KafkaRepeatableReceivers.class).get();
+        await().untilAsserted(() -> Assertions.assertEquals(repeatableReceivers.getPrices().size(), 6));
+    }
+
 }