Storing only local ids as a quick fix for RSM on recent-items query.

Updated version to 0.13.

Author: abmargb

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.buddycloud</groupId>
     <artifactId>channelserver</artifactId>
     <packaging>jar</packaging>
-    <version>0.12.0-search</version>
+    <version>0.13</version>
     <name>Buddycloud Java Server</name>
     <scm>
         <url>https://github.com/buddycloud/buddycloud-server-java</url>

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/result/ItemsResult.java

@@ -10,6 +10,7 @@
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubElementProcessorAbstract;
 import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
 import org.buddycloud.channelserver.pubsub.model.NodeSubscription;
+import org.buddycloud.channelserver.pubsub.model.impl.GlobalItemIDImpl;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeItemImpl;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeSubscriptionImpl;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
@@ -124,7 +125,8 @@ private void processPublishedItem(Element item) throws NodeStoreException {
 			}
 			Date updatedDate = Conf.parseDate(entry.elementText("updated"));
 			NodeItemImpl nodeItem = new NodeItemImpl(node,
-					entry.elementText("id"), updatedDate, entry.asXML(), inReplyTo);
+					GlobalItemIDImpl.toLocalId(entry.elementText("id")), 
+					updatedDate, entry.asXML(), inReplyTo);
 			try {
 				channelManager
 						.deleteNodeItemById(node, entry.elementText("id"));

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/PublishSet.java

@@ -16,6 +16,7 @@
 import org.buddycloud.channelserver.pubsub.model.NodeAffiliation;
 import org.buddycloud.channelserver.pubsub.model.NodeItem;
 import org.buddycloud.channelserver.pubsub.model.NodeSubscription;
+import org.buddycloud.channelserver.pubsub.model.impl.GlobalItemIDImpl;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeItemImpl;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.dom4j.Element;
@@ -151,9 +152,7 @@ private boolean extractItemDetails(Element item) throws InterruptedException {
 		entry = vEntry.createBcCompatible(publishersJID.toBareJID(),
 				requestIq.getTo().toBareJID(), node);
 
-		id = entry.element("id").getText();
-		String[] idParts = id.split(",");
-		id = idParts[2];
+		id = GlobalItemIDImpl.toLocalId(entry.element("id").getText());
 
 		String updatedText = entry.elementText("updated");
 

src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/ItemsProcessor.java

@@ -9,6 +9,7 @@
 import org.buddycloud.channelserver.channel.Conf;
 import org.buddycloud.channelserver.db.exception.ItemNotFoundException;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
+import org.buddycloud.channelserver.pubsub.model.impl.GlobalItemIDImpl;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeItemImpl;
 import org.dom4j.Element;
 import org.xmpp.packet.Message;
@@ -66,8 +67,8 @@ private void handleNewItem(Element entry) throws NodeStoreException {
 			Date updatedDate = Conf.parseDate(entry.elementText("updated"));
 			deleteItem(entry.elementText("id"));
 			NodeItemImpl nodeItem = new NodeItemImpl(node,
-					entry.elementText("id"), updatedDate, entry.asXML(),
-					inReplyTo);
+					GlobalItemIDImpl.toLocalId(entry.elementText("id")), 
+					updatedDate, entry.asXML(), inReplyTo);
 			channelManager.addNodeItem(nodeItem);
 		} catch (IllegalArgumentException e) {
 			logger.error(e);

src/main/java/org/buddycloud/channelserver/pubsub/model/impl/GlobalItemIDImpl.java

@@ -97,6 +97,18 @@ public static GlobalItemID fromBuddycloudString(String itemId) {
 		return new GlobalItemIDImpl(null, splittedItemId[0], splittedItemId[1]);
 	}
 
+	public static String toLocalId(String itemId) {
+		if (itemId == null) {
+			return null;
+		}
+		String[] splittedItemId = itemId.split(",");
+		if (splittedItemId.length == 1) {
+			// Already a local id
+			return itemId;
+		}
+		return fromBuddycloudString(itemId).getItemID();
+	}
+	
 	@Override
 	public int hashCode() {
 		final int prime = 31;