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/08 13:33:45 UTC

[5/6] git commit: update message to get the property names from the facade

update message to get the property names from the facade


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/97f873d4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/97f873d4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/97f873d4

Branch: refs/heads/master
Commit: 97f873d4403767202c4721871b7590c1eae909d3
Parents: aa92d99
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Oct 8 12:11:31 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Oct 8 12:28:34 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/qpid/jms/message/JmsMessage.java    |  3 +--
 .../qpid/jms/message/facade/JmsMessageFacade.java       | 11 +++++++++++
 .../facade/defaults/JmsDefaultMessageFacade.java        | 12 ++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/97f873d4/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 ac2df52..aa57a4b 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
@@ -297,8 +297,7 @@ public class JmsMessage implements javax.jms.Message {
 
     @Override
     public Enumeration<?> getPropertyNames() throws JMSException {
-        Set<String> result = new HashSet<String>(facade.getProperties().keySet());
-        return Collections.enumeration(result);
+        return Collections.enumeration(facade.getPropertyNames());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/97f873d4/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 e442c62..c879d5d 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
@@ -17,6 +17,7 @@
 package org.apache.qpid.jms.message.facade;
 
 import java.util.Map;
+import java.util.Set;
 
 import javax.jms.JMSException;
 
@@ -47,6 +48,16 @@ public interface JmsMessageFacade {
     public Map<String, Object> getProperties() throws JMSException;
 
     /**
+     * Returns the property names for this Message instance, including any relevant to
+     * values managed through the facade such as group sequence.
+     *
+     * @return a set containing the property names of this Message
+     *
+     * @throws JMSException if an error occurs while accessing the Message properties.
+     */
+    public Set<String> getPropertyNames() throws JMSException;
+
+    /**
      * @returns true if the given property exists within the message.
      *
      * @throws JMSException if an error occurs while accessing the Message properties.

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/97f873d4/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 547a6bc..74685a6 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
@@ -18,7 +18,9 @@ package org.apache.qpid.jms.message.facade.defaults;
 
 import java.nio.charset.Charset;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import javax.jms.JMSException;
 
@@ -108,6 +110,16 @@ public class JmsDefaultMessageFacade implements JmsMessageFacade {
     }
 
     @Override
+    public Set<String> getPropertyNames() throws JMSException {
+        Set<String> names = new HashSet<String>();
+        if (properties != null) {
+            names.addAll(properties.keySet());
+        }
+
+        return names;
+    }
+
+    @Override
     public boolean propertyExists(String key) throws JMSException {
         return this.properties.containsKey(key);
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org