Repository: qpid-jms Updated Branches: refs/heads/master 96eeecde3 -> 9adca4aff
Start on getting the nested failover options feature tested and working. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9adca4af Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9adca4af Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9adca4af Branch: refs/heads/master Commit: 9adca4affdbbb4d00640b5e60a24e70d94c76ee5 Parents: 96eeecd Author: Timothy Bish <[email protected]> Authored: Thu Feb 5 18:49:54 2015 -0500 Committer: Timothy Bish <[email protected]> Committed: Thu Feb 5 18:49:54 2015 -0500 ---------------------------------------------------------------------- .../jms/provider/failover/FailoverProvider.java | 4 ++++ .../failover/FailoverProviderFactory.java | 2 +- .../provider/failover/FailoverUriPoolTest.java | 4 ++-- .../failover/FiloverProviderFactoryTest.java | 22 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9adca4af/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java index 94239d0..160455f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java @@ -867,6 +867,10 @@ public class FailoverProvider extends DefaultProviderListener implements Provide return this.requestTimeout; } + public Map<String, String> getNestedOptions() { + return uris.getNestedOptions(); + } + @Override public String toString() { return "FailoverProvider: " + http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9adca4af/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java index cc900a6..8799c34 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java @@ -36,7 +36,7 @@ public class FailoverProviderFactory extends ProviderFactory { Map<String, String> options = composite.getParameters(); Map<String, String> filtered = PropertyUtil.filterProperties(options, "failover."); - Map<String, String> nested = PropertyUtil.filterProperties(options, "nested."); + Map<String, String> nested = PropertyUtil.filterProperties(filtered, "nested."); FailoverProvider provider = new FailoverProvider(composite.getComponents(), nested); Map<String, String> unused = PropertyUtil.setProperties(provider, filtered); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9adca4af/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java index d678f8f..de4fe6e 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java @@ -37,7 +37,7 @@ public class FailoverUriPoolTest { @Before public void setUp() throws Exception { - List<URI> uris = new ArrayList<URI>(); + uris = new ArrayList<URI>(); uris.add(new URI("tcp://192.168.2.1:5672")); uris.add(new URI("tcp://192.168.2.2:5672")); @@ -53,7 +53,7 @@ public class FailoverUriPoolTest { @Test public void testCreateEmptyPoolWithURIs() throws URISyntaxException { - FailoverUriPool pool = new FailoverUriPool(uris.toArray(new URI[1]), null); + FailoverUriPool pool = new FailoverUriPool(uris.toArray(new URI[0]), null); assertEquals(FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, pool.isRandomize()); assertNotNull(pool.getNestedOptions()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9adca4af/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java index 7ee3715..4b43ef3 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java @@ -17,11 +17,13 @@ package org.apache.qpid.jms.provider.failover; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.net.URI; import java.net.URISyntaxException; +import java.util.Map; import org.apache.qpid.jms.provider.Provider; import org.junit.Before; @@ -98,4 +100,24 @@ public class FiloverProviderFactoryTest { assertEquals(FailoverProvider.DEFAULT_RECONNECT_BACKOFF_MULTIPLIER + 1.0d, failover.getReconnectBackOffMultiplier(), 0.0); assertEquals(!FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, failover.isRandomize()); } + + @Test(timeout = 60000) + public void testNestedOptionsArePassedAlong() throws Exception { + URI configured = new URI(baseURI.toString() + + "?failover.nested.transport.tcpNoDelay=true&failover.randomize=false"); + + Provider provider = factory.createProvider(configured); + assertNotNull(provider); + assertTrue(provider instanceof FailoverProvider); + + FailoverProvider failover = (FailoverProvider) provider; + assertFalse(failover.isRandomize()); + + Map<String, String> nested = failover.getNestedOptions(); + assertNotNull(nested); + assertFalse(nested.isEmpty()); + assertEquals(1, nested.size()); + + assertEquals("true", nested.get("transport.tcpNoDelay")); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
