From ea898332049fa6817db85d0a0b0be94b6cf4a67c Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 10 Oct 2017 13:47:01 -0400 Subject: [PATCH] ARTEMIS-1446 Use Contructor on TransformerConfiguration --- .../core/config/TransformerConfiguration.java | 13 +++---------- .../deployers/impl/FileConfigurationParser.java | 4 ++-- .../management/impl/ActiveMQServerControlImpl.java | 6 +++--- .../integration/cluster/bridge/BridgeTest.java | 4 ++-- .../integration/management/DivertControlTest.java | 2 +- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/TransformerConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/TransformerConfiguration.java index 17f27025b7b..36c9960be98 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/TransformerConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/TransformerConfiguration.java @@ -24,25 +24,18 @@ public final class TransformerConfiguration implements Serializable { private static final long serialVersionUID = -1057244274380572226L; - private String className = null; + private final String className; private Map properties = new HashMap<>(); - public TransformerConfiguration() { + public TransformerConfiguration(String className) { + this.className = className; } public String getClassName() { return className; } - /** - * @param className the class name to set - */ - public TransformerConfiguration setClassName(final String className) { - this.className = className; - return this; - } - public Map getProperties() { return properties; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java index def6b61bb17..bf9284061ee 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java @@ -1641,11 +1641,11 @@ private TransformerConfiguration getTransformerConfiguration(final Node node) { properties.put(key, value); } } - return new TransformerConfiguration().setClassName(className).setProperties(properties); + return new TransformerConfiguration(className).setProperties(properties); } private TransformerConfiguration getTransformerConfiguration(final String transformerClassName) { - return new TransformerConfiguration().setClassName(transformerClassName).setProperties(Collections.EMPTY_MAP); + return new TransformerConfiguration(transformerClassName).setProperties(Collections.EMPTY_MAP); } private void parseBridgeConfiguration(final Element brNode, final Configuration mainConfig) throws Exception { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java index 5a4b10ef7b1..08facbf16aa 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java @@ -2294,7 +2294,7 @@ public void createDivert(final String name, clearIO(); try { - TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration().setClassName(transformerClassName).setProperties(transformerProperties); + TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties); DivertConfiguration config = new DivertConfiguration().setName(name).setRoutingName(routingName).setAddress(address).setForwardingAddress(forwardingAddress).setExclusive(exclusive).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setRoutingType(DivertConfigurationRoutingType.valueOf(routingType)); server.deployDivert(config); } finally { @@ -2439,7 +2439,7 @@ public void createBridge(final String name, clearIO(); try { - TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration().setClassName(transformerClassName).setProperties(transformerProperties); + TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties); BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateDetection).setConfirmationWindowSize(confirmationWindowSize).setProducerWindowSize(producerWindowSize).setHA(ha).setUser(user).setPassword(password); if (useDiscoveryGroup) { @@ -2477,7 +2477,7 @@ public void createBridge(final String name, clearIO(); try { - TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration().setClassName(transformerClassName); + TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration(transformerClassName); BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateDetection).setConfirmationWindowSize(confirmationWindowSize).setHA(ha).setUser(user).setPassword(password); if (useDiscoveryGroup) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java index 88dff9b5d9b..3f7d1c65a1e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java @@ -973,7 +973,7 @@ private void internaltestWithTransformer(final boolean useFiles) throws Exceptio ArrayList staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setTransformerConfiguration(new TransformerConfiguration().setClassName(SimpleTransformer.class.getName())).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setTransformerConfiguration(new TransformerConfiguration(SimpleTransformer.class.getName())).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); List bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); @@ -1059,7 +1059,7 @@ public void testWithTransformerProperties() throws Exception { final String propValue = "true"; - TransformerConfiguration transformerConfiguration = new TransformerConfiguration().setClassName(AddHeadersTransformer.class.getName()); + TransformerConfiguration transformerConfiguration = new TransformerConfiguration(AddHeadersTransformer.class.getName()); transformerConfiguration.getProperties().put(propKey, propValue); Map server0Params = new HashMap<>(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java index 6483cedb4f0..749f626c649 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java @@ -81,7 +81,7 @@ public void setUp() throws Exception { CoreQueueConfiguration forwardQueueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false); divertConfig = new DivertConfiguration().setName(RandomUtil.randomString()).setRoutingName(RandomUtil.randomString()).setAddress(queueConfig.getAddress()).setForwardingAddress(forwardQueueConfig.getAddress()).setExclusive(RandomUtil.randomBoolean()). - setTransformerConfiguration(new TransformerConfiguration().setClassName(AddHeadersTransformer.class.getName())); + setTransformerConfiguration(new TransformerConfiguration(AddHeadersTransformer.class.getName())); TransportConfiguration connectorConfig = new TransportConfiguration(INVM_CONNECTOR_FACTORY);