chore: clean codes

hantsy · May 1, 2024 · 7208119 · 7208119
1 parent c711057
commit 7208119
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 24 deletions.
diff --git a/amqp-rabbitmq/src/main/java/com/example/MessageHandler.java b/amqp-rabbitmq/src/main/java/com/example/MessageHandler.java
@@ -23,7 +23,7 @@ public void send(String message) {
     }
 
     @Incoming("messages")
-    @Outgoing("data-stream")
+    @Outgoing("messages-stream")
     @Broadcast
     Message receive(String message) {
         log.info("received: {}", message);

diff --git a/amqp-rabbitmq/src/main/java/com/example/MessageResource.java b/amqp-rabbitmq/src/main/java/com/example/MessageResource.java
@@ -17,7 +17,7 @@ public class MessageResource {
     MessageHandler handler;
 
     @Inject
-    @Channel("data-stream")
+    @Channel("messages-stream")
     // Publisher<Message> stream;
     // see: https://github.com/quarkusio/quarkus/issues/35219
     Flow.Publisher<Message> stream;

diff --git a/amqp-rabbitmq/src/test/java/com/example/InMemoryProfile.java b/amqp-rabbitmq/src/test/java/com/example/InMemoryProfile.java
@@ -14,7 +14,7 @@ public Map<String, String> getConfigOverrides() {
                 "quarkus.amqp.devservices.enabled", "false",
                 "mp.messaging.outgoing.send.connector","smallrye-in-memory",
                 "mp.messaging.incoming.messages.connector","smallrye-in-memory",
-                "mp.messaging.outgoing.data-stream.connector","smallrye-in-memory"
+                "mp.messaging.outgoing.messages-stream.connector","smallrye-in-memory"
         );
     }
 

diff --git a/amqp-rabbitmq/src/test/java/com/example/MessageHandlerTest.java b/amqp-rabbitmq/src/test/java/com/example/MessageHandlerTest.java
@@ -34,7 +34,7 @@ void setUp() {
     void receive() {
         InMemorySource<String> messages = connector.source("messages");
         InMemorySink<String> sink = connector.sink("send");
-        InMemorySink<Message> dataStream = connector.sink("data-stream");
+        InMemorySink<Message> dataStream = connector.sink("messages-stream");
 
         handler.send("hello");
         await().atMost(Duration.ofMillis(1000)).untilAsserted(() ->

diff --git a/amqp/src/main/java/com/example/MessageHandler.java b/amqp/src/main/java/com/example/MessageHandler.java
@@ -23,7 +23,7 @@ public void send(String message) {
     }
 
     @Incoming("messages")
-    @Outgoing("data-stream")
+    @Outgoing("messages-stream")
     @Broadcast
     Message receive(String message) {
         log.info("received: {}", message);

diff --git a/amqp/src/main/java/com/example/MessageResource.java b/amqp/src/main/java/com/example/MessageResource.java
@@ -19,7 +19,7 @@ public class MessageResource {
     MessageHandler handler;
 
     @Inject
-    @Channel("data-stream")
+    @Channel("messages-stream")
     // Publisher<Message> stream;
     // see: https://github.com/quarkusio/quarkus/issues/35219
     Flow.Publisher<Message> stream;

diff --git a/amqp/src/test/java/com/example/InMemoryProfile.java b/amqp/src/test/java/com/example/InMemoryProfile.java
@@ -14,7 +14,7 @@ public Map<String, String> getConfigOverrides() {
                 "quarkus.amqp.devservices.enabled", "false",
                 "mp.messaging.outgoing.send.connector", "smallrye-in-memory",
                 "mp.messaging.incoming.messages.connector", "smallrye-in-memory",
-                "mp.messaging.outgoing.data-stream.connector", "smallrye-in-memory"
+                "mp.messaging.outgoing.messages-stream.connector", "smallrye-in-memory"
         );
     }
 

diff --git a/amqp/src/test/java/com/example/MessageHandlerTest.java b/amqp/src/test/java/com/example/MessageHandlerTest.java
@@ -34,7 +34,7 @@ void setUp() {
     void receive() {
         InMemorySource<String> messages = connector.source("messages");
         InMemorySink<String> sink = connector.sink("send");
-        InMemorySink<Message> dataStream = connector.sink("data-stream");
+        InMemorySink<Message> dataStream = connector.sink("messages-stream");
 
         handler.send("hello");
         await().atMost(Duration.ofMillis(1000)).untilAsserted(() ->

diff --git a/kafka/src/main/java/com/example/MessageHandler.java b/kafka/src/main/java/com/example/MessageHandler.java
@@ -23,7 +23,7 @@ public void send(String message) {
     }
 
     @Incoming("messages")
-    @Outgoing("data-result")
+    @Outgoing("messages-stream")
     @Broadcast
     Message receive(String message) {
         log.info("received: {}", message);

diff --git a/kafka/src/main/java/com/example/MessageResource.java b/kafka/src/main/java/com/example/MessageResource.java
@@ -15,7 +15,7 @@ public class MessageResource {
     @Inject
     MessageHandler handler;
     @Inject
-    @Channel("data-stream")
+    @Channel("messages-stream")
     // Publisher<Message> stream;
     // see: https://github.com/quarkusio/quarkus/issues/35219
     Flow.Publisher<Message> stream;

diff --git a/kafka/src/test/java/com/example/InMemoryProfile.java b/kafka/src/test/java/com/example/InMemoryProfile.java
@@ -12,9 +12,11 @@ public InMemoryProfile() {
     public Map<String, String> getConfigOverrides() {
         return Map.of(
                 "quarkus.kafka.devservices.enabled", "false",
-                "mp.messaging.outgoing.send.connector","smallrye-in-memory",
-                "mp.messaging.incoming.messages.connector","smallrye-in-memory",
-                "mp.messaging.outgoing.data-result.connector","smallrye-in-memory"
+                // see: https://github.com/quarkusio/quarkus/issues/40317#issuecomment-2082911239
+                "quarkus.messaging.kafka.serializer-autodetection.enabled", "false",
+                "mp.messaging.outgoing.send.connector", "smallrye-in-memory",
+                "mp.messaging.incoming.messages.connector", "smallrye-in-memory",
+                "mp.messaging.outgoing.messages-stream.connector", "smallrye-in-memory"
         );
     }
 

diff --git a/kafka/src/test/java/com/example/MessageHandlerTest.java b/kafka/src/test/java/com/example/MessageHandlerTest.java
@@ -34,7 +34,7 @@ void setUp() {
     void receive() {
         InMemorySource<String> messages = connector.source("messages");
         InMemorySink<String> sink = connector.sink("send");
-        InMemorySink<Message> dataStream = connector.sink("data-result");
+        InMemorySink<Message> dataStream = connector.sink("messages-stream");
 
         handler.send("hello");
         await().atMost(Duration.ofMillis(1000)).untilAsserted(() ->

diff --git a/kafka/src/test/java/com/example/MessageResourceTest.java b/kafka/src/test/java/com/example/MessageResourceTest.java
@@ -75,6 +75,6 @@ void testSendAndReceiveMessages() {
         }
 
         assertThat(messageReplay.size()).isEqualTo(1);
-        assertThat(messageReplay.get(0).body()).isEqualTo("hello");
+        assertThat(messageReplay.getFirst().body()).isEqualTo("hello");
     }
 }
diff --git a/pulsar/src/main/java/com/example/MessageHandler.java b/pulsar/src/main/java/com/example/MessageHandler.java
@@ -23,7 +23,7 @@ public void send(String message) {
     }
 
     @Incoming("messages")
-    @Outgoing("data-result")
+    @Outgoing("messages-stream")
     @Broadcast
     Message receive(String message) {
         log.info("received: {}", message);

diff --git a/pulsar/src/main/java/com/example/MessageResource.java b/pulsar/src/main/java/com/example/MessageResource.java
@@ -19,7 +19,7 @@ public class MessageResource {
     MessageHandler handler;
 
     @Inject
-    @Channel("data-stream")
+    @Channel("messages-stream")
     // Publisher<Message> stream;
     // see: https://github.com/quarkusio/quarkus/issues/35219
     Flow.Publisher<Message> stream;

diff --git a/pulsar/src/test/java/com/example/InMemoryProfile.java b/pulsar/src/test/java/com/example/InMemoryProfile.java
@@ -12,9 +12,10 @@ public InMemoryProfile() {
     public Map<String, String> getConfigOverrides() {
         return Map.of(
                 "quarkus.pulsar.devservices.enabled", "false",
+                "quarkus.messaging.pulsar.schema-autodetection.enabled","false",
                 "mp.messaging.outgoing.send.connector","smallrye-in-memory",
                 "mp.messaging.incoming.messages.connector","smallrye-in-memory",
-                "mp.messaging.outgoing.data-result.connector","smallrye-in-memory"
+                "mp.messaging.outgoing.messages-stream.connector","smallrye-in-memory"
 //                "pulsar.client.serviceUrl", "",
 //                "pulsar.admin.serviceUrl", ""
         );

diff --git a/pulsar/src/test/java/com/example/MessageHandlerTest.java b/pulsar/src/test/java/com/example/MessageHandlerTest.java
@@ -46,7 +46,7 @@ void setUp() {
     void receive() {
         InMemorySource<String> messages = connector.source("messages");
         InMemorySink<String> sink = connector.sink("send");
-        InMemorySink<Message> dataStream = connector.sink("data-result");
+        InMemorySink<Message> dataStream = connector.sink("messages-stream");
 
         handler.send("hello");
         await().atMost(Duration.ofMillis(1000)).untilAsserted(() ->

diff --git a/pulsar/src/test/java/com/example/MessageResourceTest.java b/pulsar/src/test/java/com/example/MessageResourceTest.java
@@ -75,6 +75,6 @@ void testSendAndReceiveMessages() {
         }
 
         assertThat(messageReplay.size()).isEqualTo(1);
-        assertThat(messageReplay.get(0).body()).isEqualTo("hello");
+        assertThat(messageReplay.getFirst().body()).isEqualTo("hello");
     }
 }
diff --git a/rabbitmq/src/main/java/com/example/MessageHandler.java b/rabbitmq/src/main/java/com/example/MessageHandler.java
@@ -23,7 +23,7 @@ public void send(String message) {
     }
 
     @Incoming("messages")
-    @Outgoing("data-stream")
+    @Outgoing("messages-stream")
     @Broadcast
     Message receive(String message) {
         log.info("received: {}", message);

diff --git a/rabbitmq/src/main/java/com/example/MessageResource.java b/rabbitmq/src/main/java/com/example/MessageResource.java
@@ -18,7 +18,7 @@ public class MessageResource {
     MessageHandler handler;
 
     @Inject
-    @Channel("data-stream")
+    @Channel("messages-stream")
     Flow.Publisher<Message> stream;
 
     @POST

diff --git a/rabbitmq/src/test/java/com/example/InMemoryProfile.java b/rabbitmq/src/test/java/com/example/InMemoryProfile.java
@@ -14,7 +14,7 @@ public Map<String, String> getConfigOverrides() {
                 "quarkus.rabbitmq.devservices.enabled", "false",
                 "mp.messaging.outgoing.send.connector", "smallrye-in-memory",
                 "mp.messaging.incoming.messages.connector", "smallrye-in-memory",
-                "mp.messaging.outgoing.data-stream.connector", "smallrye-in-memory"
+                "mp.messaging.outgoing.messages-stream.connector", "smallrye-in-memory"
         );
     }
 

diff --git a/rabbitmq/src/test/java/com/example/MessageHandlerTest.java b/rabbitmq/src/test/java/com/example/MessageHandlerTest.java
@@ -34,7 +34,7 @@ void setUp() {
     void receive() {
         InMemorySource<String> messages = connector.source("messages");
         InMemorySink<String> sink = connector.sink("send");
-        InMemorySink<Message> dataStream = connector.sink("data-stream");
+        InMemorySink<Message> dataStream = connector.sink("messages-stream");
 
         handler.send("hello");
         await().atMost(Duration.ofMillis(1000)).untilAsserted(() ->