You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/10/06 18:40:05 UTC
[3/3] git commit: rename methods for clarity
rename methods for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/375278b9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/375278b9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/375278b9
Branch: refs/heads/master
Commit: 375278b9dbbb6a0c3ddcd1924b1689fca23726f1
Parents: dd00b90
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 16:34:22 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 17:32:44 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageFacade.java | 18 +++++++++++++-----
.../AmqpJmsMessagePropertyIntercepter.java | 8 ++++----
.../amqp/message/AmqpJmsMessageFacadeTest.java | 6 +++---
.../AmqpJmsMessagePropertyIntercepterTest.java | 10 +++++-----
4 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 55671df..e8a170c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -215,8 +215,8 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
// Set the ttl field of the Header field if needed, complementing the expiration
// field of Properties for any peers that only inspect the mutable ttl field.
long ttl = 0;
- if (hasUserSpecifiedTimeToLive()) {
- ttl = getAmqpTimeToLive();
+ if (hasAmqpTimeToLiveOverride()) {
+ ttl = getAmqpTimeToLiveOverride();
} else {
ttl = producerTtl;
}
@@ -597,7 +597,15 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
}
- public void setAmqpTimeToLive(long ttl) throws MessageFormatException {
+ /**
+ * Sets a value which will be used to override any ttl value that may otherwise be set
+ * based on the expiration value when sending the underlying AMQP message. A value of 0
+ * means to clear the ttl field rather than set it to anything.
+ *
+ * @param ttl the value to use, in range 0 <= x <= 2^32 - 1
+ * @throws MessageFormatException
+ */
+ public void setAmqpTimeToLiveOverride(long ttl) throws MessageFormatException {
if (ttl >= 0 && ttl <= UINT_MAX) {
userSpecifiedTTL = ttl;
} else {
@@ -605,11 +613,11 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
}
- public boolean hasUserSpecifiedTimeToLive() {
+ public boolean hasAmqpTimeToLiveOverride() {
return userSpecifiedTTL != null;
}
- public long getAmqpTimeToLive() {
+ public long getAmqpTimeToLiveOverride() {
return userSpecifiedTTL != null ? userSpecifiedTTL : 0;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
index c9607aa..530904f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
@@ -88,8 +88,8 @@ public class AmqpJmsMessagePropertyIntercepter {
PROPERTY_INTERCEPTERS.put(JMS_AMQP_TTL, new PropertyIntercepter() {
@Override
public Object getProperty(AmqpJmsMessageFacade message) throws JMSException {
- if (message.hasUserSpecifiedTimeToLive()) {
- return message.getAmqpTimeToLive();
+ if (message.hasAmqpTimeToLiveOverride()) {
+ return message.getAmqpTimeToLiveOverride();
}
return null;
}
@@ -100,12 +100,12 @@ public class AmqpJmsMessagePropertyIntercepter {
if (rc == null) {
throw new JMSException("Property " + JMS_AMQP_TTL + " cannot be set from a " + value.getClass().getName() + ".");
}
- message.setAmqpTimeToLive(rc.longValue());
+ message.setAmqpTimeToLiveOverride(rc.longValue());
}
@Override
public boolean propertyExists(AmqpJmsMessageFacade message) {
- return message.hasUserSpecifiedTimeToLive();
+ return message.hasAmqpTimeToLiveOverride();
}
});
PROPERTY_INTERCEPTERS.put(JMS_AMQP_REPLY_TO_GROUP_ID, new PropertyIntercepter() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index b3c8af1..14cefa2 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -86,14 +86,14 @@ public class AmqpJmsMessageFacadeTest {
public void testSetAmqpTimeToLiveRejectsNegatives() throws Exception {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
- amqpMessageFacade.setAmqpTimeToLive(-1L);
+ amqpMessageFacade.setAmqpTimeToLiveOverride(-1L);
}
@Test(expected = MessageFormatException.class)
public void testSetAmqpTimeToLiveRejectsValuesFromTwoToThirtyTwo() throws Exception {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
// check values over 2^32 - 1 are rejected
- amqpMessageFacade.setAmqpTimeToLive(0X100000000L);
+ amqpMessageFacade.setAmqpTimeToLiveOverride(0X100000000L);
}
// ====== AMQP Properties Section =======
@@ -513,7 +513,7 @@ public class AmqpJmsMessageFacadeTest {
AmqpJmsMessageFacade source = createNewMessageFacade();
long amqpTtl = 17L;
- source.setAmqpTimeToLive(amqpTtl);
+ source.setAmqpTimeToLiveOverride(amqpTtl);
AmqpJmsMessageFacade copy = source.copy();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
index 972622b..d835eb5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
@@ -49,14 +49,14 @@ public class AmqpJmsMessagePropertyIntercepterTest {
public void testSetJmsAmqpTtl() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
AmqpJmsMessagePropertyIntercepter.setProperty(message, JMS_AMQP_TTL, 65536L);
- Mockito.verify(message).setAmqpTimeToLive(65536L);
+ Mockito.verify(message).setAmqpTimeToLiveOverride(65536L);
}
@Test
public void testGetJmsAmqpTtlWhenSet() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
- Mockito.when(message.hasUserSpecifiedTimeToLive()).thenReturn(true);
- Mockito.when(message.getAmqpTimeToLive()).thenReturn(65536L);
+ Mockito.when(message.hasAmqpTimeToLiveOverride()).thenReturn(true);
+ Mockito.when(message.getAmqpTimeToLiveOverride()).thenReturn(65536L);
assertNotNull(AmqpJmsMessagePropertyIntercepter.getProperty(message, JMS_AMQP_TTL));
assertEquals(65536L, AmqpJmsMessagePropertyIntercepter.getProperty(message, JMS_AMQP_TTL));
@@ -72,8 +72,8 @@ public class AmqpJmsMessagePropertyIntercepterTest {
@Test
public void testJmsAmqpTtlInPropertyNamesWhenSet() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
- Mockito.when(message.hasUserSpecifiedTimeToLive()).thenReturn(true);
- Mockito.when(message.getAmqpTimeToLive()).thenReturn(65536L);
+ Mockito.when(message.hasAmqpTimeToLiveOverride()).thenReturn(true);
+ Mockito.when(message.getAmqpTimeToLiveOverride()).thenReturn(65536L);
assertTrue(AmqpJmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_AMQP_TTL));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org