Merge pull request #105 from surevine/issue-83

Handle full and minimal parent item references. Closes #83.

Author: martin-hewitt

src/main/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStore.java

@@ -1281,7 +1281,7 @@ public ClosableIteratorImpl<NodeItem> getNodeItemReplies(String nodeId,
 			}
 			stmt = conn.prepareStatement(query);
 			stmt.setString(1, nodeId);
-			stmt.setString(2, itemId);
+			stmt.setString(2, "%" + itemId);
 			stmt.setTimestamp(3, new java.sql.Timestamp(since.getTime()));
 			if (-1 != limit)
 				stmt.setInt(4, limit);
@@ -1311,7 +1311,7 @@ public int getCountNodeItemReplies(String nodeId, String itemId)
 		try {
 			stmt = conn.prepareStatement(dialect.selectCountItemReplies());
 			stmt.setString(1, nodeId);
-			stmt.setString(2, itemId);
+			stmt.setString(2, "%" + itemId);
 
 			java.sql.ResultSet rs = stmt.executeQuery();
 
@@ -1344,7 +1344,7 @@ public ClosableIteratorImpl<NodeItem> getNodeItemThread(String nodeId,
 			}
 			stmt = conn.prepareStatement(query);
 			stmt.setString(1, nodeId);
-			stmt.setString(2, itemId);
+			stmt.setString(2, "%" + itemId);
 			stmt.setString(3, itemId);
 			stmt.setTimestamp(4, new java.sql.Timestamp(since.getTime()));
 			if (-1 != limit)
@@ -1375,7 +1375,7 @@ public int getCountNodeThread(String nodeId, String itemId)
 		try {
 			stmt = conn.prepareStatement(dialect.selectCountItemThread());
 			stmt.setString(1, nodeId);
-			stmt.setString(2, itemId);
+			stmt.setString(2, "%" + itemId);
 			stmt.setString(3, itemId);
 
 			java.sql.ResultSet rs = stmt.executeQuery();

src/main/java/org/buddycloud/channelserver/db/jdbc/dialect/Sql92NodeStoreDialect.java

@@ -173,23 +173,23 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
 
 	private static final String SELECT_ITEM_REPLIES = ""
 			+ "SELECT \"id\", \"node\", \"xml\", \"updated\", \"in_reply_to\" "
-			+ "FROM \"items\" WHERE \"node\" = ? AND \"in_reply_to\" = ? "
+			+ "FROM \"items\" WHERE \"node\" = ? AND \"in_reply_to\" LIKE ? "
 			+ "AND \"updated\" > ? ORDER BY \"updated\" DESC";
 
 	private static final String SELECT_ITEM_THREAD = ""
 			+ "SELECT \"id\", \"node\", \"xml\", \"updated\", \"in_reply_to\" "
 			+ "FROM \"items\" WHERE \"node\" = ? "
-			+ "AND (\"in_reply_to\" = ? OR \"id\" = ?) "
+			+ "AND (\"in_reply_to\" LIKE ? OR \"id\" = ?) "
 			+ "AND \"updated\" > ? ORDER BY \"updated\" DESC";
 
 	private static final String SELECT_COUNT_ITEM_REPLIES = ""
 			+ "SELECT COUNT(\"id\") "
-			+ "FROM \"items\" WHERE \"node\" = ? AND \"in_reply_to\" = ? ";
+			+ "FROM \"items\" WHERE \"node\" = ? AND \"in_reply_to\" LIKE ? ";
 
 	private static final String SELECT_COUNT_ITEM_THREAD = ""
 			+ "SELECT COUNT(\"id\") "
 			+ "FROM \"items\" WHERE \"node\" = ? "
-			+ "AND (\"in_reply_to\" = ? OR \"id\" = ?) ";
+			+ "AND (\"in_reply_to\" LIKE ? OR \"id\" = ?) ";
 
 	private static final String COUNT_SUBSCRIPTIONS_FOR_NODE = "SELECT COUNT(*) "
 			+ "FROM \"subscriptions\", \"affiliations\" WHERE "

src/test/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStoreTest.java

@@ -1938,7 +1938,7 @@ public void testCanGetItemRepliesWithResultSetManagement() throws Exception {
 		NodeItem testItem3 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a8",
 				new Date(100), "<entry>payload</entry>", "a5");
 		NodeItem testItem4 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a9",
-				new Date(200), "<entry>payload</entry>", "a5");
+				new Date(200), "<entry>payload</entry>", "/full-node-item-id-ref/a5");
 		store.addNodeItem(testItem1);
 		store.addNodeItem(testItem2);
 		store.addNodeItem(testItem3);
@@ -1963,7 +1963,7 @@ public void testCanGetItemRepliesWithResultSetManagement() throws Exception {
 	public void testCanGetCountOfItemReplies() throws Exception {
 		dbTester.loadData("node_1");
 		NodeItem testItem = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a6",
-				new Date(), "<entry>payload</entry>", "a5");
+				new Date(), "<entry>payload</entry>", "/full-node-item-id-ref/a5");
 		store.addNodeItem(testItem);
 
 		int items = store.getCountNodeItemReplies(TEST_SERVER1_NODE1_ID, "a5");
@@ -1974,7 +1974,7 @@ public void testCanGetCountOfItemReplies() throws Exception {
 	public void testCanGetItemThread() throws Exception {
 		dbTester.loadData("node_1");
 		NodeItem testItem = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a6",
-				new Date(), "<entry>payload</entry>", "a5");
+				new Date(), "<entry>payload</entry>", "/full-node-item-id-ref/a5");
 		store.addNodeItem(testItem);
 
 		ClosableIteratorImpl<NodeItem> items = store.getNodeItemThread(
@@ -1990,6 +1990,7 @@ public void testCanGetItemThread() throws Exception {
 		assertEquals(2, count);
 		assertSameNodeItem(item, testItem);
 	}
+	
 
 	@Test
 	public void testCanGetItemThreadWithResultSetManagement() throws Exception {
@@ -2000,7 +2001,7 @@ public void testCanGetItemThreadWithResultSetManagement() throws Exception {
 				new Date(20), "<entry>payload</entry>", "a100");
 		NodeItem testItem2 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a7",
 				new Date(40), "<entry>payload</entry>", "a100");
-		NodeItem testItem3 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a8",
+		NodeItem testItem3 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "/full-node-item-id-ref/a8",
 				new Date(80), "<entry>payload</entry>", "a100");
 		NodeItem testItem4 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a9",
 				new Date(160), "<entry>payload</entry>", "a100");
@@ -2029,7 +2030,7 @@ public void testCanGetItemThreadWithResultSetManagement() throws Exception {
 	public void testCanGetCountOfItemThread() throws Exception {
 		dbTester.loadData("node_1");
 		NodeItem testItem = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a6",
-				new Date(), "<entry>payload</entry>", "a5");
+				new Date(), "<entry>payload</entry>", "/full-node-item-id-ref/a5");
 		store.addNodeItem(testItem);
 
 		int items = store.getCountNodeThread(TEST_SERVER1_NODE1_ID, "a5");