Merge pull request #286 from buddycloud/issue-285

Fixes #285

Author: lloydwatkin

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/AffiliationsGet.java

@@ -13,6 +13,8 @@
 import org.buddycloud.channelserver.utils.XMLConstants;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.QName;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
@@ -121,7 +123,7 @@ private boolean getUserMemberships(Element affiliations) throws NodeStoreExcepti
 
     String ephemeralValue =
         request.getChildElement().element(XMLConstants.AFFILIATIONS_ELEM)
-            .attributeValue(XMLConstants.BUDDYCLOUD_XMLNS_PREFIX + XMLConstants.EPHEMERAL);
+            .attributeValue(new QName(XMLConstants.EPHEMERAL, Namespace.get(Buddycloud.NS)));
     if ((null != ephemeralValue) && ephemeralValue.equals("true")) {
       ephemeral = true;
     }

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGet.java

@@ -12,6 +12,8 @@
 import org.buddycloud.channelserver.utils.XMLConstants;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.QName;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
@@ -137,7 +139,7 @@ private boolean getUserMemberships(Element subscriptions) throws NodeStoreExcept
 
         String ephemeralValue =
             requestIq.getChildElement().element(XMLConstants.SUBSCRIPTIONS_ELEM)
-                .attributeValue(XMLConstants.BUDDYCLOUD_XMLNS_PREFIX + XMLConstants.EPHEMERAL);
+                .attributeValue(new QName(XMLConstants.EPHEMERAL, Namespace.get(Buddycloud.NS)));
         if ((null != ephemeralValue) && ephemeralValue.equals("true")) {
           ephemeral = true;
         }

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/AffiliationsGetTest.java

@@ -11,14 +11,15 @@
 import org.buddycloud.channelserver.channel.ChannelManager;
 import org.buddycloud.channelserver.packetHandler.iq.IQTestHandler;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.JabberPubsub;
-import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubElementProcessor;
 import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
 import org.buddycloud.channelserver.pubsub.model.NodeMembership;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeMembershipImpl;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.buddycloud.channelserver.utils.XMLConstants;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.QName;
 import org.dom4j.tree.BaseElement;
 import org.junit.Before;
 import org.junit.Test;
@@ -427,7 +428,8 @@ public void canRequestAffiliationsForEphemeralOnlyNodes() throws Exception {
         request.getElement().element(XMLConstants.PUBSUB_ELEM)
             .element(XMLConstants.AFFILIATIONS_ELEM);
     affiliations.addNamespace("bc", Buddycloud.NS);
-    affiliations.addAttribute("bc:ephemeral", "true");
+    affiliations.addAttribute(new QName(
+        XMLConstants.EPHEMERAL, Namespace.get(Buddycloud.NS)), "true");
 
     try {
       affiliationsGet.process(element, jid, request, null);
@@ -460,7 +462,8 @@ public void providingAnIncorrectValueForEphemeralAttributeResultsInNotEphemeralG
         request.getElement().element(XMLConstants.PUBSUB_ELEM)
             .element(XMLConstants.AFFILIATIONS_ELEM);
     affiliations.addNamespace("bc", Buddycloud.NS);
-    affiliations.addAttribute("bc:ephemeral", "sure");
+    affiliations.addAttribute(new QName(
+        XMLConstants.EPHEMERAL, Namespace.get(Buddycloud.NS)), "sure");
 
     try {
       affiliationsGet.process(element, jid, request, null);

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGetTest.java

@@ -17,6 +17,8 @@
 import org.buddycloud.channelserver.utils.XMLConstants;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.QName;
 import org.dom4j.tree.BaseElement;
 import org.junit.Before;
 import org.junit.Test;
@@ -218,7 +220,8 @@ public void canRequestUserSubscriptionsForEphemeralOnlyNodes() throws Exception
           request.getElement().element(XMLConstants.PUBSUB_ELEM)
               .element(XMLConstants.SUBSCRIPTIONS_ELEM);
       subscriptions.addNamespace("bc", Buddycloud.NS);
-      subscriptions.addAttribute("bc:ephemeral", "true");     
+      subscriptions.addAttribute(new QName(
+          XMLConstants.EPHEMERAL, Namespace.get(Buddycloud.NS)), "true");     
 
       try {
         subscriptionsGet.process(element, jid, request, null);
@@ -246,7 +249,8 @@ public void providingAnIncorrectValueForEphemeralAttributeResultsInNotEphemeralG
           request.getElement().element(XMLConstants.PUBSUB_ELEM)
               .element(XMLConstants.SUBSCRIPTIONS_ELEM);
       subscriptions.addNamespace("bc", Buddycloud.NS);
-      subscriptions.addAttribute("bc:ephemeral", "sure");
+      subscriptions.addAttribute(new QName(
+          XMLConstants.EPHEMERAL, Namespace.get(Buddycloud.NS)), "sure");
 
       try {
         subscriptionsGet.process(element, jid, request, null);