Merge 4235861 into 244d4d9

smallrye · Aug 24, 2023 · 257b6d2 · 257b6d2
2 parents 244d4d9 + 4235861
commit 257b6d2
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 20 deletions.
diff --git a/...active/messaging/json/JacksonMapping.java → ...essaging/json/jackson/JacksonMapping.java b/...active/messaging/json/JacksonMapping.java → ...essaging/json/jackson/JacksonMapping.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.smallrye.reactive.messaging.json.JsonMapping;
+
 @ApplicationScoped
 @Priority(value = JsonMapping.DEFAULT_PRIORITY)
 public class JacksonMapping implements JsonMapping {

diff --git a/...ve/messaging/json/JacksonMappingTest.java → ...ging/json/jackson/JacksonMappingTest.java b/...ve/messaging/json/JacksonMappingTest.java → ...ging/json/jackson/JacksonMappingTest.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...tive/messaging/json/JmsConnectorTest.java → ...saging/json/jackson/JmsConnectorTest.java b/...tive/messaging/json/JmsConnectorTest.java → ...saging/json/jackson/JmsConnectorTest.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;

diff --git a/.../messaging/json/ObjectMapperProvider.java → ...ng/json/jackson/ObjectMapperProvider.java b/.../messaging/json/ObjectMapperProvider.java → ...ng/json/jackson/ObjectMapperProvider.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;

diff --git a/...llrye/reactive/messaging/json/Person.java → ...active/messaging/json/jackson/Person.java b/...llrye/reactive/messaging/json/Person.java → ...active/messaging/json/jackson/Person.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 public class Person {
 

diff --git a/...ve/messaging/json/PersonConsumerBean.java → ...ging/json/jackson/PersonConsumerBean.java b/...ve/messaging/json/PersonConsumerBean.java → ...ging/json/jackson/PersonConsumerBean.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ve/messaging/json/PersonProducerBean.java → ...ging/json/jackson/PersonProducerBean.java b/...ve/messaging/json/PersonProducerBean.java → ...ging/json/jackson/PersonProducerBean.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import jakarta.enterprise.context.ApplicationScoped;
 

diff --git a/...e/reactive/messaging/json/TestObject.java → ...ve/messaging/json/jackson/TestObject.java b/...e/reactive/messaging/json/TestObject.java → ...ve/messaging/json/jackson/TestObject.java
@@ -1,7 +1,9 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jackson;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import io.smallrye.reactive.messaging.json.JsonMapping;
+
 /**
  * Test object to use in {@link JsonMapping} implementation.
  */

diff --git a/...e-messaging-jackson/src/test/java/io/smallrye/reactive/messaging/support/JmsTestBase.java b/...e-messaging-jackson/src/test/java/io/smallrye/reactive/messaging/support/JmsTestBase.java
@@ -9,8 +9,8 @@
 import io.smallrye.config.SmallRyeConfigProviderResolver;
 import io.smallrye.config.inject.ConfigExtension;
 import io.smallrye.reactive.messaging.jms.JmsConnector;
-import io.smallrye.reactive.messaging.json.JacksonMapping;
-import io.smallrye.reactive.messaging.json.ObjectMapperProvider;
+import io.smallrye.reactive.messaging.json.jackson.JacksonMapping;
+import io.smallrye.reactive.messaging.json.jackson.ObjectMapperProvider;
 import io.smallrye.reactive.messaging.providers.MediatorFactory;
 import io.smallrye.reactive.messaging.providers.connectors.ExecutionHolder;
 import io.smallrye.reactive.messaging.providers.connectors.WorkerPoolRegistry;

diff --git a/...reactive/messaging/json/JsonBMapping.java → ...ve/messaging/json/jsonb/JsonBMapping.java b/...reactive/messaging/json/JsonBMapping.java → ...ve/messaging/json/jsonb/JsonBMapping.java
@@ -1,10 +1,12 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.json.bind.Jsonb;
 
+import io.smallrye.reactive.messaging.json.JsonMapping;
+
 @ApplicationScoped
 @Priority(value = JsonMapping.DEFAULT_PRIORITY + 1)
 public class JsonBMapping implements JsonMapping {

diff --git a/...tive/messaging/json/JmsConnectorTest.java → ...essaging/json/jsonb/JmsConnectorTest.java b/...tive/messaging/json/JmsConnectorTest.java → ...essaging/json/jsonb/JmsConnectorTest.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;

diff --git a/...tive/messaging/json/JsonBMappingTest.java → ...essaging/json/jsonb/JsonBMappingTest.java b/...tive/messaging/json/JsonBMappingTest.java → ...essaging/json/jsonb/JsonBMappingTest.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...eactive/messaging/json/JsonBProvider.java → ...e/messaging/json/jsonb/JsonBProvider.java b/...eactive/messaging/json/JsonBProvider.java → ...e/messaging/json/jsonb/JsonBProvider.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;

diff --git a/...llrye/reactive/messaging/json/Person.java → ...reactive/messaging/json/jsonb/Person.java b/...llrye/reactive/messaging/json/Person.java → ...reactive/messaging/json/jsonb/Person.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 public class Person {
 

diff --git a/...ve/messaging/json/PersonConsumerBean.java → ...saging/json/jsonb/PersonConsumerBean.java b/...ve/messaging/json/PersonConsumerBean.java → ...saging/json/jsonb/PersonConsumerBean.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ve/messaging/json/PersonProducerBean.java → ...saging/json/jsonb/PersonProducerBean.java b/...ve/messaging/json/PersonProducerBean.java → ...saging/json/jsonb/PersonProducerBean.java
@@ -1,4 +1,4 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import jakarta.enterprise.context.ApplicationScoped;
 

diff --git a/...e/reactive/messaging/json/TestObject.java → ...tive/messaging/json/jsonb/TestObject.java b/...e/reactive/messaging/json/TestObject.java → ...tive/messaging/json/jsonb/TestObject.java
@@ -1,7 +1,9 @@
-package io.smallrye.reactive.messaging.json;
+package io.smallrye.reactive.messaging.json.jsonb;
 
 import jakarta.json.bind.annotation.JsonbProperty;
 
+import io.smallrye.reactive.messaging.json.JsonMapping;
+
 /**
  * Test object to use in {@link JsonMapping} implementation.
  */

diff --git a/...ive-messaging-jsonb/src/test/java/io/smallrye/reactive/messaging/support/JmsTestBase.java b/...ive-messaging-jsonb/src/test/java/io/smallrye/reactive/messaging/support/JmsTestBase.java
@@ -9,8 +9,8 @@
 import io.smallrye.config.SmallRyeConfigProviderResolver;
 import io.smallrye.config.inject.ConfigExtension;
 import io.smallrye.reactive.messaging.jms.JmsConnector;
-import io.smallrye.reactive.messaging.json.JsonBMapping;
-import io.smallrye.reactive.messaging.json.JsonBProvider;
+import io.smallrye.reactive.messaging.json.jsonb.JsonBMapping;
+import io.smallrye.reactive.messaging.json.jsonb.JsonBProvider;
 import io.smallrye.reactive.messaging.providers.MediatorFactory;
 import io.smallrye.reactive.messaging.providers.connectors.ExecutionHolder;
 import io.smallrye.reactive.messaging.providers.connectors.WorkerPoolRegistry;

diff --git a/...ng-mqtt/src/test/java/io/smallrye/reactive/messaging/mqtt/DynamicMqttTopicSourceTest.java b/...ng-mqtt/src/test/java/io/smallrye/reactive/messaging/mqtt/DynamicMqttTopicSourceTest.java
@@ -48,6 +48,10 @@ private void awaitAndVerify() {
                 .pollInterval(Duration.ofSeconds(1))
                 .until(() -> connector.getReadiness().isOk());
 
+        await()
+                .pollInterval(Duration.ofSeconds(1))
+                .until(() -> connector.getLiveness().isOk());
+
         bean.publish();
 
         await().until(() -> bean.messages().size() >= 3);
@@ -155,23 +159,36 @@ public void publish() {
             emitter.send(MqttMessage
                     .of("/app/hello/mqtt-" + LocalDate.now().toString() + "/greeting", "hello from dynamic topic 1",
                             MqttQoS.EXACTLY_ONCE));
+            nap(10);
             emitter.send(MqttMessage
                     .of("/app/hello/mqtt-" + LocalDate.now().toString() + "/greeting", "hello from dynamic topic 2",
                             MqttQoS.EXACTLY_ONCE));
+            nap(10);
             emitter.send(MqttMessage
                     .of("/app/hello/mqtt-" + LocalDate.now().toString() + "/greeting", "hello from dynamic topic 3",
                             MqttQoS.EXACTLY_ONCE));
+            nap(15);
             emitter.send(MqttMessage
                     .of("$/app/hello/mqtt-" + LocalDate.now().toString() + "/greeting", "hello from dynamic topic 4",
                             MqttQoS.EXACTLY_ONCE));
+            nap(10);
             emitter.send(MqttMessage
                     .of("$/app/hello/mqtt-" + LocalDate.now().toString() + "/greeting", "hello from dynamic topic 5",
                             MqttQoS.EXACTLY_ONCE));
+            nap(5);
             emitter.send(MqttMessage
                     .of("$/app/hello/mqtt-" + LocalDate.now().toString() + "/greeting", "hello from dynamic topic 6",
                             MqttQoS.EXACTLY_ONCE));
         }
 
+        private void nap(int duration) {
+            try {
+                Thread.sleep(duration);
+            } catch (Exception ignored) {
+                // ignored.
+            }
+        }
+
         @Incoming("in")
         public CompletionStage<Void> received(MqttMessage<byte[]> message) {
             messages.add(message);