Recovering from corrupt files

Author: lloydwatkin

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

@@ -107,14 +107,14 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
             + " FROM \"items\" WHERE \"node\" = ? AND \"id\" = ?";
 
     private static final String SELECT_ITEMS_FOR_NODE = "SELECT \"node\", \"id\", \"updated\", \"xml\", \"in_reply_to\", \"created\""
-            + " FROM \"items\" WHERE \"node\" = ? ORDER BY \"updated\" DESC, \"id\" ASC";
+            + " FROM \"items\" WHERE \"node\" = ? %parentOnly% ORDER BY \"updated\" DESC, \"id\" ASC";
 
     private static final String SELECT_ITEMS_FOR_NODE_AFTER_DATE = "SELECT \"node\", \"id\", \"updated\", \"xml\", \"in_reply_to\", \"created\""
             + " FROM \"items\" WHERE \"node\" = ? AND ( \"updated\" > ? OR ( \"updated\" = ? AND \"id\" > ? ) )"
             + " ORDER BY \"updated\" ASC, \"id\" DESC";
 
     private static final String SELECT_ITEMS_FOR_NODE_BEFORE_DATE = "SELECT \"node\", \"id\", \"updated\", \"xml\", \"in_reply_to\", \"created\""
-            + " FROM \"items\" WHERE \"node\" = ? AND ( \"updated\" < ? OR ( \"updated\" = ? AND \"id\" < ? ) )"
+            + " FROM \"items\" WHERE \"node\" = ? AND ( \"updated\" < ? OR ( \"updated\" = ? AND \"id\" < ? ) ) %parentOnly%"
             + " ORDER BY \"updated\" DESC, \"id\" ASC";
 
     private static final String SELECT_ITEMS_FOR_USER_BETWEEN_DATES = "" + "SELECT \"node\", \"id\", \"updated\", \"xml\", \"in_reply_to\", \"created\""

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

@@ -161,8 +161,6 @@ public void nodeStoreExceptionReturnsInternalServerErrorStanza()
     public void testSubscriptionIncompatibleWithItemRetrievalReturnsExpectedStanza()
             throws Exception {
 
-        element.addAttribute("node", node);
-
         Mockito.when(channelManager.nodeExists(node)).thenReturn(true);
         Mockito.when(channelManager.getNodeMembership(node, jid)).thenReturn(
                 new NodeMembershipImpl(node, jid, Subscriptions.none,
@@ -197,8 +195,6 @@ public void testStandardNodeWithNoItemsReturnsNoItems() throws Exception {
 
         AccessModels accessModel = AccessModels.authorize;
 
-        element.addAttribute("node", node);
-
         NodeMembershipImpl membership = Mockito.mock(NodeMembershipImpl.class);
         Mockito.when(membership.getAffiliation()).thenReturn(
                 Affiliations.member);
@@ -238,8 +234,6 @@ public void testUnparsableNodeEntryIsIgnoredInItemsResponse()
             throws Exception {
         AccessModels accessModel = AccessModels.authorize;
 
-        element.addAttribute("node", node);
-
         NodeMembershipImpl membership = Mockito.mock(NodeMembershipImpl.class);
         Mockito.when(membership.getAffiliation()).thenReturn(
                 Affiliations.member);
@@ -347,8 +341,6 @@ public void testPagingAfterItem() throws Exception {
         rsm.addElement("after").setText(
                 "tag:denmark.lit,/user/" + node + "/posts,item-id");
 
-        element.addAttribute("node", node);
-
         Mockito.when(channelManager.nodeExists(anyString())).thenReturn(true);
 
         NodeMembershipImpl membership = Mockito.mock(NodeMembershipImpl.class);
@@ -372,8 +364,6 @@ public void pagingAfterItemWithPlainNodeID() throws Exception {
 
         rsm.addElement("after").setText("item-id");
 
-        element.addAttribute("node", node);
-
         Mockito.when(channelManager.nodeExists(anyString())).thenReturn(true);
 
         itemsGet.process(element, jid, request, rsm);
@@ -423,9 +413,6 @@ public void canRetrieveSingleItem() throws Exception {
         String id = "12345";
         String payload = "<entry>entry text</entry>";
 
-        element.addAttribute("node", node);
-        element.addElement("item").addAttribute("id", id);
-
         Mockito.when(channelManager.nodeExists(Mockito.anyString()))
                 .thenReturn(true);
 
@@ -460,8 +447,6 @@ public void settingParentOnlyToTrueRequestsParentOnlyItems() throws Exception {
 
       AccessModels accessModel = AccessModels.authorize;
 
-      element.addAttribute("node", node);
-
       NodeMembershipImpl membership = Mockito.mock(NodeMembershipImpl.class);
       Mockito.when(membership.getAffiliation()).thenReturn(
               Affiliations.member);
@@ -508,8 +493,6 @@ public void settingParentOnlyToOneRequestsParentOnlyItems() throws Exception {
 
       AccessModels accessModel = AccessModels.authorize;
 
-      element.addAttribute("node", node);
-
       NodeMembershipImpl membership = Mockito.mock(NodeMembershipImpl.class);
       Mockito.when(membership.getAffiliation()).thenReturn(
               Affiliations.member);
@@ -556,8 +539,6 @@ public void settingIllegalParentOnlyAttributeDoesNotRequestParentOnlyItems() thr
 
       AccessModels accessModel = AccessModels.authorize;
 
-      element.addAttribute("node", node);
-
       NodeMembershipImpl membership = Mockito.mock(NodeMembershipImpl.class);
       Mockito.when(membership.getAffiliation()).thenReturn(
               Affiliations.member);
@@ -599,3 +580,4 @@ public void settingIllegalParentOnlyAttributeDoesNotRequestParentOnlyItems() thr
               .nodeCount());
     }
 }
+