Repository: qpid-jms Updated Branches: refs/heads/master 12c6dbc33 -> db729434d
Disble set of JMS Destination and ReplyTo as string properties. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/db729434 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/db729434 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/db729434 Branch: refs/heads/master Commit: db729434d9b7bdcc13a01868db2e7d729b8fe139 Parents: 12c6dbc Author: Timothy Bish <[email protected]> Authored: Mon Dec 15 16:03:22 2014 -0500 Committer: Timothy Bish <[email protected]> Committed: Mon Dec 15 16:03:31 2014 -0500 ---------------------------------------------------------------------- .../qpid/jms/message/JmsMessagePropertyIntercepter.java | 12 ++---------- .../org/apache/qpid/jms/util/TypeConversionSupport.java | 11 ----------- .../jms/message/JmsMessagePropertyIntercepterTest.java | 6 ++---- 3 files changed, 4 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/db729434/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java index c3039a1..aeef09b 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java @@ -127,11 +127,7 @@ public class JmsMessagePropertyIntercepter { PROPERTY_INTERCEPTERS.put(JMS_DESTINATION, new PropertyIntercepter() { @Override public void setProperty(JmsMessageFacade message, Object value) throws JMSException { - String rc = (String) TypeConversionSupport.convert(value, String.class); - if (rc == null) { - throw new JMSException("Property JMSDestination cannot be set from a " + value.getClass().getName() + "."); - } - message.setDestinationFromString(rc); + throw new JMSException("Cannot set JMS Destination as a property, use setJMSDestination() instead"); } @Override @@ -156,11 +152,7 @@ public class JmsMessagePropertyIntercepter { PROPERTY_INTERCEPTERS.put(JMS_REPLYTO, new PropertyIntercepter() { @Override public void setProperty(JmsMessageFacade message, Object value) throws JMSException { - String rc = (String) TypeConversionSupport.convert(value, String.class); - if (rc == null) { - throw new JMSException("Property JMSReplyTo cannot be set from a " + value.getClass().getName() + "."); - } - message.setReplyToFromString(rc); + throw new JMSException("Cannot set JMS ReplyTo as a property, use setJMSReplTo() instead"); } @Override http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/db729434/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java index 6f246f0..fd1ef41 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java @@ -19,9 +19,6 @@ package org.apache.qpid.jms.util; import java.util.Date; import java.util.HashMap; -import org.apache.qpid.jms.JmsDestination; -import org.apache.qpid.jms.JmsQueue; - public final class TypeConversionSupport { static class ConversionKey { @@ -158,14 +155,6 @@ public final class TypeConversionSupport { } }); - CONVERSION_MAP.put(new ConversionKey(String.class, JmsDestination.class), new Converter() { - @Override - public Object convert(Object value) { - // TODO - Right now we go right to a Queue, we need to examine the name - // and correctly map to the appropriate destination type. - return new JmsQueue(value.toString()); - } - }); } private TypeConversionSupport() { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/db729434/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java index 69e2aed..3be2cbe 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java @@ -104,12 +104,11 @@ public class JmsMessagePropertyIntercepterTest { assertEquals(destination.getName(), JmsMessagePropertyIntercepter.getProperty(message, JMS_DESTINATION)); } - @Test + @Test(expected=JMSException.class) public void testSetJMSDestination() throws JMSException { JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); String destinationName = new String("TestDestination"); JmsMessagePropertyIntercepter.setProperty(message, JMS_DESTINATION, destinationName); - Mockito.verify(message).setDestinationFromString(destinationName); } @Test @@ -197,12 +196,11 @@ public class JmsMessagePropertyIntercepterTest { assertEquals(destination.getName(), JmsMessagePropertyIntercepter.getProperty(message, JMS_REPLYTO)); } - @Test + @Test(expected=JMSException.class) public void testSetJMSReplyTo() throws JMSException { JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); String destinationName = new String("TestDestination"); JmsMessagePropertyIntercepter.setProperty(message, JMS_REPLYTO, destinationName); - Mockito.verify(message).setReplyToFromString(destinationName); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
