You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/10/28 16:49:42 UTC
qpid-jms git commit: QPIDJMS-133 Repleace alwaysSyncSend with
forceSyncSend and deprecate the old option.
Repository: qpid-jms
Updated Branches:
refs/heads/master 810410747 -> 94e586b83
QPIDJMS-133 Repleace alwaysSyncSend with forceSyncSend and deprecate the
old option.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/94e586b8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/94e586b8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/94e586b8
Branch: refs/heads/master
Commit: 94e586b83dab01cf80b96bd039e1d814389647e3
Parents: 8104107
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 28 11:49:32 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 28 11:49:32 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/JmsConnection.java | 8 ++---
.../apache/qpid/jms/JmsConnectionFactory.java | 33 ++++++++++++++++++--
.../java/org/apache/qpid/jms/JmsSession.java | 2 +-
.../apache/qpid/jms/meta/JmsConnectionInfo.java | 12 +++----
.../qpid/jms/JmsConnectionFactoryTest.java | 4 +--
.../qpid/jms/meta/JmsConnectionInfoTest.java | 4 +--
qpid-jms-docs/Configuration.md | 3 +-
.../qpid/jms/bench/ConsumeFromAMQPTest.java | 2 +-
.../qpid/jms/bench/ProduceToAMQPTest.java | 2 +-
.../jms/bench/ProducerAndConsumerBench.java | 2 +-
.../jms/failover/JmsTxProducerFailoverTest.java | 2 +-
...JmsProducerFlowControlFailIfNoSpaceTest.java | 4 +--
.../qpid/jms/support/AmqpTestSupport.java | 2 +-
.../qpid/jms/support/QpidJmsTestSupport.java | 2 +-
14 files changed, 55 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index ab00fab..02294b9 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -817,12 +817,12 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
connectionInfo.setForceAsyncSends(forceAsyncSend);
}
- public boolean isAlwaysSyncSend() {
- return connectionInfo.isAlwaysSyncSend();
+ public boolean isForceSyncSend() {
+ return connectionInfo.isForceSyncSend();
}
- public void setAlwaysSyncSend(boolean alwaysSyncSend) {
- connectionInfo.setAlwaysSyncSend(alwaysSyncSend);
+ public void setForceSyncSend(boolean alwaysSyncSend) {
+ connectionInfo.setForceSyncSend(alwaysSyncSend);
}
public String getTopicPrefix() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
index ae93eed..5f43b30 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
@@ -58,7 +58,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
private String password;
private String clientID;
private boolean forceAsyncSend;
- private boolean alwaysSyncSend;
+ private boolean forceSyncSend;
private boolean sendAcksAsync;
private boolean localMessagePriority;
private boolean localMessageExpiry = true;
@@ -346,6 +346,27 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
this.password = password;
}
+ /**
+ * Returns true if the client should always send messages using a synchronous
+ * send operation regardless of persistence mode, or inside a transaction.
+ *
+ * @return true if sends should always be done synchronously.
+ */
+ public boolean isForceSyncSend() {
+ return forceSyncSend;
+ }
+
+ /**
+ * Configures whether or not the client will always send messages synchronously or not
+ * regardless of other factors that might result in an asynchronous send.
+ *
+ * @param forceSyncSend
+ * if true sends are always done synchronously.
+ */
+ public void setForceSyncSend(boolean forceSyncSend) {
+ this.forceSyncSend = forceSyncSend;
+ }
+
public boolean isForceAsyncSend() {
return forceAsyncSend;
}
@@ -586,9 +607,12 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
* send operation regardless of persistence mode, or inside a transaction.
*
* @return true if sends should always be done synchronously.
+ *
+ * @deprecated As of release 0.7.0, replaced by {@link #isForceSyncSend()}
*/
+ @Deprecated
public boolean isAlwaysSyncSend() {
- return alwaysSyncSend;
+ return forceSyncSend;
}
/**
@@ -597,9 +621,12 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
*
* @param alwaysSyncSend
* if true sends are always done synchronously.
+ *
+ * @deprecated As of release 0.7.0, replaced by {@link #setForceSyncSend(boolean)}
*/
+ @Deprecated
public void setAlwaysSyncSend(boolean alwaysSyncSend) {
- this.alwaysSyncSend = alwaysSyncSend;
+ this.forceSyncSend = alwaysSyncSend;
}
/**
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
index 1350c3c..0dff064 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
@@ -667,7 +667,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
// Update the JmsMessage based copy with the required values.
copy.setConnection(connection);
- boolean sync = connection.isAlwaysSyncSend() ||
+ boolean sync = connection.isForceSyncSend() ||
(!connection.isForceAsyncSend() && deliveryMode == DeliveryMode.PERSISTENT && !getTransacted());
copy.onSend(timeToLive);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
index 0b0e307..920cc3e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
@@ -42,7 +42,7 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
private String username;
private String password;
private boolean forceAsyncSend;
- private boolean alwaysSyncSend;
+ private boolean forceSyncSend;
private boolean validatePropertyNames = true;
private boolean receiveLocalOnly;
private boolean receiveNoWaitLocalOnly;
@@ -78,7 +78,7 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
copy.username = username;
copy.password = password;
copy.forceAsyncSend = forceAsyncSend;
- copy.alwaysSyncSend = alwaysSyncSend;
+ copy.forceSyncSend = forceSyncSend;
copy.sendTimeout = sendTimeout;
copy.requestTimeout = requestTimeout;
copy.closeTimeout = closeTimeout;
@@ -96,12 +96,12 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
this.forceAsyncSend = forceAsyncSend;
}
- public boolean isAlwaysSyncSend() {
- return alwaysSyncSend;
+ public boolean isForceSyncSend() {
+ return forceSyncSend;
}
- public void setAlwaysSyncSend(boolean alwaysSyncSend) {
- this.alwaysSyncSend = alwaysSyncSend;
+ public void setForceSyncSend(boolean forceSyncSend) {
+ this.forceSyncSend = forceSyncSend;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
index 5238933..a0dab84 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
@@ -77,7 +77,7 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase {
factory.setQueuePrefix(QUEUE_PREFIX_PROP);
factory.setClientID(CLIENT_ID_PROP);
- factory.setAlwaysSyncSend(!factory.isAlwaysSyncSend());
+ factory.setForceSyncSend(!factory.isForceSyncSend());
factory.setForceAsyncSend(!factory.isForceAsyncSend());
factory.setLocalMessagePriority(!factory.isLocalMessagePriority());
factory.setSendAcksAsync(!factory.isSendAcksAsync());
@@ -95,7 +95,7 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase {
assertEquals(TOPIC_PREFIX_PROP, connection.getTopicPrefix());
assertEquals(QUEUE_PREFIX_PROP, connection.getQueuePrefix());
- assertEquals(factory.isAlwaysSyncSend(), connection.isAlwaysSyncSend());
+ assertEquals(factory.isForceSyncSend(), connection.isForceSyncSend());
assertEquals(factory.isForceAsyncSend(), connection.isForceAsyncSend());
assertEquals(factory.isLocalMessagePriority(), connection.isLocalMessagePriority());
assertEquals(factory.isSendAcksAsync(), connection.isSendAcksAsync());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
index 51f571a..091b138 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
@@ -60,7 +60,7 @@ public class JmsConnectionInfoTest {
public void testCopy() {
JmsConnectionInfo info = new JmsConnectionInfo(firstId);
- info.setAlwaysSyncSend(true);
+ info.setForceSyncSend(true);
info.setClientId("test");
info.setCloseTimeout(100);
info.setConnectTimeout(200);
@@ -76,7 +76,7 @@ public class JmsConnectionInfoTest {
JmsConnectionInfo copy = info.copy();
- assertEquals(true, copy.isAlwaysSyncSend());
+ assertEquals(true, copy.isForceSyncSend());
assertEquals("test", copy.getClientId());
assertEquals(100, copy.getCloseTimeout());
assertEquals(200, copy.getConnectTimeout());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-docs/Configuration.md
----------------------------------------------------------------------
diff --git a/qpid-jms-docs/Configuration.md b/qpid-jms-docs/Configuration.md
index 26f7f6d..c968dc8 100644
--- a/qpid-jms-docs/Configuration.md
+++ b/qpid-jms-docs/Configuration.md
@@ -77,7 +77,8 @@ The options apply to the behaviour of the JMS objects such as Connection, Sessio
+ **jms.password** The password value used to authenticate the connection
+ **jms.clientID** The ClientID value that is applied to the connection.
+ **jms.forceAsyncSend** Configures whether all Messages sent from a MessageProducer are sent asynchronously or only those Message that qualify such as Messages inside a transaction or non-persistent messages.
-+ **jms.alwaysSyncSend** Override all asynchronous send conditions and always sends every Message from a MessageProducer synchronously.
++ **jms.forceSyncSend** Override all asynchronous send conditions and always sends every Message from a MessageProducer synchronously.
++ **jms.alwaysSyncSend** Override all asynchronous send conditions and always sends every Message from a MessageProducer synchronously. **This option is deprecated in 0.7.0 and will be removed in a future release.**
+ **jms.sendAcksAsync** Causes all Message acknowledgments to be sent asynchronously.
+ **jms.localMessageExpiry** Controls whether MessageConsumer instances will locally filter expired Messages or deliver them. By default this value is set to true and expired messages will be filtered.
+ **jms.localMessagePriority** If enabled prefetched messages are reordered locally based on their given Message priority value. Default is false.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
index 8df7952..c2bb361 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
@@ -59,7 +59,7 @@ public class ConsumeFromAMQPTest extends AmqpTestSupport {
}
@Override
- protected boolean isAlwaysSyncSend() {
+ protected boolean isForceSyncSends() {
return false;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
index 9077f08..04c9a12 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
@@ -52,7 +52,7 @@ public class ProduceToAMQPTest extends AmqpTestSupport {
}
@Override
- protected boolean isAlwaysSyncSend() {
+ protected boolean isForceSyncSends() {
return false;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
index 7ff8cfb..cca31b7 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
@@ -166,7 +166,7 @@ public class ProducerAndConsumerBench extends AmqpTestSupport {
}
@Override
- protected boolean isAlwaysSyncSend() {
+ protected boolean isForceSyncSends() {
return false;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java
index f708d85..c645381 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java
@@ -154,7 +154,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport {
connection.start();
JmsConnection jmsConnection = (JmsConnection) connection;
- jmsConnection.setAlwaysSyncSend(true);
+ jmsConnection.setForceSyncSend(true);
final int MSG_COUNT = 5;
final Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java
index 2c97383..fac1311 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java
@@ -79,7 +79,7 @@ public class JmsProducerFlowControlFailIfNoSpaceTest extends AmqpTestSupport {
connection = createAmqpConnection();
JmsConnection jmsConnection = (JmsConnection) connection;
- jmsConnection.setAlwaysSyncSend(true);
+ jmsConnection.setForceSyncSend(true);
connection.setExceptionListener(new TestExceptionListener());
connection.start();
@@ -105,7 +105,7 @@ public class JmsProducerFlowControlFailIfNoSpaceTest extends AmqpTestSupport {
connection = createAmqpConnection();
JmsConnection jmsConnection = (JmsConnection) connection;
- jmsConnection.setAlwaysSyncSend(false);
+ jmsConnection.setForceSyncSend(false);
connection.setExceptionListener(new TestExceptionListener());
connection.start();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java
index 9af74f4..f0f0ae4 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java
@@ -178,7 +178,7 @@ public class AmqpTestSupport extends QpidJmsTestSupport {
public ConnectionFactory createAmqpConnectionFactory(URI brokerURI, String username, String password) throws Exception {
JmsConnectionFactory factory = new JmsConnectionFactory(brokerURI);
factory.setForceAsyncSend(isForceAsyncSends());
- factory.setAlwaysSyncSend(isAlwaysSyncSend());
+ factory.setForceSyncSend(isForceSyncSends());
factory.setSendAcksAsync(isSendAcksAsync());
if (username != null) {
factory.setUsername(username);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94e586b8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
index fa64fac..00ea8e0 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
@@ -470,7 +470,7 @@ public class QpidJmsTestSupport {
return false;
}
- protected boolean isAlwaysSyncSend() {
+ protected boolean isForceSyncSends() {
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org