Repository: qpid-jms Updated Branches: refs/heads/master c44975c6b -> 616f0e773
Remove now unnecessary method from the message facade classes and use the normal getProperyNames and getProperty methods to test message functionality. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/616f0e77 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/616f0e77 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/616f0e77 Branch: refs/heads/master Commit: 616f0e77358e24fc09c694dbfc82432efb463fb5 Parents: c44975c Author: Timothy Bish <[email protected]> Authored: Wed Oct 8 15:03:15 2014 -0400 Committer: Timothy Bish <[email protected]> Committed: Wed Oct 8 15:03:15 2014 -0400 ---------------------------------------------------------------------- .../jms/message/facade/JmsMessageFacade.java | 13 ------------- .../amqp/message/AmqpJmsMessageFacade.java | 8 +------- .../apache/qpid/jms/message/JmsMessageTest.java | 20 +++++++++----------- .../defaults/JmsDefaultMessageFacade.java | 6 ------ .../amqp/message/AmqpJmsMessageFacadeTest.java | 16 ++++++++-------- 5 files changed, 18 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/616f0e77/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java index 4cfd57b..4f1d63e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java @@ -16,7 +16,6 @@ */ package org.apache.qpid.jms.message.facade; -import java.util.Map; import java.util.Set; import javax.jms.JMSException; @@ -37,18 +36,6 @@ import org.apache.qpid.jms.JmsDestination; */ public interface JmsMessageFacade { - // TODO: can we get rid of this method? Currently used only in tests, and doesn't - // contain everything that will be returned via 'getPropertyNames' - /** - * Returns the Message properties contained within this Message instance in - * a new Unmodifiable Map instance. - * - * @return a Map containing the properties of this Message that cannot be modified. - * - * @throws JMSException if an error occurs while accessing the Message properties. - */ - public Map<String, Object> getProperties() throws JMSException; - /** * Returns the property names for this Message instance. The Set returned may be * manipulated by the receiver without impacting the facade, and an empty set http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/616f0e77/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 8075b35..1fd1048 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 @@ -24,7 +24,6 @@ import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_T import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -149,12 +148,6 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { } @Override - public Map<String, Object> getProperties() throws JMSException { - lazyCreateApplicationProperties(); - return Collections.unmodifiableMap(new HashMap<String, Object>(applicationPropertiesMap)); - } - - @Override public boolean propertyExists(String key) throws JMSException { return AmqpJmsMessagePropertyIntercepter.propertyExists(this, key); } @@ -174,6 +167,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { * * @return a set of property names in the message or an empty set if none are set. */ + @Override public Set<String> getPropertyNames() { Set<String> properties = AmqpJmsMessagePropertyIntercepter.getPropertyNames(this); if (applicationPropertiesMap != null) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/616f0e77/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java index 3b68fb8..3a1b554 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.Enumeration; -import java.util.Map; import javax.jms.JMSException; import javax.jms.Message; @@ -462,16 +461,15 @@ public class JmsMessageTest { msg.setBooleanProperty("booleanProperty", Boolean.TRUE); msg.setObjectProperty("nullProperty", null); - Map<String, Object> properties = msg.getFacade().getProperties(); - assertEquals(properties.get("stringProperty"), "string"); - assertEquals(((Byte) properties.get("byteProperty")).byteValue(), 1); - assertEquals(((Short) properties.get("shortProperty")).shortValue(), 1); - assertEquals(((Integer) properties.get("intProperty")).intValue(), 1); - assertEquals(((Long) properties.get("longProperty")).longValue(), 1); - assertEquals(((Float) properties.get("floatProperty")).floatValue(), 1.1f, 0); - assertEquals(((Double) properties.get("doubleProperty")).doubleValue(), 1.1, 0); - assertEquals(((Boolean) properties.get("booleanProperty")).booleanValue(), true); - assertNull(properties.get("nullProperty")); + assertEquals(msg.getFacade().getProperty("stringProperty"), "string"); + assertEquals(((Byte) msg.getFacade().getProperty("byteProperty")).byteValue(), 1); + assertEquals(((Short) msg.getFacade().getProperty("shortProperty")).shortValue(), 1); + assertEquals(((Integer) msg.getFacade().getProperty("intProperty")).intValue(), 1); + assertEquals(((Long) msg.getFacade().getProperty("longProperty")).longValue(), 1); + assertEquals(((Float) msg.getFacade().getProperty("floatProperty")).floatValue(), 1.1f, 0); + assertEquals(((Double) msg.getFacade().getProperty("doubleProperty")).doubleValue(), 1.1, 0); + assertEquals(((Boolean) msg.getFacade().getProperty("booleanProperty")).booleanValue(), true); + assertNull(msg.getFacade().getProperty("nullProperty")); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/616f0e77/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 74685a6..53a7679 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 @@ -104,12 +104,6 @@ public class JmsDefaultMessageFacade implements JmsMessageFacade { } @Override - public Map<String, Object> getProperties() throws JMSException { - lazyCreateProperties(); - return properties; - } - - @Override public Set<String> getPropertyNames() throws JMSException { Set<String> names = new HashSet<String>(); if (properties != null) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/616f0e77/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 7631886..a497e16 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 @@ -1484,12 +1484,12 @@ public class AmqpJmsMessageFacadeTest { JmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message2); - Map<String, Object> props = amqpMessageFacade.getProperties(); + Set<String> props = amqpMessageFacade.getPropertyNames(); assertEquals(2, props.size()); - assertTrue(props.containsKey(TEST_PROP_A)); - assertEquals(TEST_VALUE_STRING_A, props.get(TEST_PROP_A)); - assertTrue(props.containsKey(TEST_PROP_B)); - assertEquals(TEST_VALUE_STRING_B, props.get(TEST_PROP_B)); + assertTrue(props.contains(TEST_PROP_A)); + assertEquals(TEST_VALUE_STRING_A, amqpMessageFacade.getProperty(TEST_PROP_A)); + assertTrue(props.contains(TEST_PROP_B)); + assertEquals(TEST_VALUE_STRING_B, amqpMessageFacade.getProperty(TEST_PROP_B)); } @Test @@ -1497,7 +1497,7 @@ public class AmqpJmsMessageFacadeTest { Message message = Proton.message(); JmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message); - Map<String, Object> applicationProperties = amqpMessageFacade.getProperties(); + Set<String> applicationProperties = amqpMessageFacade.getPropertyNames(); assertNotNull(applicationProperties); assertTrue(applicationProperties.isEmpty()); } @@ -1539,12 +1539,12 @@ public class AmqpJmsMessageFacadeTest { JmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message); - Map<String, Object> props1 = amqpMessageFacade.getProperties(); + Set<String> props1 = amqpMessageFacade.getPropertyNames(); assertEquals(1, props1.size()); amqpMessageFacade.clearProperties(); - Map<String, Object> props2 = amqpMessageFacade.getProperties(); + Set<String> props2 = amqpMessageFacade.getPropertyNames(); assertTrue(props2.isEmpty()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
