Repository: qpid-jms Updated Branches: refs/heads/master 7f683f5f4 -> a91170e29
NO-JIRA: remove unused parameter Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6b36338b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6b36338b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6b36338b Branch: refs/heads/master Commit: 6b36338b7592c1afe58ad175f553ffd56a360924 Parents: 7f683f5 Author: Robert Gemmell <[email protected]> Authored: Tue Jun 16 10:01:55 2015 +0100 Committer: Robert Gemmell <[email protected]> Committed: Tue Jun 16 10:01:55 2015 +0100 ---------------------------------------------------------------------- .../qpid/jms/integration/ConnectionIntegrationTest.java | 2 +- .../jms/integration/IdleTimeoutIntegrationTest.java | 12 ++++++------ .../qpid/jms/integration/SaslIntegrationTest.java | 2 +- .../jms/provider/failover/FailoverRedirectTest.java | 6 +++--- .../org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b36338b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java index fb8f89b..afc7f72 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java @@ -142,7 +142,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { private void doAmqpHostnameTestImpl(String amqpHostname, boolean setHostnameOption, Matcher<?> hostnameMatcher) throws JMSException, InterruptedException, Exception, IOException { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { - testPeer.expectAnonymousConnect(true, null, hostnameMatcher); + testPeer.expectAnonymousConnect(null, hostnameMatcher); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b36338b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java index f4ef08a..67b326a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java @@ -52,7 +52,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { @Test(timeout = 5000) public void testIdleTimeoutIsAdvertisedByDefault() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { - testPeer.expectAnonymousConnect(true, greaterThan(UnsignedInteger.valueOf(0)), null); + testPeer.expectAnonymousConnect(greaterThan(UnsignedInteger.valueOf(0)), null); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); @@ -75,7 +75,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { int configuredTimeout = 54320; int advertisedValue = configuredTimeout / 2; - testPeer.expectAnonymousConnect(true, equalTo(UnsignedInteger.valueOf(advertisedValue)), null); + testPeer.expectAnonymousConnect(equalTo(UnsignedInteger.valueOf(advertisedValue)), null); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); @@ -101,7 +101,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { testPeer.setAdvertisedIdleTimeout(advertisedTimeout); - testPeer.expectAnonymousConnect(true); + testPeer.expectAnonymousConnect(); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); @@ -139,7 +139,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { testPeer.setAdvertisedIdleTimeout(advertisedTimeout); - testPeer.expectAnonymousConnect(true); + testPeer.expectAnonymousConnect(); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); @@ -168,7 +168,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { int configuredTimeout = 200; - testPeer.expectAnonymousConnect(true); + testPeer.expectAnonymousConnect(); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); @@ -203,7 +203,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { final CountDownLatch latch = new CountDownLatch(cycles); - testPeer.expectAnonymousConnect(true); + testPeer.expectAnonymousConnect(); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b36338b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java index 5e5b327..fc658c9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java @@ -114,7 +114,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { public void testSaslAnonymousConnection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // Expect an ANOYMOUS connection - testPeer.expectAnonymousConnect(true); + testPeer.expectAnonymousConnect(); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b36338b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverRedirectTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverRedirectTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverRedirectTest.java index b0fb1da..ba74564 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverRedirectTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverRedirectTest.java @@ -60,7 +60,7 @@ public class FailoverRedirectTest extends QpidJmsTestCase { final String redirectURI = createPeerURI(redirectedPeer); LOG.info("Backup peer is at: {}", redirectURI); - redirectedPeer.expectAnonymousConnect(true); + redirectedPeer.expectAnonymousConnect(); redirectedPeer.expectBegin(true); Map<Symbol, Object> redirectInfo = new HashMap<Symbol, Object>(); @@ -103,7 +103,7 @@ public class FailoverRedirectTest extends QpidJmsTestCase { final String redirectURI = createPeerURI(redirectedPeer); LOG.info("Primary is at {}: Backup peer is at: {}", rejectingURI, redirectURI); - redirectedPeer.expectAnonymousConnect(true); + redirectedPeer.expectAnonymousConnect(); redirectedPeer.expectBegin(true); Map<Symbol, Object> redirectInfo = new HashMap<Symbol, Object>(); @@ -111,7 +111,7 @@ public class FailoverRedirectTest extends QpidJmsTestCase { redirectInfo.put(NETWORK_HOST, "localhost"); redirectInfo.put(PORT, redirectedPeer.getServerPort()); - rejectingPeer.expectAnonymousConnect(true); + rejectingPeer.expectAnonymousConnect(); rejectingPeer.expectBegin(true); rejectingPeer.remotelyCloseConnection(true, ConnectionError.REDIRECT, "Server is full, go away", redirectInfo); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b36338b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index 312c111..efc657b 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -410,12 +410,12 @@ public class TestAmqpPeer implements AutoCloseable addHandler(openMatcher); } - public void expectAnonymousConnect(boolean authorize) + public void expectAnonymousConnect() { - expectAnonymousConnect(authorize, null, null); + expectAnonymousConnect(null, null); } - public void expectAnonymousConnect(boolean authorize, Matcher<?> idleTimeoutMatcher, Matcher<?> hostnameMatcher) + public void expectAnonymousConnect(Matcher<?> idleTimeoutMatcher, Matcher<?> hostnameMatcher) { SaslMechanismsFrame saslMechanismsFrame = new SaslMechanismsFrame().setSaslServerMechanisms(Symbol.valueOf("ANONYMOUS")); addHandler(new HeaderHandlerImpl(AmqpHeader.SASL_HEADER, AmqpHeader.SASL_HEADER, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
