You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/07/07 15:20:26 UTC
svn commit: r1689658 - in /qpid/java/trunk:
client/src/main/java/org/apache/qpid/client/
client/src/main/java/org/apache/qpid/client/protocol/
common/src/main/java/org/apache/qpid/configuration/
common/src/main/java/org/apache/qpid/transport/ common/sr...
Author: rgodfrey
Date: Tue Jul 7 13:20:25 2015
New Revision: 1689658
URL: http://svn.apache.org/r1689658
Log:
QPID-6629 : Remove deprecated constants from the API
Added:
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java (with props)
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java Tue Jul 7 13:20:25 2015
@@ -66,9 +66,13 @@ import org.apache.qpid.transport.network
public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate
{
private static final Logger _logger = LoggerFactory.getLogger(AMQConnectionDelegate_8_0.class);
+
+ // deprectaed legacy name for the option
+ private static final String AMQJ_DEFAULT_SYNCWRITE_TIMEOUT = "amqj.default_syncwrite_timeout";
+
private final AMQConnection _conn;
private final long _timeout = Long.getLong(ClientProperties.QPID_SYNC_OP_TIMEOUT,
- Long.getLong(ClientProperties.AMQJ_DEFAULT_SYNCWRITE_TIMEOUT,
+ Long.getLong(AMQJ_DEFAULT_SYNCWRITE_TIMEOUT,
ClientProperties.DEFAULT_SYNC_OPERATION_TIMEOUT));
private boolean _messageCompressionSupported;
private boolean _addrSyntaxSupported;
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java Tue Jul 7 13:20:25 2015
@@ -41,8 +41,7 @@ public class BrokerDetails implements Se
public static final String OPTIONS_CONNECT_TIMEOUT = "connecttimeout";
public static final String OPTIONS_CONNECT_DELAY = "connectdelay";
public static final String OPTIONS_HEARTBEAT = "heartbeat";
- @Deprecated
- public static final String OPTIONS_IDLE_TIMEOUT = "idle_timeout";
+ private static final String OPTIONS_IDLE_TIMEOUT = "idle_timeout";
public static final String OPTIONS_SASL_MECHS = "sasl_mechs";
public static final String OPTIONS_SASL_ENCRYPTION = "sasl_encryption";
public static final String OPTIONS_SSL = "ssl";
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Tue Jul 7 13:20:25 2015
@@ -126,6 +126,7 @@ public class AMQProtocolHandler implemen
private static final boolean PROTOCOL_DEBUG = (System.getProperty("amqj.protocol.logging.level") != null);
private static final long MAXIMUM_STATE_WAIT_TIME = Long.parseLong(System.getProperty("amqj.MaximumStateWait", "30000"));
+ private static final String AMQJ_DEFAULT_SYNCWRITE_TIMEOUT = "amqj.default_syncwrite_timeout";
/**
* The connection that this protocol handler is associated with. There is a 1-1 mapping between connection
@@ -163,7 +164,7 @@ public class AMQProtocolHandler implemen
/** Defines the default timeout to use for synchronous protocol commands. */
private final long DEFAULT_SYNC_TIMEOUT = Long.getLong(ClientProperties.QPID_SYNC_OP_TIMEOUT,
- Long.getLong(ClientProperties.AMQJ_DEFAULT_SYNCWRITE_TIMEOUT,
+ Long.getLong(AMQJ_DEFAULT_SYNCWRITE_TIMEOUT,
ClientProperties.DEFAULT_SYNC_OPERATION_TIMEOUT));
/** Object to lock on when changing the latch */
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java Tue Jul 7 13:20:25 2015
@@ -76,20 +76,6 @@ public class ClientProperties
public static final String SYNC_PUBLISH_PROP_NAME = "sync_publish";
/**
- * Frequency of heartbeat messages (in milliseconds)
- * @see #QPID_HEARTBEAT_INTERVAL
- */
- @Deprecated
- public static final String IDLE_TIMEOUT_PROP_NAME = "idle_timeout";
-
- /**
- * Frequency of heartbeat messages (in seconds)
- * @see #QPID_HEARTBEAT_INTERVAL
- */
- @Deprecated
- public static final String AMQJ_HEARTBEAT_DELAY = "amqj.heartbeat.delay";
-
- /**
* Frequency of heartbeat messages (in seconds)
*/
public static final String QPID_HEARTBEAT_INTERVAL = "qpid.heartbeat";
@@ -100,12 +86,6 @@ public class ClientProperties
public static final int QPID_HEARTBEAT_INTERVAL_010_DEFAULT = 120;
/**
- * @see #QPID_HEARTBEAT_TIMEOUT_FACTOR
- */
- @Deprecated
- public static final String AMQJ_HEARTBEAT_TIMEOUT_FACTOR = "amqj.heartbeat.timeoutFactor";
-
- /**
* The factor applied to {@link #QPID_HEARTBEAT_INTERVAL} that determines the maximum
* length of time that may elapse before the peer is deemed to have failed.
*
@@ -138,8 +118,6 @@ public class ClientProperties
* synchronous operations.
*/
public static final String QPID_SYNC_OP_TIMEOUT = "qpid.sync_op_timeout";
- @Deprecated
- public static final String AMQJ_DEFAULT_SYNCWRITE_TIMEOUT = "amqj.default_syncwrite_timeout";
/**
* A default timeout value for synchronous operations
@@ -162,8 +140,6 @@ public class ClientProperties
* System properties to change the default value used for TCP_NODELAY
*/
public static final String QPID_TCP_NODELAY_PROP_NAME = "qpid.tcp_nodelay";
- @Deprecated
- public static final String AMQJ_TCP_NODELAY_PROP_NAME = "amqj.tcp_nodelay";
/**
* System property to set the reject behaviour. default value will be 'normal' but can be
@@ -175,21 +151,13 @@ public class ClientProperties
/**
* System property used to set the key manager factory algorithm.
- *
- * Historically, Qpid referred to this as {@value #QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME}.
*/
public static final String QPID_SSL_KEY_MANAGER_FACTORY_ALGORITHM_PROP_NAME = "qpid.ssl.KeyManagerFactory.algorithm";
- @Deprecated
- public static final String QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME = "qpid.ssl.keyStoreCertType";
/**
* System property used to set the trust manager factory algorithm.
- *
- * Historically, Qpid referred to this as {@value #QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME}.
*/
public static final String QPID_SSL_TRUST_MANAGER_FACTORY_ALGORITHM_PROP_NAME = "qpid.ssl.TrustManagerFactory.algorithm";
- @Deprecated
- public static final String QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME = "qpid.ssl.trustStoreCertType";
/**
* System property to enable allow dispatcher thread to be run as a daemon thread
@@ -204,21 +172,13 @@ public class ClientProperties
/**
* System property used to set the socket receive buffer size.
- *
- * Historically, Qpid referred to this as {@value #LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME}.
*/
public static final String RECEIVE_BUFFER_SIZE_PROP_NAME = "qpid.receive_buffer_size";
- @Deprecated
- public static final String LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME = "amqj.receiveBufferSize";
/**
* System property used to set the socket send buffer size.
- *
- * Historically, Qpid referred to this as {@value #LEGACY_SEND_BUFFER_SIZE_PROP_NAME}.
*/
public static final String SEND_BUFFER_SIZE_PROP_NAME = "qpid.send_buffer_size";
- @Deprecated
- public static final String LEGACY_SEND_BUFFER_SIZE_PROP_NAME = "amqj.sendBufferSize";
/**
* System property to set the time (in millis) to wait before failing when sending and
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java Tue Jul 7 13:20:25 2015
@@ -20,23 +20,23 @@
*/
package org.apache.qpid.transport;
-import static org.apache.qpid.configuration.ClientProperties.AMQJ_HEARTBEAT_DELAY;
-import static org.apache.qpid.configuration.ClientProperties.AMQJ_HEARTBEAT_TIMEOUT_FACTOR;
-import static org.apache.qpid.configuration.ClientProperties.IDLE_TIMEOUT_PROP_NAME;
+import static org.apache.qpid.transport.LegacyClientProperties.AMQJ_HEARTBEAT_DELAY;
+import static org.apache.qpid.transport.LegacyClientProperties.AMQJ_HEARTBEAT_TIMEOUT_FACTOR;
+import static org.apache.qpid.transport.LegacyClientProperties.IDLE_TIMEOUT_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL;
import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL_010_DEFAULT;
import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_TIMEOUT_FACTOR;
import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_TIMEOUT_FACTOR_DEFAULT;
-import static org.apache.qpid.configuration.ClientProperties.AMQJ_TCP_NODELAY_PROP_NAME;
+import static org.apache.qpid.transport.LegacyClientProperties.AMQJ_TCP_NODELAY_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.QPID_SSL_KEY_MANAGER_FACTORY_ALGORITHM_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME;
+import static org.apache.qpid.transport.LegacyClientProperties.QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.QPID_SSL_TRUST_MANAGER_FACTORY_ALGORITHM_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME;
+import static org.apache.qpid.transport.LegacyClientProperties.QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.QPID_TCP_NODELAY_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.RECEIVE_BUFFER_SIZE_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.SEND_BUFFER_SIZE_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.LEGACY_SEND_BUFFER_SIZE_PROP_NAME;
+import static org.apache.qpid.transport.LegacyClientProperties.LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME;
+import static org.apache.qpid.transport.LegacyClientProperties.LEGACY_SEND_BUFFER_SIZE_PROP_NAME;
import java.io.FileInputStream;
import java.io.IOException;
Added: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java?rev=1689658&view=auto
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java (added)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java Tue Jul 7 13:20:25 2015
@@ -0,0 +1,34 @@
+/*
+ *
+ * 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.qpid.transport;
+
+interface LegacyClientProperties
+{
+ String IDLE_TIMEOUT_PROP_NAME = "idle_timeout";
+ String AMQJ_HEARTBEAT_TIMEOUT_FACTOR = "amqj.heartbeat.timeoutFactor";
+ String AMQJ_DEFAULT_SYNCWRITE_TIMEOUT = "amqj.default_syncwrite_timeout";
+ String AMQJ_TCP_NODELAY_PROP_NAME = "amqj.tcp_nodelay";
+ String LEGACY_SEND_BUFFER_SIZE_PROP_NAME = "amqj.sendBufferSize";
+ String AMQJ_HEARTBEAT_DELAY = "amqj.heartbeat.delay";
+ String QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME = "qpid.ssl.keyStoreCertType";
+ String QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME = "qpid.ssl.trustStoreCertType";
+ String LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME = "amqj.receiveBufferSize";
+}
Propchange: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java Tue Jul 7 13:20:25 2015
@@ -91,7 +91,7 @@ public class Session extends SessionInvo
private SessionDelegate delegate;
private SessionListener listener = new DefaultSessionListener();
private final long timeout = Long.getLong(ClientProperties.QPID_SYNC_OP_TIMEOUT,
- Long.getLong(ClientProperties.AMQJ_DEFAULT_SYNCWRITE_TIMEOUT,
+ Long.getLong(LegacyClientProperties.AMQJ_DEFAULT_SYNCWRITE_TIMEOUT,
ClientProperties.DEFAULT_SYNC_OPERATION_TIMEOUT));
private final long blockedSendTimeout = Long.getLong(ClientProperties.QPID_FLOW_CONTROL_WAIT_FAILURE,
ClientProperties.DEFAULT_FLOW_CONTROL_WAIT_FAILURE);
Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java Tue Jul 7 13:20:25 2015
@@ -56,13 +56,13 @@ public class ConnectionSettingsTest exte
@SuppressWarnings("deprecation")
public void testTcpNoDelayLegacyOverrideTrue()
{
- systemPropertyOverrideForTcpDelay(ClientProperties.AMQJ_TCP_NODELAY_PROP_NAME, true);
+ systemPropertyOverrideForTcpDelay(LegacyClientProperties.AMQJ_TCP_NODELAY_PROP_NAME, true);
}
@SuppressWarnings("deprecation")
public void testTcpNoDelayLegacyOverrideFalse()
{
- systemPropertyOverrideForTcpDelay(ClientProperties.AMQJ_TCP_NODELAY_PROP_NAME, false);
+ systemPropertyOverrideForTcpDelay(LegacyClientProperties.AMQJ_TCP_NODELAY_PROP_NAME, false);
}
public void testKeyManagerFactoryAlgorithmDefault()
@@ -80,7 +80,7 @@ public class ConnectionSettingsTest exte
public void testKeyManagerFactoryAlgorithmLegacyOverridden()
{
String algorithmName = TEST_ALGORITHM_NAME;
- systemPropertyOverrideForKeyFactoryAlgorithm(ClientProperties.QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME, algorithmName);
+ systemPropertyOverrideForKeyFactoryAlgorithm(LegacyClientProperties.QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME, algorithmName);
}
public void testTrustManagerFactoryAlgorithmDefault()
@@ -98,7 +98,7 @@ public class ConnectionSettingsTest exte
public void testTrustManagerFactoryAlgorithmLegacyOverridden()
{
String algorithmName = TEST_ALGORITHM_NAME;
- systemPropertyOverrideForTrustFactoryAlgorithm(ClientProperties.QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME, algorithmName);
+ systemPropertyOverrideForTrustFactoryAlgorithm(LegacyClientProperties.QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME, algorithmName);
}
public void testSendBufferSizeDefault()
@@ -114,7 +114,7 @@ public class ConnectionSettingsTest exte
@SuppressWarnings("deprecation")
public void testtestSendBufferSizeOverriddenLegacyOverridden()
{
- systemPropertyOverrideForSocketBufferSize(ClientProperties.LEGACY_SEND_BUFFER_SIZE_PROP_NAME, 1024, false);
+ systemPropertyOverrideForSocketBufferSize(LegacyClientProperties.LEGACY_SEND_BUFFER_SIZE_PROP_NAME, 1024, false);
}
public void testReceiveBufferSizeDefault()
@@ -130,7 +130,7 @@ public class ConnectionSettingsTest exte
@SuppressWarnings("deprecation")
public void testReceiveBufferSizeOverriddenLegacyOverridden()
{
- systemPropertyOverrideForSocketBufferSize(ClientProperties.LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME, 1024, true);
+ systemPropertyOverrideForSocketBufferSize(LegacyClientProperties.LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME, 1024, true);
}
public void testHeartbeatingDefaults()
@@ -153,8 +153,8 @@ public class ConnectionSettingsTest exte
@SuppressWarnings("deprecation")
public void testHeartbeatingOverriddenUsingAmqjLegacyOption()
{
- resetSystemProperty(ClientProperties.AMQJ_HEARTBEAT_DELAY, "30");
- resetSystemProperty(ClientProperties.AMQJ_HEARTBEAT_TIMEOUT_FACTOR, "1.5");
+ resetSystemProperty(LegacyClientProperties.AMQJ_HEARTBEAT_DELAY, "30");
+ resetSystemProperty(LegacyClientProperties.AMQJ_HEARTBEAT_TIMEOUT_FACTOR, "1.5");
assertEquals(Integer.valueOf(30), _conConnectionSettings.getHeartbeatInterval08());
assertEquals(30, _conConnectionSettings.getHeartbeatInterval010());
@@ -164,7 +164,7 @@ public class ConnectionSettingsTest exte
@SuppressWarnings("deprecation")
public void testHeartbeatingOverriddenUsingOlderLegacyOption()
{
- resetSystemProperty(ClientProperties.IDLE_TIMEOUT_PROP_NAME, "30000");
+ resetSystemProperty(LegacyClientProperties.IDLE_TIMEOUT_PROP_NAME, "30000");
assertEquals(Integer.valueOf(30), _conConnectionSettings.getHeartbeatInterval08());
assertEquals(30, _conConnectionSettings.getHeartbeatInterval010());
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java?rev=1689658&r1=1689657&r2=1689658&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java Tue Jul 7 13:20:25 2015
@@ -18,8 +18,6 @@
*/
package org.apache.qpid.client;
-import static org.apache.qpid.configuration.ClientProperties.AMQJ_HEARTBEAT_DELAY;
-import static org.apache.qpid.configuration.ClientProperties.IDLE_TIMEOUT_PROP_NAME;
import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL;
import java.util.concurrent.atomic.AtomicInteger;
@@ -162,7 +160,7 @@ public class HeartbeatTest extends QpidB
@SuppressWarnings("deprecation")
public void testHeartbeatsEnabledUsingAmqjLegacySystemProperty() throws Exception
{
- setTestSystemProperty(AMQJ_HEARTBEAT_DELAY, "1");
+ setTestSystemProperty("amqj.heartbeat.delay", "1");
AMQConnection conn = (AMQConnection) getConnection();
conn.setHeartbeatListener(_listener);
conn.start();
@@ -178,7 +176,7 @@ public class HeartbeatTest extends QpidB
@SuppressWarnings("deprecation")
public void testHeartbeatsEnabledUsingOlderLegacySystemProperty() throws Exception
{
- setTestSystemProperty(IDLE_TIMEOUT_PROP_NAME, "1000");
+ setTestSystemProperty("idle_timeout", "1000");
AMQConnection conn = (AMQConnection) getConnection();
conn.setHeartbeatListener(_listener);
conn.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org