ARTEMIS-5889 Support reload of connection router config

Support connection routers being added, updated or removed via
configuration updates either XML or via broker properties.

Author: tabish121

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/routing/CacheConfiguration.java

@@ -17,9 +17,11 @@
 package org.apache.activemq.artemis.core.config.routing;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class CacheConfiguration implements Serializable {
-   private boolean persisted = false;
+
+   private boolean persisted;
 
    private int timeout = 0;
 
@@ -43,4 +45,22 @@ public CacheConfiguration setTimeout(int timeout) {
       this.timeout = timeout;
       return this;
    }
+
+   @Override
+   public int hashCode() {
+      return Objects.hash(persisted, timeout);
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj) {
+         return true;
+      }
+
+      if (obj instanceof CacheConfiguration other) {
+         return persisted == other.persisted && timeout == other.timeout;
+      }
+
+      return false;
+   }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/routing/ConnectionRouterConfiguration.java

@@ -19,6 +19,7 @@
 import org.apache.activemq.artemis.core.server.routing.KeyType;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class ConnectionRouterConfiguration implements Serializable {
 
@@ -92,4 +93,28 @@ public ConnectionRouterConfiguration setPoolConfiguration(PoolConfiguration pool
       this.poolConfiguration = poolConfiguration;
       return this;
    }
+
+   @Override
+   public int hashCode() {
+      return Objects.hash(cacheConfiguration, keyFilter, keyType, localTargetFilter, name, policyConfiguration, poolConfiguration);
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj) {
+         return true;
+      }
+
+      if (obj instanceof ConnectionRouterConfiguration other) {
+         return Objects.equals(cacheConfiguration, other.cacheConfiguration) &&
+                Objects.equals(keyFilter, other.keyFilter) &&
+                keyType == other.keyType &&
+                Objects.equals(localTargetFilter, other.localTargetFilter) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(policyConfiguration, other.policyConfiguration) &&
+                Objects.equals(poolConfiguration, other.poolConfiguration);
+      }
+
+      return false;
+   }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/routing/NamedPropertyConfiguration.java

@@ -18,8 +18,10 @@
 
 import java.io.Serializable;
 import java.util.Map;
+import java.util.Objects;
 
 public class NamedPropertyConfiguration implements Serializable {
+
    private String name;
 
    private Map<String, String> properties;
@@ -41,4 +43,22 @@ public NamedPropertyConfiguration setProperties(Map<String, String> properties)
       this.properties = properties;
       return this;
    }
+
+   @Override
+   public int hashCode() {
+      return Objects.hash(name, properties);
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj) {
+         return true;
+      }
+
+      if (obj instanceof NamedPropertyConfiguration other) {
+         return Objects.equals(name, other.name) && Objects.equals(properties, other.properties);
+      }
+
+      return false;
+   }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/routing/PoolConfiguration.java

@@ -18,19 +18,21 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class PoolConfiguration implements Serializable {
+
    private String username;
 
    private String password;
 
-   private boolean localTargetEnabled = false;
+   private boolean localTargetEnabled;
 
-   private String clusterConnection = null;
+   private String clusterConnection;
 
-   private List<String> staticConnectors = null;
+   private List<String> staticConnectors;
 
-   private String discoveryGroupName = null;
+   private String discoveryGroupName;
 
    private int checkPeriod = 5000;
 
@@ -118,4 +120,31 @@ public PoolConfiguration setDiscoveryGroupName(String discoveryGroupName) {
       this.discoveryGroupName = discoveryGroupName;
       return this;
    }
+
+   @Override
+   public int hashCode() {
+      return Objects.hash(checkPeriod, clusterConnection, discoveryGroupName, localTargetEnabled, password, quorumSize, quorumTimeout, staticConnectors,
+         username);
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj) {
+         return true;
+      }
+
+      if (obj instanceof PoolConfiguration other) {
+         return checkPeriod == other.checkPeriod &&
+                Objects.equals(clusterConnection, other.clusterConnection) &&
+                Objects.equals(discoveryGroupName, other.discoveryGroupName) &&
+                localTargetEnabled == other.localTargetEnabled &&
+                Objects.equals(password, other.password) &&
+                quorumSize == other.quorumSize &&
+                quorumTimeout == other.quorumTimeout &&
+                Objects.equals(staticConnectors, other.staticConnectors) &&
+                Objects.equals(username, other.username);
+      }
+
+      return false;
+   }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java

@@ -3388,9 +3388,9 @@ synchronized boolean initialisePart1(boolean scalingDown) throws Exception {
 
       federationManager.deploy();
 
-      connectionRouterManager = new ConnectionRouterManager(configuration, this, scheduledPool);
+      connectionRouterManager = new ConnectionRouterManager(this, scheduledPool);
 
-      connectionRouterManager.deploy();
+      connectionRouterManager.deploy(configuration);
 
       remotingService = new RemotingServiceImpl(clusterManager, configuration, this, managementService, scheduledPool, protocolManagerFactories, executorFactory.getExecutor(), serviceRegistry);
 
@@ -4696,6 +4696,7 @@ private void reloadConfigurationFile(URL xmlConfigUri) throws Exception {
          configuration.setAcceptorConfigurations(config.getAcceptorConfigurations());
          configuration.setAMQPConnectionConfigurations(config.getAMQPConnection());
          configuration.setPurgePageFolders(config.isPurgePageFolders());
+         configuration.setConnectionRouters(config.getConnectionRouters());
       }
       configuration.parseProperties(propertiesFileUrl);
       updateStatus(ServerStatus.CONFIGURATION_COMPONENT, configuration.getStatus());
@@ -4805,6 +4806,9 @@ private void deployReloadableConfigFromConfiguration() throws Exception {
 
          recoverStoredConnectors();
 
+         ActiveMQServerLogger.LOGGER.reloadingConfiguration("connection routers");
+         connectionRouterManager.update(configuration);
+
          ActiveMQServerLogger.LOGGER.reloadingConfiguration("protocol services");
          updateProtocolServices();
       }