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 2014/10/07 00:49:57 UTC
git commit: Push proirity scaling to the facade class and do proper
in / out scaling in the AMQP facade. Enable test for get out of range value.
Repository: qpid-jms
Updated Branches:
refs/heads/master 6d0fcad96 -> c311a4218
Push proirity scaling to the facade class and do proper in / out scaling
in the AMQP facade. Enable test for get out of range value.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c311a421
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c311a421
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c311a421
Branch: refs/heads/master
Commit: c311a42188b007cf620bf1cae7f21607f946d0a5
Parents: 6d0fcad
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Oct 6 18:49:50 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Oct 6 18:49:50 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/message/JmsMessage.java | 14 +-------------
.../provider/amqp/message/AmqpJmsMessageFacade.java | 14 +++++++++++++-
.../facade/defaults/JmsDefaultMessageFacade.java | 8 +++++++-
.../amqp/message/AmqpJmsMessageFacadeTest.java | 4 ----
4 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c311a421/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
index 24cdc5a..122c3ab 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
@@ -91,7 +91,6 @@ public class JmsMessage implements javax.jms.Message {
String oMsg = msg.facade.getMessageId();
String thisMsg = facade.getMessageId();
- //TODO: use super.equals if both id are null?
return thisMsg != null && oMsg != null && oMsg.equals(thisMsg);
}
@@ -236,18 +235,7 @@ public class JmsMessage implements javax.jms.Message {
@Override
public void setJMSPriority(int priority) throws JMSException {
- byte scaled = 0;
-
- //TODO: should we leave this to the facade to do if it wants? We simply trust its return value.
- if (priority < 0) {
- scaled = 0;
- } else if (priority > 9) {
- scaled = 9;
- } else {
- scaled = (byte) priority;
- }
-
- facade.setPriority(scaled);
+ facade.setPriority((byte) priority);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c311a421/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 e8a170c..07079c1 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
@@ -552,7 +552,13 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
if (message.getHeader() != null) {
UnsignedByte priority = message.getHeader().getPriority();
if (priority != null) {
- return priority.byteValue();
+ byte scaled = priority.byteValue();
+ if (scaled < 0) {
+ scaled = 0;
+ } else if (scaled > 9) {
+ scaled = 9;
+ }
+ return scaled;
}
}
@@ -568,6 +574,12 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
message.getHeader().setPriority(null);
}
} else {
+ if (priority < 0) {
+ priority = 0;
+ } else if (priority > 9) {
+ priority = 9;
+ }
+
message.setPriority(priority);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c311a421/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
index 7972e72..31cca9e 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
@@ -258,7 +258,13 @@ public class JmsDefaultMessageFacade implements JmsMessageFacade {
@Override
public void setPriority(byte priority) {
- this.priority = priority;
+ if (priority < 0) {
+ this.priority = 0;
+ } else if (priority > 9) {
+ this.priority = 9;
+ } else {
+ this.priority = priority;
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c311a421/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 2b7e476..4e0d2d4 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
@@ -55,7 +55,6 @@ import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
import org.apache.qpid.proton.amqp.messaging.Properties;
import org.apache.qpid.proton.codec.impl.DataImpl;
import org.apache.qpid.proton.message.Message;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
@@ -101,7 +100,6 @@ public class AmqpJmsMessageFacadeTest {
amqpMessageFacade.setAmqpTimeToLiveOverride(0X100000000L);
}
-
/**
* To satisfy the JMS requirement that messages are durable by default, the
* {@link AmqpJmsMessageFacade} objects created for sending new messages are
@@ -213,7 +211,6 @@ public class AmqpJmsMessageFacadeTest {
assertEquals("TTL has not been overriden", overrideTtl, message.getTtl());
}
-
@Test
public void testGetPriorityIs4ForNewMessage() {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
@@ -273,7 +270,6 @@ public class AmqpJmsMessageFacadeTest {
* When messages have a header section, which have a priority value outside the JMS range, ensure it is constrained.
*/
@Test
- @Ignore //TODO: currently we aren't ensuring we map the value into the JMS range
public void testGetPriorityForReceivedMessageWithPriorityOutsideJmsRange() {
// value over 9 deliberately
byte priority = 11;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org