From 87c0563c22db29ca13ed6a6831585d27aacc4a02 Mon Sep 17 00:00:00 2001
From: Nakiguli Grace <gracebisheko@gmail.com>
Date: Thu, 21 Oct 2021 13:22:40 +0300
Subject: [PATCH 1/3] initial-work1:Implement JSONRPC as a wire protocol

---
 .../bridge/tcp/TcpEventBusClient.java         | 40 ++++++++++++++++
 .../bridge/tcp/TcpEventBusClientImpl.java     | 48 +++++++++++++++++++
 .../tcp/impl/TcpEventBusBridgeImpl.java       |  2 -
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java
 create mode 100644 src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java

diff --git a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java
new file mode 100644
index 0000000..f0228ad
--- /dev/null
+++ b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java
@@ -0,0 +1,40 @@
+package io.vertx.ext.eventbus.bridge.tcp;
+
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.eventbus.DeliveryOptions;
+import io.vertx.core.eventbus.MessageConsumer;
+import io.vertx.ext.bridge.BridgeOptions;
+
+/**
+ * TCP EventBus Client for to connect to the event bus bridge
+ *
+ * @author <a href="mailto:gracebisheko@gmail.com">Nakiguli Grace</a>
+ */
+
+public interface TcpEventBusClient {
+
+  /**create an event bus client */
+  static TcpEventBusClient create(TcpEventBusClient tcpEventBusClient) {
+    return create(tcpEventBusClient);
+  }
+
+  /**send message to eventBus address*/
+  TcpEventBusClient send(String message);
+
+  /**send message to eventBus address and expect a reply*/
+  TcpEventBusClient send(String address, Handler<AsyncResult<TcpEventBusBridge>> handler);
+
+  /**publish message to eventBus address*/
+  TcpEventBusClient publish(String address, String body, DeliveryOptions deliveryOptions);
+
+  /**Subscribe a consumer*/
+  TcpEventBusClient register(Handler<AsyncResult<MessageConsumer<TcpEventBusBridge>>> handler);
+
+  /**un subscribe a consumer if it does not want to listen*/
+  TcpEventBusClient unRegister(Handler<AsyncResult<Void>> handler);
+
+  /**close client*/
+  void close(Handler<AsyncResult<Void>> handler);
+}
diff --git a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java
new file mode 100644
index 0000000..4bcd5e2
--- /dev/null
+++ b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java
@@ -0,0 +1,48 @@
+package io.vertx.ext.eventbus.bridge.tcp;
+
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.eventbus.DeliveryOptions;
+import io.vertx.core.eventbus.MessageConsumer;
+import io.vertx.core.json.JsonObject;
+
+/**
+ * TCP EventBus Client implementation
+ *
+ * @author <a href="mailto:gracebisheko@gmail.com">Nakiguli Grace</a>
+ */
+
+public class TcpEventBusClientImpl implements TcpEventBusClient{
+
+  @Override
+  public TcpEventBusClient send(String String) {
+    return null;
+  }
+
+  @Override
+  public TcpEventBusClient send(String address,
+    Handler<AsyncResult<TcpEventBusBridge>> handler) {
+    return null;
+  }
+
+  @Override
+  public TcpEventBusClient publish(String address, String body, DeliveryOptions deliveryOptions) {
+    return null;
+  }
+
+  @Override
+  public TcpEventBusClient register(
+    Handler<AsyncResult<MessageConsumer<TcpEventBusBridge>>> handler) {
+    return null;
+  }
+
+  @Override
+  public TcpEventBusClient unRegister(Handler<AsyncResult<Void>> handler) {
+    return null;
+  }
+
+  @Override
+  public void close(Handler<AsyncResult<Void>> handler) {
+
+  }
+}
diff --git a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/impl/TcpEventBusBridgeImpl.java b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/impl/TcpEventBusBridgeImpl.java
index ff2b111..781d8b0 100644
--- a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/impl/TcpEventBusBridgeImpl.java
+++ b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/impl/TcpEventBusBridgeImpl.java
@@ -61,7 +61,6 @@ public class TcpEventBusBridgeImpl implements TcpEventBusBridge {
   private final BridgeOptions options;
   private final Handler<BridgeEvent> bridgeEventHandler;
 
-
   public TcpEventBusBridgeImpl(Vertx vertx, BridgeOptions options, NetServerOptions netServerOptions, Handler<BridgeEvent> eventHandler) {
     this.eb = vertx.eventBus();
     this.options = options != null ? options : new BridgeOptions();
@@ -127,7 +126,6 @@ private void doSendOrPub(NetSocket socket, String address, JsonObject msg, Map<S
     final Object body = msg.getValue("body");
     final JsonObject headers = msg.getJsonObject("headers");
 
-
     // default to message
     final String type = msg.getString("type", "message");
     DeliveryOptions deliveryOptions = parseMsgHeaders(new DeliveryOptions(), headers);

From 27cdd1860a628b3893136654697536513a96607c Mon Sep 17 00:00:00 2001
From: Nakiguli Grace <gracebisheko@gmail.com>
Date: Fri, 22 Oct 2021 18:23:16 +0300
Subject: [PATCH 2/3] initial-work1

---
 pom.xml                                       | 164 ++++++++++++++++++
 .../bridge/tcp/TcpEventBusClient.java         |  40 -----
 .../bridge/tcp/TcpEventBusClientImpl.java     |  48 -----
 .../bridge/tcp/EventBusBridgeRestIT.java      |  19 ++
 src/test/resources/my-it-config.json          |   5 +
 5 files changed, 188 insertions(+), 88 deletions(-)
 delete mode 100644 src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java
 delete mode 100644 src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java
 create mode 100644 src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java
 create mode 100644 src/test/resources/my-it-config.json

diff --git a/pom.xml b/pom.xml
index 908e0b6..7c34afb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,5 +90,169 @@
       <version>1.65</version>
       <scope>test</scope>
     </dependency>
+
+    <!--Add AssertJ and Rest Assured libraries-->
+    <dependency>
+      <groupId>com.jayway.restassured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <version>2.8.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.4.1</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
+
+  <build>
+
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>reserve-network-port</id>
+            <goals>
+              <goal>reserve-network-port</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <portNames>
+                <portName>http.port</portName>
+              </portNames>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.18.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+            <configuration>
+              <systemProperties>
+                <!--suppress UnresolvedMavenProperty -->
+                <http.port>${http.port}</http.port>
+              </systemProperties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- We use the maven-antrun-plugin to start the application before the integration tests
+      and stop them afterward -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>start-vertx-app</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                Launch the application as in 'production' using the fatjar.
+                We pass the generated configuration, configuring the http port to the picked one
+                -->
+                <exec executable="${java.home}/bin/java"
+                      dir="${project.build.directory}"
+                      spawn="true">
+                  <arg value="-jar"/>
+                  <arg value="${project.artifactId}-${project.version}-fat.jar"/>
+                  <arg value="-conf"/>
+                  <arg value="${project.build.directory}/test-classes/my-it-config.json"/>
+                </exec>
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-vertx-app</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <!--
+                Kill the started process.
+                Finding the right process is a bit tricky. Windows command in in the windows profile (below)
+                -->
+              <target>
+                <exec executable="bash"
+                      dir="${project.build.directory}"
+                      spawn="false">
+                  <arg value="-c"/>
+                  <!--suppress UnresolvedMavenProperty -->
+                  <arg value="ps ax | grep -Ei '[\-]DtestPort=${http.port}\s+\-jar\s+${project.artifactId}' | awk 'NR==1{print $1}' | xargs kill -SIGTERM"/>
+                </exec>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+
+  </build>
+  <profiles>
+  <!-- A profile for windows as the stop command is different -->
+  <profile>
+    <id>windows</id>
+    <activation>
+      <os>
+        <family>windows</family>
+      </os>
+    </activation>
+   <build>
+      <plugins>
+       <plugin>
+         <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.8</version>
+          <executions>
+            <execution>
+              <id>stop-vertx-app</id>
+              <phase>post-integration-test</phase>
+              <goals>
+                <goal>run</goal>
+              </goals>
+              <configuration>
+                <target>
+                  <exec executable="wmic"
+                       dir="${project.build.directory}"
+                        spawn="false">
+                    <arg value="process"/>
+                    <arg value="where"/>
+                    <arg value="CommandLine like '%${project.artifactId}%' and not name='wmic.exe'"/>
+                    <arg value="delete"/>
+                  </exec>
+                </target>
+              </configuration>
+            </execution>
+         </executions>
+       </plugin>
+      </plugins>
+    </build>
+  </profile>
+  </profiles>
+
 </project>
diff --git a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java
deleted file mode 100644
index f0228ad..0000000
--- a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClient.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.vertx.ext.eventbus.bridge.tcp;
-
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
-import io.vertx.core.eventbus.DeliveryOptions;
-import io.vertx.core.eventbus.MessageConsumer;
-import io.vertx.ext.bridge.BridgeOptions;
-
-/**
- * TCP EventBus Client for to connect to the event bus bridge
- *
- * @author <a href="mailto:gracebisheko@gmail.com">Nakiguli Grace</a>
- */
-
-public interface TcpEventBusClient {
-
-  /**create an event bus client */
-  static TcpEventBusClient create(TcpEventBusClient tcpEventBusClient) {
-    return create(tcpEventBusClient);
-  }
-
-  /**send message to eventBus address*/
-  TcpEventBusClient send(String message);
-
-  /**send message to eventBus address and expect a reply*/
-  TcpEventBusClient send(String address, Handler<AsyncResult<TcpEventBusBridge>> handler);
-
-  /**publish message to eventBus address*/
-  TcpEventBusClient publish(String address, String body, DeliveryOptions deliveryOptions);
-
-  /**Subscribe a consumer*/
-  TcpEventBusClient register(Handler<AsyncResult<MessageConsumer<TcpEventBusBridge>>> handler);
-
-  /**un subscribe a consumer if it does not want to listen*/
-  TcpEventBusClient unRegister(Handler<AsyncResult<Void>> handler);
-
-  /**close client*/
-  void close(Handler<AsyncResult<Void>> handler);
-}
diff --git a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java b/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java
deleted file mode 100644
index 4bcd5e2..0000000
--- a/src/main/java/io/vertx/ext/eventbus/bridge/tcp/TcpEventBusClientImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.vertx.ext.eventbus.bridge.tcp;
-
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
-import io.vertx.core.eventbus.DeliveryOptions;
-import io.vertx.core.eventbus.MessageConsumer;
-import io.vertx.core.json.JsonObject;
-
-/**
- * TCP EventBus Client implementation
- *
- * @author <a href="mailto:gracebisheko@gmail.com">Nakiguli Grace</a>
- */
-
-public class TcpEventBusClientImpl implements TcpEventBusClient{
-
-  @Override
-  public TcpEventBusClient send(String String) {
-    return null;
-  }
-
-  @Override
-  public TcpEventBusClient send(String address,
-    Handler<AsyncResult<TcpEventBusBridge>> handler) {
-    return null;
-  }
-
-  @Override
-  public TcpEventBusClient publish(String address, String body, DeliveryOptions deliveryOptions) {
-    return null;
-  }
-
-  @Override
-  public TcpEventBusClient register(
-    Handler<AsyncResult<MessageConsumer<TcpEventBusBridge>>> handler) {
-    return null;
-  }
-
-  @Override
-  public TcpEventBusClient unRegister(Handler<AsyncResult<Void>> handler) {
-    return null;
-  }
-
-  @Override
-  public void close(Handler<AsyncResult<Void>> handler) {
-
-  }
-}
diff --git a/src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java b/src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java
new file mode 100644
index 0000000..82f3c3c
--- /dev/null
+++ b/src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java
@@ -0,0 +1,19 @@
+package io.vertx.ext.eventbus.bridge.tcp;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+public class EventBusBridgeRestIT {
+  @BeforeClass
+  public static void configureRestAssured() {
+    RestAssured.baseURI = "http://localhost";
+    RestAssured.port = Integer.getInteger("http.port", 8080);
+  }
+
+  @AfterClass
+  public static void unConfigureRestAssured() {
+    RestAssured.reset();
+  }
+
+
+}
diff --git a/src/test/resources/my-it-config.json b/src/test/resources/my-it-config.json
new file mode 100644
index 0000000..c1ae919
--- /dev/null
+++ b/src/test/resources/my-it-config.json
@@ -0,0 +1,5 @@
+
+{
+  "http.port": "${http.port}"
+}
+

From 87adf5049aa8e87e9ba7c19a64ad3bd0bf7bf0e1 Mon Sep 17 00:00:00 2001
From: Nakiguli Grace <gracebisheko@gmail.com>
Date: Wed, 27 Oct 2021 15:13:08 +0300
Subject: [PATCH 3/3] initial-work1:Delete uwanted files

---
 pom.xml                                       | 164 ------------------
 .../bridge/tcp/EventBusBridgeRestIT.java      |  19 --
 src/test/resources/my-it-config.json          |   5 -
 3 files changed, 188 deletions(-)
 delete mode 100644 src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java
 delete mode 100644 src/test/resources/my-it-config.json

diff --git a/pom.xml b/pom.xml
index 7c34afb..908e0b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,169 +90,5 @@
       <version>1.65</version>
       <scope>test</scope>
     </dependency>
-
-    <!--Add AssertJ and Rest Assured libraries-->
-    <dependency>
-      <groupId>com.jayway.restassured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <version>2.8.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>3.4.1</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
-
-  <build>
-
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>reserve-network-port</id>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <phase>process-sources</phase>
-            <configuration>
-              <portNames>
-                <portName>http.port</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.18.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-            <configuration>
-              <systemProperties>
-                <!--suppress UnresolvedMavenProperty -->
-                <http.port>${http.port}</http.port>
-              </systemProperties>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- We use the maven-antrun-plugin to start the application before the integration tests
-      and stop them afterward -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>start-vertx-app</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <!--
-                Launch the application as in 'production' using the fatjar.
-                We pass the generated configuration, configuring the http port to the picked one
-                -->
-                <exec executable="${java.home}/bin/java"
-                      dir="${project.build.directory}"
-                      spawn="true">
-                  <arg value="-jar"/>
-                  <arg value="${project.artifactId}-${project.version}-fat.jar"/>
-                  <arg value="-conf"/>
-                  <arg value="${project.build.directory}/test-classes/my-it-config.json"/>
-                </exec>
-              </target>
-            </configuration>
-          </execution>
-          <execution>
-            <id>stop-vertx-app</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <!--
-                Kill the started process.
-                Finding the right process is a bit tricky. Windows command in in the windows profile (below)
-                -->
-              <target>
-                <exec executable="bash"
-                      dir="${project.build.directory}"
-                      spawn="false">
-                  <arg value="-c"/>
-                  <!--suppress UnresolvedMavenProperty -->
-                  <arg value="ps ax | grep -Ei '[\-]DtestPort=${http.port}\s+\-jar\s+${project.artifactId}' | awk 'NR==1{print $1}' | xargs kill -SIGTERM"/>
-                </exec>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-
-  </build>
-  <profiles>
-  <!-- A profile for windows as the stop command is different -->
-  <profile>
-    <id>windows</id>
-    <activation>
-      <os>
-        <family>windows</family>
-      </os>
-    </activation>
-   <build>
-      <plugins>
-       <plugin>
-         <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
-          <executions>
-            <execution>
-              <id>stop-vertx-app</id>
-              <phase>post-integration-test</phase>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <configuration>
-                <target>
-                  <exec executable="wmic"
-                       dir="${project.build.directory}"
-                        spawn="false">
-                    <arg value="process"/>
-                    <arg value="where"/>
-                    <arg value="CommandLine like '%${project.artifactId}%' and not name='wmic.exe'"/>
-                    <arg value="delete"/>
-                  </exec>
-                </target>
-              </configuration>
-            </execution>
-         </executions>
-       </plugin>
-      </plugins>
-    </build>
-  </profile>
-  </profiles>
-
 </project>
diff --git a/src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java b/src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java
deleted file mode 100644
index 82f3c3c..0000000
--- a/src/test/java/io/vertx/ext/eventbus/bridge/tcp/EventBusBridgeRestIT.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.vertx.ext.eventbus.bridge.tcp;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-public class EventBusBridgeRestIT {
-  @BeforeClass
-  public static void configureRestAssured() {
-    RestAssured.baseURI = "http://localhost";
-    RestAssured.port = Integer.getInteger("http.port", 8080);
-  }
-
-  @AfterClass
-  public static void unConfigureRestAssured() {
-    RestAssured.reset();
-  }
-
-
-}
diff --git a/src/test/resources/my-it-config.json b/src/test/resources/my-it-config.json
deleted file mode 100644
index c1ae919..0000000
--- a/src/test/resources/my-it-config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-
-{
-  "http.port": "${http.port}"
-}
-