feat: allow to obtain connector status

gravitee-io · Mar 5, 2024 · 49f9d36 · 49f9d36
1 parent 11a1a70
commit 49f9d36
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 21 deletions.
diff --git a/gravitee-exchange-api/pom.xml b/gravitee-exchange-api/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-api</artifactId>
-    <version>1.0.0-alpha.4</version>
+    <version>1.0.0-alpha.5</version>
     <name>Gravitee.io - Exchange - API</name>
 
     <dependencies>

diff --git a/gravitee-exchange-api/src/main/java/io/gravitee/exchange/api/channel/Channel.java b/gravitee-exchange-api/src/main/java/io/gravitee/exchange/api/channel/Channel.java
@@ -62,6 +62,13 @@ public interface Channel {
      */
     Completable close();
 
+    /**
+     * Return <code>true</code> is the current channel is active and ready to receive new commands, <code>false</code> otherwise.
+     *
+     * @return status of the channel.
+     */
+    boolean isActive();
+
     /**
      * Send the actual commands to the current channel. In case of error, different exception could be returned:
      * <ul>

diff --git a/...itee-exchange-api/src/main/java/io/gravitee/exchange/api/connector/ExchangeConnector.java b/...itee-exchange-api/src/main/java/io/gravitee/exchange/api/connector/ExchangeConnector.java
@@ -51,10 +51,17 @@ public interface ExchangeConnector {
      */
     String targetId();
 
+    /**
+     * Return <code>true</code> when the current instance is active and ready, <code>false</code> otherwise.
+     *
+     * @return status of the connector.
+     */
+    boolean isActive();
+
     /**
      * Returns <code>true</code> when the current instance is PRIMARY.
      *
-     * @return boolean
+     * @return boolean about primary status
      */
     boolean isPrimary();
 

diff --git a/...tee-exchange-api/src/main/java/io/gravitee/exchange/api/controller/ControllerChannel.java b/...tee-exchange-api/src/main/java/io/gravitee/exchange/api/controller/ControllerChannel.java
@@ -22,13 +22,6 @@
  * @author GraviteeSource Team
  */
 public interface ControllerChannel extends Channel {
-    /**
-     * Return <code>true</code> is the current channel is active and ready to receive new commands, <code>false</code> otherwise.
-     *
-     * @return status of the channel.
-     */
-    boolean isActive();
-
     /**
      * Enforce the active status of this controller channel.
      */

diff --git a/...pi/src/main/java/io/gravitee/exchange/api/websocket/channel/AbstractWebSocketChannel.java b/...pi/src/main/java/io/gravitee/exchange/api/websocket/channel/AbstractWebSocketChannel.java
@@ -106,6 +106,11 @@ public String targetId() {
         return targetId;
     }
 
+    @Override
+    public boolean isActive() {
+        return this.active;
+    }
+
     @Override
     public Completable initialize() {
         return Completable.create(emitter -> {

diff --git a/...io/gravitee/exchange/api/websocket/protocol/legacy/goodbye/LegacyGoodByeReplyAdapter.java b/...io/gravitee/exchange/api/websocket/protocol/legacy/goodbye/LegacyGoodByeReplyAdapter.java
@@ -15,7 +15,6 @@
  */
 package io.gravitee.exchange.api.websocket.protocol.legacy.goodbye;
 
-import io.gravitee.exchange.api.command.CommandAdapter;
 import io.gravitee.exchange.api.command.ReplyAdapter;
 import io.gravitee.exchange.api.command.goodbye.GoodByeReplyPayload;
 import io.reactivex.rxjava3.core.Single;

diff --git a/gravitee-exchange-connector/gravitee-exchange-connector-core/pom.xml b/gravitee-exchange-connector/gravitee-exchange-connector-core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange-connector</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-connector-core</artifactId>

diff --git a/gravitee-exchange-connector/gravitee-exchange-connector-embedded/pom.xml b/gravitee-exchange-connector/gravitee-exchange-connector-embedded/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange-connector</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-connector-embedded</artifactId>

diff --git a/...dded/src/main/java/io/gravitee/exchange/connector/embedded/EmbeddedExchangeConnector.java b/...dded/src/main/java/io/gravitee/exchange/connector/embedded/EmbeddedExchangeConnector.java
@@ -56,6 +56,11 @@ public String targetId() {
         return connectorChannel.targetId();
     }
 
+    @Override
+    public boolean isActive() {
+        return connectorChannel.isActive();
+    }
+
     @Override
     public boolean isPrimary() {
         return primary;

diff --git a/gravitee-exchange-connector/gravitee-exchange-connector-websocket/pom.xml b/gravitee-exchange-connector/gravitee-exchange-connector-websocket/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange-connector</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-connector-websocket</artifactId>

diff --git a/gravitee-exchange-connector/pom.xml b/gravitee-exchange-connector/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-connector</artifactId>

diff --git a/gravitee-exchange-controller/gravitee-exchange-controller-core/pom.xml b/gravitee-exchange-controller/gravitee-exchange-controller-core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange-controller</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-controller-core</artifactId>

diff --git a/gravitee-exchange-controller/gravitee-exchange-controller-embedded/pom.xml b/gravitee-exchange-controller/gravitee-exchange-controller-embedded/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange-controller</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-controller-embedded</artifactId>

diff --git a/gravitee-exchange-controller/gravitee-exchange-controller-websocket/pom.xml b/gravitee-exchange-controller/gravitee-exchange-controller-websocket/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange-controller</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-controller-websocket</artifactId>
-    <version>1.0.0-alpha.4</version>
+    <version>1.0.0-alpha.5</version>
     <name>Gravitee.io - Exchange - Controller Websocket</name>
     <dependencies>
         <dependency>

diff --git a/gravitee-exchange-controller/pom.xml b/gravitee-exchange-controller/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.exchange</groupId>
         <artifactId>gravitee-exchange</artifactId>
-        <version>1.0.0-alpha.4</version>
+        <version>1.0.0-alpha.5</version>
     </parent>
 
     <artifactId>gravitee-exchange-controller</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>io.gravitee.exchange</groupId>
     <artifactId>gravitee-exchange</artifactId>
-    <version>1.0.0-alpha.4</version>
+    <version>1.0.0-alpha.5</version>
     <name>Gravitee.io - Exchange</name>
     <packaging>pom</packaging>