Rename ClusterSwitchEventArgs to DatabaseSwitchEvent

Author: ggivo

src/main/java/redis/clients/jedis/builders/MultiDbClientBuilder.java

@@ -6,7 +6,7 @@
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.executors.CommandExecutor;
 import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
-import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
+import redis.clients.jedis.mcf.DatabaseSwitchEvent;
 import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.providers.ConnectionProvider;
 
@@ -68,7 +68,7 @@ public abstract class MultiDbClientBuilder<C>
 
   // Multi-db specific configuration fields
   private MultiDbConfig multiDbConfig = null;
-  private Consumer<ClusterSwitchEventArgs> databaseSwitchListener = null;
+  private Consumer<DatabaseSwitchEvent> databaseSwitchListener = null;
 
   /**
    * Sets the multi-database configuration.
@@ -94,7 +94,7 @@ public MultiDbClientBuilder<C> multiDbConfig(MultiDbConfig config) {
    * @param listener the database switch event listener
    * @return this builder
    */
-  public MultiDbClientBuilder<C> databaseSwitchListener(Consumer<ClusterSwitchEventArgs> listener) {
+  public MultiDbClientBuilder<C> databaseSwitchListener(Consumer<DatabaseSwitchEvent> listener) {
     this.databaseSwitchListener = listener;
     return this;
   }

src/main/java/redis/clients/jedis/mcf/ClusterSwitchEventArgs.java

@@ -0,0 +1,30 @@
+package redis.clients.jedis.mcf;
+
+import redis.clients.jedis.Endpoint;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider.Database;
+
+public class DatabaseSwitchEvent {
+
+  private final SwitchReason reason;
+  private final String databaseName;
+  private final Endpoint endpoint;
+
+  public DatabaseSwitchEvent(SwitchReason reason, Endpoint endpoint, Database database) {
+    this.reason = reason;
+    this.databaseName = database.getCircuitBreaker().getName();
+    this.endpoint = endpoint;
+  }
+
+  public SwitchReason getReason() {
+    return reason;
+  }
+
+  public String getDatabaseName() {
+    return databaseName;
+  }
+
+  public Endpoint getEndpoint() {
+    return endpoint;
+  }
+
+}

src/main/java/redis/clients/jedis/mcf/DatabaseSwitchEvent.java

@@ -80,7 +80,7 @@ public class MultiDbConnectionProvider implements ConnectionProvider {
    * Functional interface for listening to cluster switch events. The event args contain the reason
    * for the switch, the endpoint, and the cluster.
    */
-  private Consumer<ClusterSwitchEventArgs> databaseSwitchListener;
+  private Consumer<DatabaseSwitchEvent> databaseSwitchListener;
 
   private List<Class<? extends Throwable>> fallbackExceptionList;
 
@@ -743,12 +743,12 @@ public boolean canIterateFrom(Database iterateFrom) {
 
   public void onClusterSwitch(SwitchReason reason, Endpoint endpoint, Database database) {
     if (databaseSwitchListener != null) {
-      ClusterSwitchEventArgs eventArgs = new ClusterSwitchEventArgs(reason, endpoint, database);
+      DatabaseSwitchEvent eventArgs = new DatabaseSwitchEvent(reason, endpoint, database);
       databaseSwitchListener.accept(eventArgs);
     }
   }
 
-  public void setDatabaseSwitchListener(Consumer<ClusterSwitchEventArgs> databaseSwitchListener) {
+  public void setDatabaseSwitchListener(Consumer<DatabaseSwitchEvent> databaseSwitchListener) {
     this.databaseSwitchListener = databaseSwitchListener;
   }
 

src/main/java/redis/clients/jedis/mcf/MultiDbConnectionProvider.java

@@ -17,7 +17,7 @@
 
 import redis.clients.jedis.MultiDbConfig.DatabaseConfig;
 import redis.clients.jedis.exceptions.JedisValidationException;
-import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
+import redis.clients.jedis.mcf.DatabaseSwitchEvent;
 import redis.clients.jedis.mcf.SwitchReason;
 
 import java.io.IOException;
@@ -181,8 +181,8 @@ public void testWithDatabaseSwitchListener() {
             .weight(50.0f).build())
         .build();
 
-    Consumer<ClusterSwitchEventArgs> eventConsumer;
-    List<ClusterSwitchEventArgs> events = new ArrayList<>();
+    Consumer<DatabaseSwitchEvent> eventConsumer;
+    List<DatabaseSwitchEvent> events = new ArrayList<>();
     eventConsumer = events::add;
 
     try (MultiDbClient testClient = MultiDbClient.builder().databaseSwitchListener(eventConsumer)

src/test/java/redis/clients/jedis/MultiDbClientTest.java

@@ -122,7 +122,7 @@ public void testFailover(boolean fastFailover, long minFailoverCompletionDuratio
     // Use the parameterized fastFailover setting
     builder.fastFailover(fastFailover);
 
-    class FailoverReporter implements Consumer<ClusterSwitchEventArgs> {
+    class FailoverReporter implements Consumer<DatabaseSwitchEvent> {
 
       String currentClusterName = "not set";
 
@@ -139,10 +139,10 @@ public String getCurrentClusterName() {
       }
 
       @Override
-      public void accept(ClusterSwitchEventArgs e) {
-        this.currentClusterName = e.getClusterName();
+      public void accept(DatabaseSwitchEvent e) {
+        this.currentClusterName = e.getDatabaseName();
         log.info("\n\n===={}=== \nJedis switching to cluster: {}\n====End of log===\n",
-          e.getReason(), e.getClusterName());
+          e.getReason(), e.getDatabaseName());
         if ((e.getReason() == SwitchReason.CIRCUIT_BREAKER
             || e.getReason() == SwitchReason.HEALTH_CHECK)) {
           failoverHappened = true;

src/test/java/redis/clients/jedis/mcf/ActiveActiveLocalFailoverTest.java

@@ -17,7 +17,7 @@
 import redis.clients.jedis.*;
 import redis.clients.jedis.exceptions.JedisAccessControlException;
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
+import redis.clients.jedis.mcf.DatabaseSwitchEvent;
 import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.mcf.MultiDbConnectionProviderHelper;
 import redis.clients.jedis.mcf.SwitchReason;
@@ -250,13 +250,13 @@ public void failoverFromAuthError() {
     jedis.close();
   }
 
-  static class RedisFailoverReporter implements Consumer<ClusterSwitchEventArgs> {
+  static class RedisFailoverReporter implements Consumer<DatabaseSwitchEvent> {
 
     boolean failedOver = false;
 
     @Override
-    public void accept(ClusterSwitchEventArgs e) {
-      log.info("Jedis fail over to cluster: " + e.getClusterName());
+    public void accept(DatabaseSwitchEvent e) {
+      log.info("Jedis fail over to cluster: " + e.getDatabaseName());
       failedOver = true;
     }
   }

src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java

@@ -11,7 +11,7 @@
 import redis.clients.jedis.*;
 import redis.clients.jedis.MultiDbConfig.DatabaseConfig;
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
+import redis.clients.jedis.mcf.DatabaseSwitchEvent;
 import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.util.ClientTestUtil;
 
@@ -82,7 +82,7 @@ public void testFailover() {
             .fastFailover(true)
             .retryOnFailover(false)
             .build();
-    class FailoverReporter implements Consumer<ClusterSwitchEventArgs> {
+    class FailoverReporter implements Consumer<DatabaseSwitchEvent> {
 
       String currentClusterName = "not set";
 
@@ -99,10 +99,10 @@ public String getCurrentClusterName() {
       }
 
       @Override
-      public void accept(ClusterSwitchEventArgs e) {
-        this.currentClusterName = e.getClusterName();
+      public void accept(DatabaseSwitchEvent e) {
+        this.currentClusterName = e.getDatabaseName();
         log.info("\n\n====FailoverEvent=== \nJedis failover to cluster: {}\n====FailoverEvent===\n\n",
-          e.getClusterName());
+          e.getDatabaseName());
 
         if (failoverHappened) {
           failbackHappened = true;