Fixes #78 - Revamp API to use Sender and Receiver

api/src/main/java/com/manorrock/colibri/api/EventPublisher.java → api/src/main/java/com/manorrock/colibri/api/EventSender.java

@@ -32,13 +32,13 @@
 import java.util.Map;
 
 /**
- * An event publisher.
+ * An event sender.
  * 
  * @author Manfred Riem ([email protected])
  * @param <T> the event type.
  * @param <UT> the underlying event type.
  */
-public interface EventPublisher<T, UT> extends AutoCloseable {
+public interface EventSender<T, UT> extends AutoCloseable {
 
     /**
      * Get the delegate map.
@@ -48,11 +48,11 @@ public interface EventPublisher<T, UT> extends AutoCloseable {
     Map<String, Object> getDelegate();
 
     /**
-     * Publish a event.
+     * Send a event.
      * 
      * @param event the event.
      */
-    void publish(T event);
+    void send(T event);
 
     /**
      * To underlying event.

azure-eventbus/src/main/java/com/manorrock/colibri/azureservicebus/AzureServiceBusEventPublisher.java → azure-eventbus/src/main/java/com/manorrock/colibri/azureservicebus/AzureServiceBusEventSender.java

@@ -32,17 +32,17 @@
 import com.azure.messaging.servicebus.ServiceBusClientBuilder;
 import com.azure.messaging.servicebus.ServiceBusMessage;
 import com.azure.messaging.servicebus.ServiceBusSenderClient;
-import com.manorrock.colibri.api.EventPublisher;
+import com.manorrock.colibri.api.EventSender;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * The Azure Event Bus implementation of an EventPublisher.
+ * The Azure Event Bus implementation of an EventSender.
  *
  * @author Manfred Riem ([email protected])
  * @param <T> the type.
  */
-public class AzureServiceBusEventPublisher<T> implements EventPublisher<T, byte[]> {
+public class AzureServiceBusEventSender<T> implements EventSender<T, byte[]> {
 
     /**
      * Stores the client.
@@ -65,7 +65,7 @@ public class AzureServiceBusEventPublisher<T> implements EventPublisher<T, byte[
      * @param connectionString the connection string.
      * @param queueName the queue name.
      */
-    public AzureServiceBusEventPublisher(String connectionString, String queueName) {
+    public AzureServiceBusEventSender(String connectionString, String queueName) {
         client = new ServiceBusClientBuilder()
                 .connectionString(connectionString)
                 .sender()
@@ -88,7 +88,7 @@ public Map<String, Object> getDelegate() {
     }
 
     @Override
-    public void publish(T event) {
+    public void send(T event) {
         ServiceBusMessage message = new ServiceBusMessage(toUnderlyingEvent(event));
         client.sendMessage(message);
     }

azure-eventhubs/src/main/java/com/manorrock/colibri/azureeventhubs/AzureEventHubEventPublisher.java → azure-eventhubs/src/main/java/com/manorrock/colibri/azureeventhubs/AzureEventHubEventSender.java

@@ -33,17 +33,17 @@
 import com.azure.messaging.eventhubs.EventDataBatch;
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubProducerClient;
-import com.manorrock.colibri.api.EventPublisher;
+import com.manorrock.colibri.api.EventSender;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * The Azure Event Bus implementation of an EventPublisher.
+ * The Azure Event Bus implementation of an EventSender.
  *
  * @author Manfred Riem ([email protected])
  * @param <T> the type.
  */
-public class AzureEventHubEventPublisher<T> implements EventPublisher<T, EventData> {
+public class AzureEventHubEventSender<T> implements EventSender<T, EventData> {
 
     /**
      * Stores the client.
@@ -66,7 +66,7 @@ public class AzureEventHubEventPublisher<T> implements EventPublisher<T, EventDa
      * @param connectionString the connection string.
      * @param eventHubName the event hub name.
      */
-    public AzureEventHubEventPublisher(String connectionString, String eventHubName) {
+    public AzureEventHubEventSender(String connectionString, String eventHubName) {
         this.connectionString = connectionString;
         this.eventHubName = eventHubName;
         client = new EventHubClientBuilder()
@@ -89,7 +89,7 @@ public Map<String, Object> getDelegate() {
     }
 
     @Override
-    public void publish(T event) {
+    public void send(T event) {
         EventDataBatch batch = client.createBatch();
         batch.tryAdd(toUnderlyingEvent(event));
         client.send(batch);

jms/src/main/java/com/manorrock/colibri/jms/JmsTextMessageEventPublisher.java → jms/src/main/java/com/manorrock/colibri/jms/JmsTextMessageEventSender.java

@@ -29,7 +29,7 @@
  */
 package com.manorrock.colibri.jms;
 
-import com.manorrock.colibri.api.EventPublisher;
+import com.manorrock.colibri.api.EventSender;
 import jakarta.jms.ConnectionFactory;
 import static jakarta.jms.DeliveryMode.NON_PERSISTENT;
 import jakarta.jms.JMSContext;
@@ -39,12 +39,12 @@
 import java.util.Map;
 
 /**
- * The JMS TextMessage implementation of an EventPublisher.
+ * The JMS TextMessage implementation of an EventSender.
  * 
  * @author Manfred Riem ([email protected])
  * @param <T> the type.
  */
-public class JmsTextMessageEventPublisher<T> implements EventPublisher<T, String> {
+public class JmsTextMessageEventSender<T> implements EventSender<T, String> {
 
     /**
      * Stores the context.
@@ -67,7 +67,7 @@ public class JmsTextMessageEventPublisher<T> implements EventPublisher<T, String
      * @param connectionFactory the connection factory.
      * @param destinationName the destination name.
      */
-    public JmsTextMessageEventPublisher(
+    public JmsTextMessageEventSender(
             ConnectionFactory connectionFactory, String destinationName) {
         context = connectionFactory.createContext();
         queue = context.createQueue(destinationName);
@@ -90,7 +90,7 @@ public Map<String, Object> getDelegate() {
     }
 
     @Override
-    public void publish(T event) {
+    public void send(T event) {
         producer.send(queue, (String) toUnderlyingEvent(event));
     }
 

jms/src/test/java/com/manorrock/colibri/jms/JmsTextMessageEventReceiverTest.java

@@ -34,7 +34,7 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * The JUnit tests for the JmsTextMessageEventPublisher class.
+ * The JUnit tests for the JmsTextMessageEventReceiver class.
  *
  * @author Manfred Riem ([email protected])
  */
@@ -48,9 +48,9 @@ class JmsTextMessageEventReceiverTest {
     @Test
     void testReceive() throws Exception {
         ConnectionFactory connectionFactory = new ConnectionFactory();
-        try (JmsTextMessageEventPublisher<String> publisher
-                = new JmsTextMessageEventPublisher(connectionFactory, "colibri")) {
-            publisher.publish("Receive me");
+        try (JmsTextMessageEventSender<String> sender
+                = new JmsTextMessageEventSender(connectionFactory, "colibri")) {
+            sender.send("Receive me");
         }
         try (JmsTextMessageEventReceiver<String> receiver
                 = new JmsTextMessageEventReceiver(connectionFactory, "colibri")) {

jms/src/test/java/com/manorrock/colibri/jms/JmsTextMessageEventPublisherTest.java → jms/src/test/java/com/manorrock/colibri/jms/JmsTextMessageEventSenderTest.java

@@ -34,23 +34,23 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * The JUnit tests for the JmsTextMessageEventPublisher class.
+ * The JUnit tests for the JmsTextMessageEventSender class.
  *
  * @author Manfred Riem ([email protected])
  */
-class JmsTextMessageEventPublisherTest {
+class JmsTextMessageEventSenderTest {
 
     /**
-     * Test publish method.
+     * Test send method.
      *
      * @throws Exception when a serious error occurs.
      */
     @Test
-    void testPublish() throws Exception {
+    void testSend() throws Exception {
         ConnectionFactory connectionFactory = new ConnectionFactory();
-        try (JmsTextMessageEventPublisher<String> publisher
-                = new JmsTextMessageEventPublisher(connectionFactory, "colibri")) {
-            publisher.publish("Publish me");
+        try (JmsTextMessageEventSender<String> sender
+                = new JmsTextMessageEventSender(connectionFactory, "colibri")) {
+            sender.send("Send me");
         }
         try (JmsTextMessageEventReceiver<String> receiver
                 = new JmsTextMessageEventReceiver(connectionFactory, "colibri")) {

kafka/src/main/java/com/manorrock/colibri/kafka/KafkaEventPublisher.java → kafka/src/main/java/com/manorrock/colibri/kafka/KafkaEventSender.java

@@ -29,20 +29,20 @@
  */
 package com.manorrock.colibri.kafka;
 
-import com.manorrock.colibri.api.EventPublisher;
+import com.manorrock.colibri.api.EventSender;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 
 /**
- * The Kafka implementation of an EventPublisher.
+ * The Kafka implementation of an EventSender.
  *
  * @author Manfred Riem ([email protected])
  * @param <T> the type.
  */
-public class KafkaEventPublisher<T> implements EventPublisher<T, String> {
+public class KafkaEventSender<T> implements EventSender<T, String> {
 
     /**
      * Stores the producer.
@@ -60,7 +60,7 @@ public class KafkaEventPublisher<T> implements EventPublisher<T, String> {
      * @param properties the configuration properties.
      * @param topic the topic name.
      */
-    public KafkaEventPublisher(Properties properties, String topic) {
+    public KafkaEventSender(Properties properties, String topic) {
         producer = new KafkaProducer<>(properties);
         this.topic = topic;
     }
@@ -79,7 +79,7 @@ public Map<String, Object> getDelegate() {
     }
 
     @Override
-    public void publish(T event) {
+    public void send(T event) {
         ProducerRecord record = new ProducerRecord(topic, String.valueOf(System.nanoTime()), toUnderlyingEvent(event));
         try {
             producer.send(record).get();

kafka/src/test/java/com/manorrock/colibri/kafka/KafkaEventReceiverTest.java

@@ -38,7 +38,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 /**
- * The JUnit tests for the KafkaEventPublisher class.
+ * The JUnit tests for the KafkaEventSender class.
  *
  * @author Manfred Riem ([email protected])
  */
@@ -55,10 +55,10 @@ void testReceive() throws Exception {
         properties.put("group.id", "1");
         properties.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
         properties.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-        KafkaEventPublisher<String> publisher = new KafkaEventPublisher<>(
+        KafkaEventSender<String> sender = new KafkaEventSender<>(
                 properties,
                 "MyTopic");
-        publisher.publish("Hello World");
+        sender.send("Hello World");
         properties = new Properties();
         properties.put("bootstrap.servers", kafka.getBootstrapServers());
         properties.put("auto.offset.reset", "earliest");

kafka/src/test/java/com/manorrock/colibri/kafka/KafkaEventPublisherTest.java → kafka/src/test/java/com/manorrock/colibri/kafka/KafkaEventSenderTest.java

@@ -38,27 +38,27 @@
 import org.testcontainers.utility.DockerImageName;
 
 /**
- * The JUnit tests for the KafkaEventPublisher class.
+ * The JUnit tests for the KafkaEventSender class.
  *
  * @author Manfred Riem ([email protected])
  */
 @Testcontainers
-class KafkaEventPublisherTest {
+class KafkaEventSenderTest {
 
     @Container
     KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"));
 
     @Test
-    void testPublish() throws Exception {
+    void testSend() throws Exception {
         Properties properties = new Properties();
         properties.put("bootstrap.servers", kafka.getBootstrapServers());
         properties.put("group.id", "1");
         properties.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
         properties.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-        KafkaEventPublisher<String> publisher = new KafkaEventPublisher<>(
+        KafkaEventSender<String> sender = new KafkaEventSender<>(
                 properties,
                 "MyTopic");
-        publisher.publish("Hello World");
+        sender.send("Hello World");
         properties = new Properties();
         properties.put("bootstrap.servers", kafka.getBootstrapServers());
         properties.put("auto.offset.reset", "earliest");