Support retrieval of individual items

Author: Lloyd Watkin

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

@@ -128,14 +128,35 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 				outQueue.put(reply);
 				return;
 			}
-			getItems();
+			if (null == element.element("item")) {
+			    getItems();
+			} else {
+			    if (false == getItem()) return;
+			}
 		} catch (NodeStoreException e) {
 			setErrorCondition(PacketError.Type.wait,
 					PacketError.Condition.internal_server_error);
 		}
 		outQueue.put(reply);
 	}
 
+	private boolean getItem() throws Exception {
+		NodeItem nodeItem = channelManager.getNodeItem(node, element.element("item").attributeValue("id"));
+		if (null == nodeItem) { 
+			if (false == channelManager.isLocalNode(node)) {
+		        makeRemoteRequest();
+			    return false;
+			}
+			setErrorCondition(PacketError.Type.cancel, PacketError.Condition.item_not_found);
+			return true;
+		}
+		Element pubsub = reply.getElement().addElement("pubsub");
+		pubsub.addNamespace("", JabberPubsub.NAMESPACE_URI);
+		Element items = pubsub.addElement("items").addAttribute("node", node);
+		addItemToResponse(nodeItem, items);
+		return true;
+	}
+
 	private void makeRemoteRequest() throws InterruptedException {
 		requestIq.setTo(new JID(node.split("/")[2]).getDomain());
 		if (null == requestIq.getElement().element("pubsub").element("actor")) {
@@ -300,19 +321,8 @@ private int getNodeItems(Element items, int maxItemsToReturn,
 				if (firstItem == null) {
 					firstItem = nodeItem.getId();
 				}
-				try {
-					entry = xmlReader.read(
-							new StringReader(nodeItem.getPayload()))
-							.getRootElement();
-					Element item = items.addElement("item");
-					item.addAttribute("id", nodeItem.getId());
-					item.add(entry);
-					lastItem = nodeItem.getId();
-				} catch (DocumentException e) {
-					logger.error("Error parsing a node entry, ignoring. "
-							+ nodeItem);
-				}
-
+				addItemToResponse(nodeItem, items);
+				lastItem = nodeItem.getId();
 			}
 			logger.debug("Including RSM there are " + rsmEntriesCount 
 			    + " items for node " + node);
@@ -323,6 +333,20 @@ private int getNodeItems(Element items, int maxItemsToReturn,
 		}
 	}
 
+	private void addItemToResponse(NodeItem nodeItem, Element parent) {
+		try {
+			entry = xmlReader.read(
+					new StringReader(nodeItem.getPayload()))
+					.getRootElement();
+			Element item = parent.addElement("item");
+			item.addAttribute("id", nodeItem.getId());
+			item.add(entry);
+		} catch (DocumentException e) {
+			logger.error("Error parsing a node entry, ignoring. "
+					+ nodeItem);
+		}
+	}
+
 	/**
 	 * Get items for the /subscriptions node
 	 */

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

@@ -24,6 +24,7 @@
 import org.buddycloud.channelserver.pubsub.model.NodeItem;
 import org.buddycloud.channelserver.pubsub.model.NodeSubscription;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeAffiliationImpl;
+import org.buddycloud.channelserver.pubsub.model.impl.NodeItemImpl;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeSubscriptionImpl;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.buddycloud.channelserver.utils.node.NodeAclRefuseReason;
@@ -662,4 +663,70 @@ public void testPagingAfterItemWithInvalidNode() throws Exception {
 
 		assertEquals("Error expected", "error", p.getElement().attributeValue("type"));
 	}
+	
+	@Test
+	public void testGetItemNotFoundIfSingleItemNotFound() throws Exception {
+        element.addAttribute("node", "/user/francisco@denmark.lit/posts");
+        element.addElement("item").addAttribute("id", "12345");
+		
+		Mockito.when(channelManager.getNodeItem(eq(node), Mockito.anyString()))
+				.thenReturn(null);
+		Mockito.when(channelManager.getUserSubscription(node, jid)).thenReturn(
+				new NodeSubscriptionImpl(node, jid, Subscriptions.subscribed));
+		Mockito.when(channelManager.getUserAffiliation(node, jid)).thenReturn(
+				new NodeAffiliationImpl(node, jid, Affiliations.member, new Date()));
+		
+		itemsGet.process(element, jid, request, null);
+		
+		Packet p = queue.poll();
+		assertEquals("Error expected", "error", p.getElement().attributeValue("type"));
+		assertEquals(
+			"Expected 'cancel'",
+			"cancel",
+			p.getElement().element("error").attributeValue("type")
+		);
+		assertNotNull(p.getElement().element("error").element("item-not-found"));
+	}
+	
+	
+	@Test
+	public void testCanRetrieveSingleItem() throws Exception {
+		
+		String id = "12345";
+		String payload = "<entry>entry text</entry>";
+		
+        element.addAttribute("node", node);
+        element.addElement("item").addAttribute("id", id);
+        		
+        NodeItem nodeItem = new NodeItemImpl(node, id, new Date(), payload);
+		Mockito.when(channelManager.getNodeItem(eq(node), Mockito.anyString()))
+				.thenReturn(nodeItem);
+		Mockito.when(channelManager.getUserSubscription(node, jid)).thenReturn(
+				new NodeSubscriptionImpl(node, jid, Subscriptions.subscribed));
+		Mockito.when(channelManager.getUserAffiliation(node, jid)).thenReturn(
+				new NodeAffiliationImpl(node, jid, Affiliations.member, new Date()));
+		
+		itemsGet.process(element, jid, request, null);
+		
+		Packet p = queue.poll();
+		Packet response = queue.poll();
+		Element element = response.getElement();
+
+		Assert.assertEquals(IQ.Type.result.toString(),
+				element.attributeValue("type"));
+		Assert.assertEquals(node, element.element("pubsub").element("items")
+				.attributeValue("node"));
+
+		Assert.assertEquals(1, element.element("pubsub").element("items")
+				.nodeCount());
+		Assert.assertEquals(
+			node,
+			element.element("pubsub").element("items").attributeValue("node")
+		);
+		Assert.assertEquals(id, element.element("pubsub").element("items")
+				.element("item").attributeValue("id"));
+		Assert.assertEquals("entry text",
+				element.element("pubsub").element("items").element("item")
+						.elementText("entry"));
+	}
 }