From 0010b0a090487192edbacc881f31e0649a62e7f0 Mon Sep 17 00:00:00 2001 From: Jeff Mesnil Date: Fri, 22 Sep 2017 16:35:36 +0200 Subject: [PATCH] [ARTMIS-1431] Adapt transport configuration in ClientProtocolManagerFactory add the adaptTransportConfiguration() method to the ClientProtocolManagerFactory so that transport configurations used by the ClientProtocolManager have an opportunity to adapt their transport configuration. This allows the HornetQClientProtocolManagerFactory to adapt the transport configuration received by remote HornetQ broker to replace the HornetQ-based NettyConnectorFactory by the Artemis-based one. JIRA: https://issues.apache.org/jira/browse/ARTEMIS-1431 --- .../core/client/impl/ServerLocatorImpl.java | 4 +++- .../ActiveMQClientProtocolManagerFactory.java | 6 +++++ .../ClientProtocolManagerFactory.java | 10 ++++++++ .../HornetQClientProtocolManagerFactory.java | 23 +++++++++++++++++++ ...iveMQServerSideProtocolManagerFactory.java | 6 +++++ .../xa/recovery/XARecoveryConfig.java | 6 ++++- 6 files changed, 53 insertions(+), 2 deletions(-) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java index adae8f7d53..02c17c6ad5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java @@ -1504,7 +1504,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery int count = 0; for (TopologyMemberImpl pair : membersCopy) { - topologyArrayLocal[count++] = pair.getConnector(); + Pair transportConfigs = pair.getConnector(); + topologyArrayLocal[count++] = new Pair<>(protocolManagerFactory.adaptTransportConfiguration(transportConfigs.getA()), + protocolManagerFactory.adaptTransportConfiguration(transportConfigs.getB())); } this.topologyArray = topologyArrayLocal; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java index 5675fff7d5..866713cfdd 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.artemis.core.protocol.core.impl; +import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory; @@ -49,4 +50,9 @@ public class ActiveMQClientProtocolManagerFactory implements ClientProtocolManag public ClientProtocolManager newProtocolManager() { return new ActiveMQClientProtocolManager(); } + + @Override + public TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc) { + return tc; + } } diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java index 7e822384a6..96e9eadba5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.artemis.spi.core.remoting; +import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ServerLocator; public interface ClientProtocolManagerFactory { @@ -25,4 +26,13 @@ public interface ClientProtocolManagerFactory { void setLocator(ServerLocator locator); ServerLocator getLocator(); + + /** + * Adapt the transport configuration passed in parameter and return an adapted one that is suitable to use with ClientProtocolManager + * created by this factory. + * + * @param tc the original TransportConfiguration + * @return the adapted TransportConfiguration + */ + TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc); } diff --git a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java index 99cfcb99bb..57f2c94d7f 100644 --- a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java +++ b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java @@ -17,8 +17,10 @@ package org.apache.activemq.artemis.core.protocol.hornetq.client; +import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.protocol.hornetq.HQPropertiesConversionInterceptor; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory; import org.osgi.service.component.annotations.Component; @@ -40,6 +42,27 @@ public class HornetQClientProtocolManagerFactory implements ClientProtocolManage locator.addOutgoingInterceptor(new HQPropertiesConversionInterceptor(false)); } + /** + * Adapt the transport configuration by replacing the factoryClassName corresponding to an HornetQ's NettyConnectorFactory + * by the Artemis-based implementation. + */ + @Override + public TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc) { + if (tc == null) { + return null; + } + + String factoryClassName = tc.getFactoryClassName(); + if (factoryClassName.equals("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory")) { + factoryClassName = NettyConnectorFactory.class.getName(); + } + TransportConfiguration newConfig = new TransportConfiguration(factoryClassName, + tc.getParams(), + tc.getName(), + tc.getExtraParams()); + return newConfig; + } + @Override public ClientProtocolManager newProtocolManager() { return new HornetQClientProtocolManager(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java index 3c9791e11d..85ad3a37ad 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.artemis.core.server.cluster; +import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.protocol.ServerPacketDecoder; import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager; @@ -51,6 +52,11 @@ public class ActiveMQServerSideProtocolManagerFactory implements ClientProtocolM private static final long serialVersionUID = 1; + @Override + public TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc) { + return tc; + } + @Override public ClientProtocolManager newProtocolManager() { return new ActiveMQReplicationProtocolManager(); diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java index f2f78645d3..292395a55a 100644 --- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java @@ -65,7 +65,11 @@ public class XARecoveryConfig { final ClientProtocolManagerFactory clientProtocolManager) { TransportConfiguration[] newTransportConfiguration = new TransportConfiguration[transportConfiguration.length]; for (int i = 0; i < transportConfiguration.length; i++) { - newTransportConfiguration[i] = transportConfiguration[i].newTransportConfig(""); + if (clientProtocolManager != null) { + newTransportConfiguration[i] = clientProtocolManager.adaptTransportConfiguration(transportConfiguration[i].newTransportConfig("")); + } else { + newTransportConfiguration[i] = transportConfiguration[i].newTransportConfig(""); + } } this.transportConfiguration = newTransportConfiguration;