Move the acknowledgment class

The Acknowledgement class is now part of the spec.
lamtrhieu · Feb 23, 2019 · 0e75e5e · 0e75e5e
1 parent 93c32f8
commit 0e75e5e
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 109 deletions.
diff --git a/doc/acknowledgment.adoc b/doc/acknowledgment.adoc
@@ -1,7 +1,7 @@
 == Acknowledgement
 
 Messages may require acknowledgment to inform the transport layer that the message has been processed. Methods
-annotated with `@Incoming` and also be annotated with `io.smallrye.reactive.messaging.annotations.Acknowledgment` to
+annotated with `@Incoming` and also be annotated with `org.eclipse.microprofile.reactive.messaging.Acknowledgment` to
 configure the acknowledgement policies.
 
 Four policies are supported:

diff --git a/examples/snippets/src/main/java/io/smallrye/reactive/messaging/snippets/Ack.java b/examples/snippets/src/main/java/io/smallrye/reactive/messaging/snippets/Ack.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging.snippets;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...ive-messaging-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/ConsumptionBean.java b/...ive-messaging-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/ConsumptionBean.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging.amqp;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;

diff --git a/...ctive-messaging-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/ProducingBean.java b/...ctive-messaging-amqp/src/test/java/io/smallrye/reactive/messaging/amqp/ProducingBean.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.amqp;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;

diff --git a/...e-messaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/ConsumptionBean.java b/...e-messaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/ConsumptionBean.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging.kafka;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.apache.kafka.common.serialization.IntegerDeserializer;
 import org.apache.kafka.common.serialization.IntegerSerializer;
 import org.apache.kafka.common.serialization.StringDeserializer;

diff --git a/...ive-messaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/ProducingBean.java b/...ive-messaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/ProducingBean.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.kafka;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.apache.kafka.common.serialization.IntegerDeserializer;
 import org.apache.kafka.common.serialization.IntegerSerializer;
 import org.apache.kafka.common.serialization.StringDeserializer;

diff --git a/...g-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/ProducingKafkaMessageBean.java b/...g-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/ProducingKafkaMessageBean.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.kafka;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.apache.kafka.common.serialization.IntegerDeserializer;
 import org.apache.kafka.common.serialization.IntegerSerializer;
 import org.apache.kafka.common.serialization.StringDeserializer;

diff --git a/...ctive-messaging-mqtt/src/test/java/io/smallrye/reactive/messaging/mqtt/ProducingBean.java b/...ctive-messaging-mqtt/src/test/java/io/smallrye/reactive/messaging/mqtt/ProducingBean.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.mqtt;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;

diff --git a/...ive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/AbstractMediator.java b/...ive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/AbstractMediator.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;

diff --git a/...essaging-provider/src/main/java/io/smallrye/reactive/messaging/MediatorConfiguration.java b/...essaging-provider/src/main/java/io/smallrye/reactive/messaging/MediatorConfiguration.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import io.smallrye.reactive.messaging.annotations.Broadcast;
 import io.smallrye.reactive.messaging.annotations.Merge;
 import org.apache.commons.lang3.ClassUtils;

diff --git a/...ing-provider/src/main/java/io/smallrye/reactive/messaging/annotations/Acknowledgment.java b/...ing-provider/src/main/java/io/smallrye/reactive/messaging/annotations/Acknowledgment.java
diff --git a/...-provider/src/test/java/io/smallrye/reactive/messaging/ack/BeanWithMessageProcessors.java b/...-provider/src/test/java/io/smallrye/reactive/messaging/ack/BeanWithMessageProcessors.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...-provider/src/test/java/io/smallrye/reactive/messaging/ack/BeanWithPayloadProcessors.java b/...-provider/src/test/java/io/smallrye/reactive/messaging/ack/BeanWithPayloadProcessors.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/.../test/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsManipulatingMessages.java b/.../test/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsManipulatingMessages.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import io.smallrye.reactive.messaging.annotations.Merge;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;

diff --git a/.../test/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsManipulatingPayloads.java b/.../test/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsManipulatingPayloads.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...st/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsProducingMessageStreams.java b/...st/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsProducingMessageStreams.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...st/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsProducingPayloadStreams.java b/...st/java/io/smallrye/reactive/messaging/ack/BeanWithProcessorsProducingPayloadStreams.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...provider/src/test/java/io/smallrye/reactive/messaging/ack/BeanWithStreamTransformers.java b/...provider/src/test/java/io/smallrye/reactive/messaging/ack/BeanWithStreamTransformers.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.ack;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...io/smallrye/reactive/messaging/ack/SubscriberBeanWithMethodsReturningCompletionStage.java b/...io/smallrye/reactive/messaging/ack/SubscriberBeanWithMethodsReturningCompletionStage.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging.ack;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...ava/io/smallrye/reactive/messaging/ack/SubscriberBeanWithMethodsReturningSubscribers.java b/...ava/io/smallrye/reactive/messaging/ack/SubscriberBeanWithMethodsReturningSubscribers.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging.ack;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/.../test/java/io/smallrye/reactive/messaging/ack/SubscriberBeanWithMethodsReturningVoid.java b/.../test/java/io/smallrye/reactive/messaging/ack/SubscriberBeanWithMethodsReturningVoid.java
@@ -1,6 +1,6 @@
 package io.smallrye.reactive.messaging.ack;
 
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;

diff --git a/...g-vertx-eventbus/src/test/java/io/smallrye/reactive/messaging/eventbus/ProducingBean.java b/...g-vertx-eventbus/src/test/java/io/smallrye/reactive/messaging/eventbus/ProducingBean.java
@@ -1,7 +1,7 @@
 package io.smallrye.reactive.messaging.eventbus;
 
 import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import io.vertx.reactivex.core.Vertx;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.reactive.messaging.Incoming;