You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/07/08 14:31:36 UTC
[qpid-broker-j] branch master updated (c5b299c -> 9e7a78e)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from c5b299c QPID-8339: [Broker-J] Upgrade junit test dependency to version 4.12
new 3d899fc QPID-8334: [Broker-J] Remove duplicate hamcrest test dependency declarations
new 22031f4 QPID-8334: [Broker-J] Stop using hamcrest deprecated matchers
new 3a483fa NO-JIRA: Remove unused property
new f789d02 NO-JIRA: Fix test failure
new e22ff60 NO-JIRA: [Tests] Remove deprecated method setSslPort from ConnectionBuilder
new 9e7a78e QPID-8340: [Broker-J] Upgrade mockito to version 2.28.2
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
broker-core/pom.xml | 5 ----
pom.xml | 3 +-
systests/protocol-tests-amqp-0-10/pom.xml | 6 ----
systests/protocol-tests-amqp-0-8/pom.xml | 6 ----
.../extensions/soleconn/CloseExistingPolicy.java | 10 +++----
.../soleconn/RefuseConnectionPolicy.java | 4 +--
.../protocol/v1_0/messaging/MultiTransferTest.java | 8 +++---
.../protocol/v1_0/messaging/TransferTest.java | 4 +--
.../v1_0/transport/link/ResumeDeliveriesTest.java | 6 ++--
systests/qpid-systests-http-management/pom.xml | 6 ----
.../PreemptiveAuthenticationTest.java | 5 +++-
.../qpid/tests/http/rest/model/ReadTest.java | 4 +--
.../apache/qpid/systests/ConnectionBuilder.java | 3 --
.../systests/QpidJmsClient0xConnectionBuilder.java | 12 ++------
.../systests/QpidJmsClientConnectionBuilder.java | 26 +++++-------------
systests/qpid-systests-jms_1.1/pom.xml | 6 ----
.../extensions/management/AmqpManagementTest.java | 2 +-
.../extensions/sasl/AuthenticationTest.java | 18 ++++++------
.../systests/jms_1_1/extensions/tls/TlsTest.java | 32 +++++++++++-----------
19 files changed, 58 insertions(+), 108 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 03/06: NO-JIRA: Remove unused property
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 3a483faa04f40bd2578a616c5c97ff6cb4a72a55
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 8 13:48:32 2019 +0100
NO-JIRA: Remove unused property
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9d179b5..9c51629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,6 @@
<bcel-version>6.3.1</bcel-version>
<velocity-version>1.4</velocity-version>
- <jython-version>2.5.3</jython-version>
<csvjdbc-version>1.0.35</csvjdbc-version>
<jfreechart-version>1.0.13</jfreechart-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 06/06: QPID-8340: [Broker-J] Upgrade mockito to
version 2.28.2
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 9e7a78efbc412239a4dc9f07e3537d6e141a8c32
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 8 15:25:25 2019 +0100
QPID-8340: [Broker-J] Upgrade mockito to version 2.28.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9c51629..9220aaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<!-- test dependency version numbers -->
<junit-version>4.12</junit-version>
- <mockito-version>2.22.0</mockito-version>
+ <mockito-version>2.28.2</mockito-version>
<netty-version>4.1.32.Final</netty-version>
<hamcrest-version>2.1</hamcrest-version>
<maven-core-version>3.5.4</maven-core-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 05/06: NO-JIRA: [Tests] Remove deprecated method
setSslPort from ConnectionBuilder
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit e22ff60044895d4e65b97376c442984872272ef9
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 8 15:24:16 2019 +0100
NO-JIRA: [Tests] Remove deprecated method setSslPort from ConnectionBuilder
---
.../apache/qpid/systests/ConnectionBuilder.java | 3 --
.../systests/QpidJmsClient0xConnectionBuilder.java | 12 ++------
.../systests/QpidJmsClientConnectionBuilder.java | 26 +++++-------------
.../extensions/management/AmqpManagementTest.java | 2 +-
.../extensions/sasl/AuthenticationTest.java | 18 ++++++------
.../systests/jms_1_1/extensions/tls/TlsTest.java | 32 +++++++++++-----------
6 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/ConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/ConnectionBuilder.java
index fe64610..04cd4e1 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/ConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/ConnectionBuilder.java
@@ -35,9 +35,6 @@ public interface ConnectionBuilder
ConnectionBuilder setHost(String host);
ConnectionBuilder setPort(int port);
- @Deprecated
- ConnectionBuilder setSslPort(int port);
-
ConnectionBuilder setPrefetch(int prefetch);
ConnectionBuilder setClientId(String clientId);
ConnectionBuilder setUsername(String username);
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
index 7935cb3..3219582 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
@@ -52,7 +52,6 @@ public class QpidJmsClient0xConnectionBuilder implements ConnectionBuilder
private int _connectdelay;
private String _host = "localhost";
private int _port;
- private int _sslPort;
private String _keyStoreLocation;
private String _keyStorePassword;
private String _trustStoreLocation;
@@ -72,7 +71,7 @@ public class QpidJmsClient0xConnectionBuilder implements ConnectionBuilder
public ConnectionBuilder setPort(final int port)
{
_port = port;
- return setSslPort(port);
+ return this;
}
@Override
@@ -83,13 +82,6 @@ public class QpidJmsClient0xConnectionBuilder implements ConnectionBuilder
}
@Override
- public ConnectionBuilder setSslPort(final int port)
- {
- _sslPort = port;
- return this;
- }
-
- @Override
public ConnectionBuilder setPrefetch(final int prefetch)
{
_options.put("maxprefetch", prefetch);
@@ -329,7 +321,7 @@ public class QpidJmsClient0xConnectionBuilder implements ConnectionBuilder
cUrlBuilder.append("?");
final List<Integer> copy = new ArrayList<>(_failoverPorts.size() + 1);
- copy.add(_enableTls ? _sslPort : _port);
+ copy.add(_port);
if (_enableFailover)
{
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
index c47e81e..dc39edb 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
@@ -46,7 +46,6 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
private static final AtomicInteger CLIENTID_COUNTER = new AtomicInteger();
private String _host;
private int _port;
- private int _sslPort;
private Map<String, Object> _options;
private boolean _enableTls;
private boolean _enableFailover;
@@ -73,7 +72,7 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
public ConnectionBuilder setPort(final int port)
{
_port = port;
- return setSslPort(port);
+ return this;
}
@Override
@@ -84,13 +83,6 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
}
@Override
- public ConnectionBuilder setSslPort(final int port)
- {
- _sslPort = port;
- return this;
- }
-
- @Override
public ConnectionBuilder setPrefetch(final int prefetch)
{
_options.put("jms.prefetchPolicy.all", prefetch);
@@ -341,7 +333,7 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
final String transportQuery = transportQueryBuilder.toString();
final List<Integer> copy = new ArrayList<>(_failoverPorts.size() + 1);
- copy.add(_enableTls ? _sslPort : _port);
+ copy.add(_port);
copy.addAll(_failoverPorts);
final String failover = copy.stream()
@@ -350,17 +342,13 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
connectionUrlBuilder.append(failover);
appendOptions(options, connectionUrlBuilder);
}
- else if (!_enableTls)
+ connectionUrlBuilder.append(_transport);
+ if (_enableTls)
{
- connectionUrlBuilder.append(_transport).append("://").append(_host).append(":").append(_port);
-
- appendOptions(options, connectionUrlBuilder);
- }
- else
- {
- connectionUrlBuilder.append(_transport).append("s").append("://").append(_host).append(":").append(_sslPort);
- appendOptions(options, connectionUrlBuilder);
+ connectionUrlBuilder.append("s");
}
+ connectionUrlBuilder.append("://").append(_host).append(":").append(_port);
+ appendOptions(options, connectionUrlBuilder);
return connectionUrlBuilder.toString();
}
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/management/AmqpManagementTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/management/AmqpManagementTest.java
index 4704829..d6aa747 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/management/AmqpManagementTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/management/AmqpManagementTest.java
@@ -692,7 +692,7 @@ public class AmqpManagementTest extends JmsTestBase
getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP).getPort());
Connection connection = getConnectionBuilder().setTls(true)
- .setSslPort(tlsPort)
+ .setPort(tlsPort)
.setTrustStoreLocation(TRUSTSTORE)
.setTrustStorePassword(TRUSTSTORE_PASSWORD)
.build();
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/sasl/AuthenticationTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/sasl/AuthenticationTest.java
index 9661a6d..e5f033f 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/sasl/AuthenticationTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/sasl/AuthenticationTest.java
@@ -157,7 +157,7 @@ public class AuthenticationTest extends JmsTestBase
{
int port = createExternalProviderAndTlsPort();
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -185,7 +185,7 @@ public class AuthenticationTest extends JmsTestBase
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -215,7 +215,7 @@ public class AuthenticationTest extends JmsTestBase
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(TEST_PROFILE_RESOURCE_BASE + EXPIRED_KEYSTORE)
@@ -240,7 +240,7 @@ public class AuthenticationTest extends JmsTestBase
trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, true);
int port = createExternalProviderAndTlsPort(trustStoreAttributes);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -262,7 +262,7 @@ public class AuthenticationTest extends JmsTestBase
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -311,7 +311,7 @@ public class AuthenticationTest extends JmsTestBase
trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, true);
int port = createExternalProviderAndTlsPort(trustStoreAttributes, trustStoreName, false);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -330,7 +330,7 @@ public class AuthenticationTest extends JmsTestBase
}
//use the app2 cert, which is NOT in the peerstore (but is signed by the same CA as app1)
- Connection connection2 = getConnectionBuilder().setSslPort(port)
+ Connection connection2 = getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -359,7 +359,7 @@ public class AuthenticationTest extends JmsTestBase
String clientId = getTestName();
int port = createExternalProviderAndTlsPort(trustStoreAttributes, null, true);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
@@ -392,7 +392,7 @@ public class AuthenticationTest extends JmsTestBase
String clientId = getTestName();
int port = createExternalProviderAndTlsPort(trustStoreAttributes, null, false);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setTls(true)
.setSaslMechanisms(ExternalAuthenticationManagerImpl.MECHANISM_NAME)
.setKeyStoreLocation(KEYSTORE)
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
index 71d5e3c..01d69f3 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
@@ -124,7 +124,7 @@ public class TlsTest extends JmsTestBase
int port = configureTlsPort(getTestPortName(), true, false, false);
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost(brokerAddress.getHostName())
.setTls(true)
.setKeyStoreLocation(KEYSTORE)
@@ -153,7 +153,7 @@ public class TlsTest extends JmsTestBase
File trustCertFile = extractCertFileFromTestTrustStore();
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost(brokerAddress.getHostName())
.setTls(true)
.setOptions(Collections.singletonMap("trusted_certs_path",
@@ -178,7 +178,7 @@ public class TlsTest extends JmsTestBase
try
{
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- getConnectionBuilder().setSslPort(brokerAddress.getPort())
+ getConnectionBuilder().setPort(brokerAddress.getPort())
.setHost(brokerAddress.getHostName())
.setTls(true)
.build();
@@ -205,7 +205,7 @@ public class TlsTest extends JmsTestBase
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setHost("127.0.0.1")
.setTls(true)
.setKeyStoreLocation(KEYSTORE)
@@ -220,7 +220,7 @@ public class TlsTest extends JmsTestBase
// PASS
}
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost("127.0.0.1")
.setTls(true)
.setKeyStoreLocation(KEYSTORE)
@@ -247,7 +247,7 @@ public class TlsTest extends JmsTestBase
setSslStoreSystemProperties();
try
{
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setTls(true)
.build();
try
@@ -274,7 +274,7 @@ public class TlsTest extends JmsTestBase
try
{
Connection connection = getConnectionBuilder().setClientId(getTestName())
- .setSslPort(port)
+ .setPort(port)
.setTls(true)
.setKeyAlias(TestSSLConstants.CERT_ALIAS_APP1)
.build();
@@ -287,7 +287,7 @@ public class TlsTest extends JmsTestBase
connection.close();
}
- Connection connection2 = getConnectionBuilder().setSslPort(port)
+ Connection connection2 = getConnectionBuilder().setPort(port)
.setTls(true)
.setKeyAlias(TestSSLConstants.CERT_ALIAS_APP2)
.build();
@@ -317,7 +317,7 @@ public class TlsTest extends JmsTestBase
setSslStoreSystemProperties();
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setHost("127.0.0.1")
.setTls(true)
.setVerifyHostName(true)
@@ -343,7 +343,7 @@ public class TlsTest extends JmsTestBase
setSslStoreSystemProperties();
try
{
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost("localhost")
.setTls(true)
.build();
@@ -369,7 +369,7 @@ public class TlsTest extends JmsTestBase
int port = configureTlsPort(getTestPortName(), false, true, false);
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost(brokerAddress.getHostName())
.setTls(true)
.setTrustStoreLocation(TRUSTSTORE)
@@ -395,7 +395,7 @@ public class TlsTest extends JmsTestBase
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setHost(getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP).getHostName())
.setTls(true)
.setTrustStoreLocation(TRUSTSTORE)
@@ -416,7 +416,7 @@ public class TlsTest extends JmsTestBase
int port = configureTlsPort(getTestPortName(), false, true, false);
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost(brokerAddress.getHostName())
.setTls(true)
.setTrustStoreLocation(TRUSTSTORE)
@@ -441,7 +441,7 @@ public class TlsTest extends JmsTestBase
try
{
- getConnectionBuilder().setSslPort(port)
+ getConnectionBuilder().setPort(port)
.setHost(getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP).getHostName())
.setTls(true)
.setTrustStoreLocation(TRUSTSTORE)
@@ -463,7 +463,7 @@ public class TlsTest extends JmsTestBase
int port = configureTlsPort(getTestPortName(), false, true, true);
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost(brokerAddress.getHostName())
.setTls(true)
.setKeyStoreLocation(KEYSTORE)
@@ -513,7 +513,7 @@ public class TlsTest extends JmsTestBase
options.put("client_cert_path", encodePathOption(certAndKeyFiles[1].getCanonicalPath()));
options.put("client_cert_priv_key_path", encodePathOption(certAndKeyFiles[0].getCanonicalPath()));
InetSocketAddress brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP);
- Connection connection = getConnectionBuilder().setSslPort(port)
+ Connection connection = getConnectionBuilder().setPort(port)
.setHost(brokerAddress.getHostName())
.setTls(true)
.setTrustStoreLocation(TRUSTSTORE)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 04/06: NO-JIRA: Fix test failure
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit f789d02f6b33c8eb46660ef5f36e4b22a8fa4acf
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 8 14:57:16 2019 +0100
NO-JIRA: Fix test failure
---
.../qpid/tests/http/authentication/PreemptiveAuthenticationTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
index 940d51c..8b73bc2 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
@@ -38,6 +38,7 @@ import static org.junit.Assume.assumeThat;
import java.io.ByteArrayOutputStream;
import java.net.HttpURLConnection;
+import java.net.InetAddress;
import java.net.SocketException;
import java.security.KeyStore;
import java.security.cert.Certificate;
@@ -45,10 +46,12 @@ import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayDeque;
+import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import javax.net.ssl.SSLHandshakeException;
@@ -328,7 +331,7 @@ public class PreemptiveAuthenticationTest extends HttpTestBase
Duration.of(365, ChronoUnit.DAYS).getSeconds(),
x500Name,
Collections.emptySet(),
- Collections.emptySet());
+ Collections.singleton(InetAddress.getLoopbackAddress()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/06: QPID-8334: [Broker-J] Stop using hamcrest
deprecated matchers
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 22031f4ee8bad4d7cd2fa6d240bfc1e3cb52d832
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 8 13:47:28 2019 +0100
QPID-8334: [Broker-J] Stop using hamcrest deprecated matchers
---
.../protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java | 10 +++++-----
.../v1_0/extensions/soleconn/RefuseConnectionPolicy.java | 4 ++--
.../qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java | 8 ++++----
.../qpid/tests/protocol/v1_0/messaging/TransferTest.java | 4 ++--
.../protocol/v1_0/transport/link/ResumeDeliveriesTest.java | 6 +++---
.../java/org/apache/qpid/tests/http/rest/model/ReadTest.java | 4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
index 5be5482..8e4f676 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
@@ -28,8 +28,8 @@ import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isIn;
import static org.junit.Assume.assumeThat;
import java.net.InetSocketAddress;
@@ -79,7 +79,7 @@ public class CloseExistingPolicy extends BrokerAdminUsingTestBase
if (responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
@@ -119,7 +119,7 @@ public class CloseExistingPolicy extends BrokerAdminUsingTestBase
if (responseOpen2.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen2.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
@@ -159,7 +159,7 @@ public class CloseExistingPolicy extends BrokerAdminUsingTestBase
if (responseOpen2.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen2.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
@@ -205,7 +205,7 @@ public class CloseExistingPolicy extends BrokerAdminUsingTestBase
if (responseOpen2.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen2.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
index dea12a3..ca7d4a7 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
@@ -29,8 +29,8 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isIn;
import static org.junit.Assume.assumeThat;
import java.net.InetSocketAddress;
@@ -80,7 +80,7 @@ public class RefuseConnectionPolicy extends BrokerAdminUsingTestBase
if (responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
{
assertThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
- isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ in(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
SoleConnectionDetectionPolicy.WEAK.getValue()}));
}
}
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
index 0a45410..126c882 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.oneOf;
import java.net.InetSocketAddress;
import java.util.HashMap;
@@ -127,7 +127,7 @@ public class MultiTransferTest extends BrokerAdminUsingTestBase
payload.dispose();
}
assertThat(disposition.getFirst(), is(equalTo(deliveryId)));
- assertThat(disposition.getLast(), isOneOf(null, deliveryId));
+ assertThat(disposition.getLast(), oneOf(null, deliveryId));
assertThat(disposition.getSettled(), is(equalTo(false)));
}
}
@@ -187,7 +187,7 @@ public class MultiTransferTest extends BrokerAdminUsingTestBase
payload.dispose();
}
assertThat(disposition.getFirst(), is(equalTo(deliveryId)));
- assertThat(disposition.getLast(), isOneOf(null, deliveryId));
+ assertThat(disposition.getLast(), oneOf(null, deliveryId));
assertThat(disposition.getSettled(), is(equalTo(false)));
assertThat(disposition.getState(), is(instanceOf(Accepted.class)));
}
@@ -327,7 +327,7 @@ public class MultiTransferTest extends BrokerAdminUsingTestBase
.getLatestResponse(Disposition.class);
dispositionMap.put(disposition.getFirst(), disposition);
- assertThat(disposition.getLast(), isOneOf(null, disposition.getFirst()));
+ assertThat(disposition.getLast(), oneOf(null, disposition.getFirst()));
assertThat(disposition.getSettled(), is(equalTo(false)));
assertThat(disposition.getState(), is(instanceOf(Accepted.class)));
}
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
index da7f82a..53a8af6 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
@@ -29,10 +29,10 @@ import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isOneOf;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.oneOf;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
@@ -706,7 +706,7 @@ public class TransferTest extends BrokerAdminUsingTestBase
Transfer second = interaction.consumeResponse(Transfer.class)
.getLatestResponse(Transfer.class);
- assertThat(second.getMore(), isOneOf(false, null));
+ assertThat(second.getMore(), oneOf(false, null));
messageDecoder.addTransfer(second);
assertThat(messageDecoder.getData(), is(equalTo(testMessageData)));
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
index ad56ea9..a98d76f 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
@@ -27,7 +27,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.isIn;
+import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.typeCompatibleWith;
@@ -245,7 +245,7 @@ public class ResumeDeliveriesTest extends BrokerAdminUsingTestBase
assertThat(remoteUnsettled.keySet(), is(not(empty())));
for (Binary deliveryTag : remoteUnsettled.keySet())
{
- assertThat(deliveryTag, isIn(localUnsettled.keySet()));
+ assertThat(deliveryTag, in(localUnsettled.keySet()));
}
assertThat(responseAttach2.getIncompleteUnsettled(), is(equalTo(true)));
}
@@ -428,7 +428,7 @@ public class ResumeDeliveriesTest extends BrokerAdminUsingTestBase
assertThat(remoteUnsettled.keySet(), is(not(empty())));
for (Binary deliveryTag : remoteUnsettled.keySet())
{
- assertThat(deliveryTag, isIn(localUnsettled.keySet()));
+ assertThat(deliveryTag, in(localUnsettled.keySet()));
}
assertThat(resumingAttach.getIncompleteUnsettled(), is(equalTo(true)));
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
index 8dda12b..ac4e897 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
@@ -30,7 +30,7 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.oneOf;
import static org.junit.Assume.assumeThat;
import java.io.ByteArrayInputStream;
@@ -321,7 +321,7 @@ public class ReadTest extends HttpTestBase
Map<String, Object> parentAttrs = Collections.singletonMap(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE);
int response = getHelper().submitRequest(parentUrl, "PUT", parentAttrs);
- assertThat(response, is(isOneOf(SC_CREATED, SC_OK)));
+ assertThat(response, is(oneOf(SC_CREATED, SC_OK)));
final String childUrl = String.format("virtualhostloginclusionrule/%s/%s", loggerName, inclusionRuleName);
Map<String, Object> childAttrs = Collections.singletonMap(ConfiguredObject.TYPE, VirtualHostNameAndLevelLogInclusionRule.TYPE);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/06: QPID-8334: [Broker-J] Remove duplicate
hamcrest test dependency declarations
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 3d899fcce2be4cbe1e6878c0e8ef74549b5e23ae
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 8 13:20:21 2019 +0100
QPID-8334: [Broker-J] Remove duplicate hamcrest test dependency declarations
---
broker-core/pom.xml | 5 -----
systests/protocol-tests-amqp-0-10/pom.xml | 6 ------
systests/protocol-tests-amqp-0-8/pom.xml | 6 ------
systests/qpid-systests-http-management/pom.xml | 6 ------
systests/qpid-systests-jms_1.1/pom.xml | 6 ------
5 files changed, 29 deletions(-)
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 4eb2946..e846559 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -92,11 +92,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml
index 4c1e3f1..59e44c7 100644
--- a/systests/protocol-tests-amqp-0-10/pom.xml
+++ b/systests/protocol-tests-amqp-0-10/pom.xml
@@ -76,12 +76,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml
index 4abae83..57ebd8a 100644
--- a/systests/protocol-tests-amqp-0-8/pom.xml
+++ b/systests/protocol-tests-amqp-0-8/pom.xml
@@ -76,12 +76,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml
index de83e47..4e8c6ab 100644
--- a/systests/qpid-systests-http-management/pom.xml
+++ b/systests/qpid-systests-http-management/pom.xml
@@ -100,12 +100,6 @@
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-core</artifactId>
<classifier>tests</classifier>
diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml
index be9fa90..aeb83ab 100644
--- a/systests/qpid-systests-jms_1.1/pom.xml
+++ b/systests/qpid-systests-jms_1.1/pom.xml
@@ -65,12 +65,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<profiles>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org