Exclude tombstone resources when getting a resource's children

fcrepo · Oct 19, 2014 · b88d360 · b88d360
1 parent 58e32d1
commit b88d360
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/FedoraResourceImpl.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/FedoraResourceImpl.java
@@ -172,7 +172,9 @@ public Iterator<FedoraResource> apply(final Node input) {
                 public boolean apply(final Node n) {
                     LOGGER.trace("Testing child node {}", n);
                     try {
-                        return (isInternalNode.apply(n) || n.getName().equals(JCR_CONTENT));
+                        return isInternalNode.apply(n)
+                                || n.getName().equals(JCR_CONTENT)
+                                || TombstoneImpl.hasMixin(n);
                     } catch (final RepositoryException e) {
                         throw new RepositoryRuntimeException(e);
                     }

diff --git a/...po-kernel-impl/src/test/java/org/fcrepo/integration/kernel/impl/FedoraResourceImplIT.java b/...po-kernel-impl/src/test/java/org/fcrepo/integration/kernel/impl/FedoraResourceImplIT.java
@@ -638,4 +638,15 @@ public void testGetChildrenWithHierarchy() throws RepositoryException {
 
         assertEquals(resource, container.getChildren().next());
     }
+
+    @Test
+    public void testGetChildrenTombstonesAreHidden() throws RepositoryException {
+        final String pid = getRandomPid();
+        final FedoraObject container = objectService.findOrCreateObject(session, "/" + pid);
+        final FedoraResource resource = objectService.findOrCreateObject(session, "/" + pid + "/a");
+
+        resource.delete();
+
+        assertFalse(container.getChildren().hasNext());
+    }
 }
diff --git a/fcrepo-kernel-impl/src/test/java/org/fcrepo/kernel/impl/FedoraResourceImplTest.java b/fcrepo-kernel-impl/src/test/java/org/fcrepo/kernel/impl/FedoraResourceImplTest.java
@@ -391,6 +391,15 @@ public void testGetChildrenExcludesModeSystem() throws RepositoryException {
         assertFalse("Expected an empty iterator", children.hasNext());
     }
 
+    @Test
+    public void testGetChildrenExcludesTombstones() throws RepositoryException {
+        when(mockNode.getNodes()).thenReturn(nodeIterator(mockChild));
+        when(mockChild.isNodeType("fedora:tombstone")).thenReturn(true);
+        when(mockChild.getName()).thenReturn("x");
+        final Iterator<FedoraResource> children = testObj.getChildren();
+        assertFalse("Expected an empty iterator", children.hasNext());
+    }
+
     @Test
     public void testGetChildrenExcludesJcrContent() throws RepositoryException {
         when(mockNode.getNodes()).thenReturn(nodeIterator(mockChild));