svn commit: r612824 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java

[js...@apache.org]

Author: jstrachan
Date: Thu Jan 17 06:20:35 2008
New Revision: 612824

URL: http://svn.apache.org/viewvc?rev=612824&view=rev
Log:
added a little helper factory bean for https://issues.apache.org/activemq/browse/AMQ-1552 to allow easy failover configuration without explicit URI magic

Added:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java   (with props)

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java?rev=612824&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java Thu Jan 17 06:20:35 2008
@@ -0,0 +1,170 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.spring;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * A helper class for creating a failover configured {@link ActiveMQConnectionFactory}
+ * which supports one or more TCP based hostname/ports which can all be configured in a
+ * consistent way without too much URL hacking.
+ *
+ * @version $Revision: 1.1 $
+ */
+public class ActiveMQConnectionFactoryFactoryBean implements FactoryBean {
+    private List<String> tcpHostAndPorts = new ArrayList<String>();
+
+    // tcp properties
+    private Long maxInactivityDuration;
+    private String tcpProperties;
+
+    // failover properties
+    private Long maxReconnectDelay;
+    private String failoverProperties;
+
+    public Object getObject() throws Exception {
+        ActiveMQConnectionFactory answer = new ActiveMQConnectionFactory();
+        String brokerURL = getBrokerURL();
+        answer.setBrokerURL(brokerURL);
+        return answer;
+    }
+
+    public String getBrokerURL() {
+        StringBuffer buffer = new StringBuffer("failover:(");
+        int counter = 0;
+        for (String tcpHostAndPort : tcpHostAndPorts) {
+            if (counter++ > 0) {
+                buffer.append(",");
+            }
+            buffer.append(createTcpHostAndPortUrl(tcpHostAndPort));
+        }
+        buffer.append(")");
+
+        List<String> parameters = new ArrayList<String>();
+        if (maxReconnectDelay != null) {
+            parameters.add("maxReconnectDelay=" + maxReconnectDelay);
+        }
+        if (notEmpty(failoverProperties)) {
+            parameters.add(failoverProperties);
+        }
+        buffer.append(asQueryString(parameters));
+        return buffer.toString();
+    }
+
+    public Class getObjectType() {
+        return ActiveMQConnectionFactory.class;
+    }
+
+    public boolean isSingleton() {
+        return true;
+    }
+
+    // Properties
+    //-------------------------------------------------------------------------
+
+    public List<String> getTcpHostAndPorts() {
+        return tcpHostAndPorts;
+    }
+
+    public void setTcpHostAndPorts(List<String> tcpHostAndPorts) {
+        this.tcpHostAndPorts = tcpHostAndPorts;
+    }
+
+    public void setTcpHostAndPort(String tcpHostAndPort) {
+        tcpHostAndPorts = new ArrayList<String>();
+        tcpHostAndPorts.add(tcpHostAndPort);
+    }
+
+    public Long getMaxInactivityDuration() {
+        return maxInactivityDuration;
+    }
+
+    public void setMaxInactivityDuration(Long maxInactivityDuration) {
+        this.maxInactivityDuration = maxInactivityDuration;
+    }
+
+    public String getTcpProperties() {
+        return tcpProperties;
+    }
+
+    public void setTcpProperties(String tcpProperties) {
+        this.tcpProperties = tcpProperties;
+    }
+
+    public Long getMaxReconnectDelay() {
+        return maxReconnectDelay;
+    }
+
+    public void setMaxReconnectDelay(Long maxReconnectDelay) {
+        this.maxReconnectDelay = maxReconnectDelay;
+    }
+
+    public String getFailoverProperties() {
+        return failoverProperties;
+    }
+
+    public void setFailoverProperties(String failoverProperties) {
+        this.failoverProperties = failoverProperties;
+    }
+
+    // Implementation methods
+    //-------------------------------------------------------------------------
+
+    /**
+     * Turns a list of query string key=value strings into a query URL string
+     * of the form "?a=x&b=y"
+     */
+    protected String asQueryString(List<String> parameters) {
+        int size = parameters.size();
+        if (size < 1) {
+            return "";
+        }
+        else {
+            StringBuffer buffer = new StringBuffer("?");
+            buffer.append(parameters.get(0));
+            for (int i = 1; i < size; i++) {
+                buffer.append("&");
+                buffer.append(parameters.get(i));
+            }
+            return buffer.toString();
+        }
+    }
+
+    /**
+     * Allows us to add any TCP specific URI configurations
+     */
+    protected String createTcpHostAndPortUrl(String tcpHostAndPort) {
+        List<String> parameters = new ArrayList<String>();
+        if (maxInactivityDuration != null) {
+            parameters.add("wireFormat.maxInactivityDuration=" + maxInactivityDuration);
+        }
+        if (notEmpty(tcpProperties)) {
+            parameters.add(tcpProperties);
+        }
+        return tcpHostAndPort + asQueryString(parameters);
+    }
+
+
+    protected boolean notEmpty(String text) {
+        return text != null && text.length() > 0;
+    }
+
+}

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java?rev=612824&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java (added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java Thu Jan 17 06:20:35 2008
@@ -0,0 +1,94 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.spring;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class ActiveMQConnectionFactoryFactoryBeanTest extends TestCase {
+    private static final transient Log LOG = LogFactory.getLog(ActiveMQConnectionFactoryFactoryBeanTest.class);
+
+    private ActiveMQConnectionFactoryFactoryBean factory;
+
+
+    public void testSingleTcpURL() throws Exception {
+        factory.setTcpHostAndPort("tcp://localhost:61616");
+        assertCreatedURL("failover:(tcp://localhost:61616)");
+    }
+
+    public void testSingleTcpURLWithInactivityTimeout() throws Exception {
+        factory.setTcpHostAndPort("tcp://localhost:61616");
+        factory.setMaxInactivityDuration(60000L);
+        assertCreatedURL("failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=60000)");
+    }
+
+    public void testSingleTcpURLWithInactivityTimeoutAndTcpNoDelay() throws Exception {
+        factory.setTcpHostAndPort("tcp://localhost:61616");
+        factory.setMaxInactivityDuration(50000L);
+        factory.setTcpProperties("tcpNoDelayEnabled=true");
+        assertCreatedURL("failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=50000&tcpNoDelayEnabled=true)");
+    }
+
+    public void testSingleTcpURLWithInactivityTimeoutAndMaxReconnectDelay() throws Exception {
+        factory.setTcpHostAndPort("tcp://localhost:61616");
+        factory.setMaxInactivityDuration(60000L);
+        factory.setMaxReconnectDelay(50000L);
+        assertCreatedURL("failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=60000)?maxReconnectDelay=50000");
+    }
+
+    public void testSingleTcpURLWithInactivityTimeoutAndMaxReconnectDelayAndFailoverProperty() throws Exception {
+        factory.setTcpHostAndPort("tcp://localhost:61616");
+        factory.setMaxInactivityDuration(40000L);
+        factory.setMaxReconnectDelay(30000L);
+        factory.setFailoverProperties("useExponentialBackOff=false");
+
+        assertCreatedURL("failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=40000)?maxReconnectDelay=30000&useExponentialBackOff=false");
+    }
+
+    public void testMultipleTcpURLsWithInactivityTimeoutAndMaxReconnectDelayAndFailoverProperty() throws Exception {
+        factory.setTcpHostAndPorts(Arrays.asList(new String[] {"tcp://localhost:61618", "tcp://foo:61619"}));
+        factory.setMaxInactivityDuration(40000L);
+        factory.setMaxReconnectDelay(30000L);
+        factory.setFailoverProperties("useExponentialBackOff=false");
+
+        assertCreatedURL("failover:(tcp://localhost:61618?wireFormat.maxInactivityDuration=40000,tcp://foo:61619?wireFormat.maxInactivityDuration=40000)?maxReconnectDelay=30000&useExponentialBackOff=false");
+    }
+
+    protected void assertCreatedURL(String expectedURL) throws Exception {
+        String url = factory.getBrokerURL();
+        LOG.debug("Generated URL: " + url);
+
+        assertEquals("URL", expectedURL, url);
+        Object value = factory.getObject();
+        assertTrue("Value should be an ActiveMQConnectionFactory", value instanceof ActiveMQConnectionFactory);
+        ActiveMQConnectionFactory connectionFactory = (ActiveMQConnectionFactory) value;
+        String brokerURL = connectionFactory.getBrokerURL();
+        assertEquals("brokerURL", expectedURL, brokerURL);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        factory = new ActiveMQConnectionFactoryFactoryBean();
+    }
+}

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java
------------------------------------------------------------------------------
    svn:eol-style = native