simplify populateProperties to avoid output of redundant fixed properties defined while instantiating the classes
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/253168d0 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/253168d0 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/253168d0 Branch: refs/heads/master Commit: 253168d08c5b994d3e77535cc0e4347fc32ae579 Parents: cd0edd4 Author: Robert Gemmell <[email protected]> Authored: Fri Jan 23 16:47:36 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Fri Jan 23 17:39:01 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/jms/JmsDestination.java | 7 +------ .../src/test/java/org/apache/qpid/jms/JmsQueueTest.java | 11 +++-------- .../java/org/apache/qpid/jms/JmsTemporaryQueueTest.java | 11 +++-------- .../java/org/apache/qpid/jms/JmsTemporaryTopicTest.java | 11 +++-------- .../src/test/java/org/apache/qpid/jms/JmsTopicTest.java | 11 +++-------- 5 files changed, 13 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/253168d0/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java index 245ee7f..09216d5 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java @@ -28,10 +28,7 @@ import org.apache.qpid.jms.jndi.JNDIStorable; * Jms Destination */ public abstract class JmsDestination extends JNDIStorable implements Externalizable, javax.jms.Destination, Comparable<JmsDestination> { - - protected static final String TEMPORARY_PROP = "temporary"; - protected static final String TOPIC_PROP = "topic"; - protected static final String NAME_PROP = "name"; + private static final String NAME_PROP = "name"; protected transient String name; protected transient boolean topic; @@ -98,8 +95,6 @@ public abstract class JmsDestination extends JNDIStorable implements Externaliza @Override protected void populateProperties(Map<String, String> props) { props.put(NAME_PROP, getName()); - props.put(TOPIC_PROP, Boolean.toString(isTopic())); - props.put(TEMPORARY_PROP, Boolean.toString(isTemporary())); } /** http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/253168d0/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java index 2afa058..19f2994 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java @@ -16,9 +16,6 @@ */ package org.apache.qpid.jms; -import static org.apache.qpid.jms.JmsDestination.NAME_PROP; -import static org.apache.qpid.jms.JmsDestination.TEMPORARY_PROP; -import static org.apache.qpid.jms.JmsDestination.TOPIC_PROP; import static org.apache.qpid.jms.SerializationTestSupport.roundTripSerializeDestination; import static org.apache.qpid.jms.SerializationTestSupport.serializeDestination; import static org.junit.Assert.assertArrayEquals; @@ -39,6 +36,8 @@ import org.junit.Test; public class JmsQueueTest extends QpidJmsTestCase { + private static final String NAME_PROP = "name"; + @Test public void testIsQueue() { JmsQueue queue = new JmsQueue("myQueue"); @@ -108,13 +107,9 @@ public class JmsQueueTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); queue.populateProperties(props); - assertTrue("Property not found: " + TEMPORARY_PROP, props.containsKey(TEMPORARY_PROP)); - assertEquals("Unexpected value for property: " + TEMPORARY_PROP, "false", props.get(TEMPORARY_PROP)); assertTrue("Property not found: " + NAME_PROP, props.containsKey(NAME_PROP)); assertEquals("Unexpected value for property: " + NAME_PROP, name, props.get(NAME_PROP)); - assertTrue("Property not found: " + TOPIC_PROP, props.containsKey(TOPIC_PROP)); - assertEquals("Unexpected value for property: " + TOPIC_PROP, "false", props.get(TOPIC_PROP)); - assertEquals("Unexpected number of properties", 3, props.size()); + assertEquals("Unexpected number of properties", 1, props.size()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/253168d0/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java index c397373..9b3495f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java @@ -16,9 +16,6 @@ */ package org.apache.qpid.jms; -import static org.apache.qpid.jms.JmsDestination.NAME_PROP; -import static org.apache.qpid.jms.JmsDestination.TEMPORARY_PROP; -import static org.apache.qpid.jms.JmsDestination.TOPIC_PROP; import static org.apache.qpid.jms.SerializationTestSupport.roundTripSerializeDestination; import static org.apache.qpid.jms.SerializationTestSupport.serializeDestination; import static org.junit.Assert.assertArrayEquals; @@ -39,6 +36,8 @@ import org.junit.Test; public class JmsTemporaryQueueTest extends QpidJmsTestCase { + private static final String NAME_PROP = "name"; + @Test public void testIsQueue() { JmsTemporaryQueue queue = new JmsTemporaryQueue("myQueue"); @@ -116,13 +115,9 @@ public class JmsTemporaryQueueTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); queue.populateProperties(props); - assertTrue("Property not found: " + TEMPORARY_PROP, props.containsKey(TEMPORARY_PROP)); - assertEquals("Unexpected value for property: " + TEMPORARY_PROP, "true", props.get(TEMPORARY_PROP)); assertTrue("Property not found: " + NAME_PROP, props.containsKey(NAME_PROP)); assertEquals("Unexpected value for property: " + NAME_PROP, name, props.get(NAME_PROP)); - assertTrue("Property not found: " + TOPIC_PROP, props.containsKey(TOPIC_PROP)); - assertEquals("Unexpected value for property: " + TOPIC_PROP, "false", props.get(TOPIC_PROP)); - assertEquals("Unexpected number of properties", 3, props.size()); + assertEquals("Unexpected number of properties", 1, props.size()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/253168d0/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java index a689a9d..3618a5c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java @@ -16,9 +16,6 @@ */ package org.apache.qpid.jms; -import static org.apache.qpid.jms.JmsDestination.NAME_PROP; -import static org.apache.qpid.jms.JmsDestination.TEMPORARY_PROP; -import static org.apache.qpid.jms.JmsDestination.TOPIC_PROP; import static org.apache.qpid.jms.SerializationTestSupport.roundTripSerializeDestination; import static org.apache.qpid.jms.SerializationTestSupport.serializeDestination; import static org.junit.Assert.assertArrayEquals; @@ -39,6 +36,8 @@ import org.junit.Test; public class JmsTemporaryTopicTest extends QpidJmsTestCase { + private static final String NAME_PROP = "name"; + @Test public void testIsQueue() { JmsTemporaryTopic topic = new JmsTemporaryTopic("myTopic"); @@ -116,13 +115,9 @@ public class JmsTemporaryTopicTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); topic.populateProperties(props); - assertTrue("Property not found: " + TEMPORARY_PROP, props.containsKey(TEMPORARY_PROP)); - assertEquals("Unexpected value for property: " + TEMPORARY_PROP, "true", props.get(TEMPORARY_PROP)); assertTrue("Property not found: " + NAME_PROP, props.containsKey(NAME_PROP)); assertEquals("Unexpected value for property: " + NAME_PROP, name, props.get(NAME_PROP)); - assertTrue("Property not found: " + TOPIC_PROP, props.containsKey(TOPIC_PROP)); - assertEquals("Unexpected value for property: " + TOPIC_PROP, "true", props.get(TOPIC_PROP)); - assertEquals("Unexpected number of properties", 3, props.size()); + assertEquals("Unexpected number of properties", 1, props.size()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/253168d0/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java index 3fec15f..c2e9998 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java @@ -16,9 +16,6 @@ */ package org.apache.qpid.jms; -import static org.apache.qpid.jms.JmsDestination.NAME_PROP; -import static org.apache.qpid.jms.JmsDestination.TEMPORARY_PROP; -import static org.apache.qpid.jms.JmsDestination.TOPIC_PROP; import static org.apache.qpid.jms.SerializationTestSupport.roundTripSerializeDestination; import static org.apache.qpid.jms.SerializationTestSupport.serializeDestination; import static org.junit.Assert.assertArrayEquals; @@ -39,6 +36,8 @@ import org.junit.Test; public class JmsTopicTest extends QpidJmsTestCase { + private static final String NAME_PROP = "name"; + @Test public void testIsQueue() { JmsTopic topic = new JmsTopic("myTopic"); @@ -108,13 +107,9 @@ public class JmsTopicTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); topic.populateProperties(props); - assertTrue("Property not found: " + TEMPORARY_PROP, props.containsKey(TEMPORARY_PROP)); - assertEquals("Unexpected value for property: " + TEMPORARY_PROP, "false", props.get(TEMPORARY_PROP)); assertTrue("Property not found: " + NAME_PROP, props.containsKey(NAME_PROP)); assertEquals("Unexpected value for property: " + NAME_PROP, name, props.get(NAME_PROP)); - assertTrue("Property not found: " + TOPIC_PROP, props.containsKey(TOPIC_PROP)); - assertEquals("Unexpected value for property: " + TOPIC_PROP, "true", props.get(TOPIC_PROP)); - assertEquals("Unexpected number of properties", 3, props.size()); + assertEquals("Unexpected number of properties", 1, props.size()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
