Mark intermediate nodes as pairtree elements

fcrepo · Oct 15, 2014 · 459fdc1 · 459fdc1
1 parent caf36e8
commit 459fdc1
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 17 deletions.
diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/AbstractService.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/AbstractService.java
@@ -18,11 +18,33 @@
 import org.fcrepo.kernel.services.Service;
 import org.modeshape.jcr.api.JcrTools;
 
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import static org.fcrepo.jcr.FedoraJcrTypes.FEDORA_PAIRTREE;
+import static org.modeshape.jcr.api.JcrConstants.NT_FOLDER;
+
 
 /**
  * @author bbpennel
  * @since Feb 20, 2014
  */
 public abstract class AbstractService implements Service {
     protected final static JcrTools jcrTools = new JcrTools();
+
+    protected Node findOrCreateNode(final Session session,
+                                    final String path,
+                                    final String finalNodeType) throws RepositoryException {
+        final Node node = jcrTools.findOrCreateNode(session, path, NT_FOLDER, finalNodeType);
+
+        Node parent = node.getParent();
+
+        while (parent.isNew()) {
+            parent.addMixin(FEDORA_PAIRTREE);
+            parent = parent.getParent();
+        }
+
+        return node;
+    }
 }
diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/BinaryServiceImpl.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/BinaryServiceImpl.java
@@ -32,7 +32,6 @@
 import static org.fcrepo.jcr.FedoraJcrTypes.FEDORA_RESOURCE;
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.modeshape.jcr.api.JcrConstants.NT_FILE;
-import static org.modeshape.jcr.api.JcrConstants.NT_FOLDER;
 import static org.modeshape.jcr.api.JcrConstants.NT_RESOURCE;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -55,7 +54,7 @@ public class BinaryServiceImpl extends AbstractService implements BinaryService
     @Override
     public FedoraBinary findOrCreateBinary(final Session session, final String path) {
         try {
-            final Node dsNode = jcrTools.findOrCreateNode(session, path, NT_FOLDER, NT_FILE);
+            final Node dsNode = findOrCreateNode(session, path, NT_FILE);
 
             if (dsNode.isNew()) {
                 initializeNewDatastreamProperties(dsNode);

diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/ObjectServiceImpl.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/ObjectServiceImpl.java
@@ -54,7 +54,7 @@ public FedoraObject findOrCreateObject(final Session session, final String path)
         LOGGER.trace("Executing findOrCreateObject() with path: {}", path);
 
         try {
-            final Node node = jcrTools.findOrCreateNode(session, path, NT_FOLDER, NT_FOLDER);
+            final Node node = findOrCreateNode(session, path, NT_FOLDER);
 
             if (node.isNew()) {
                 initializeNewObjectProperties(node);

diff --git a/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd b/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd
@@ -124,3 +124,5 @@
   - fedora:digest (URI) COPY
 
 [fedora:blanknode] > mix:referenceable mixin
+
+[fedora:pairtree] mixin
diff --git a/fcrepo-kernel-impl/src/test/java/org/fcrepo/kernel/impl/services/BinaryServiceImplTest.java b/fcrepo-kernel-impl/src/test/java/org/fcrepo/kernel/impl/services/BinaryServiceImplTest.java
@@ -55,6 +55,8 @@ public void setUp() throws RepositoryException {
         testObj = new BinaryServiceImpl();
         when(mockSession.getRootNode()).thenReturn(mockRoot);
         when(mockDsNode.getNode(JCR_CONTENT)).thenReturn(mockNode);
+        when(mockDsNode.getParent()).thenReturn(mockRoot);
+        when(mockRoot.isNew()).thenReturn(false);
     }
 
     @Test

diff --git a/fcrepo-kernel-impl/src/test/java/org/fcrepo/kernel/impl/services/ObjectServiceImplTest.java b/fcrepo-kernel-impl/src/test/java/org/fcrepo/kernel/impl/services/ObjectServiceImplTest.java
@@ -17,6 +17,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.modeshape.jcr.api.JcrConstants.NT_FOLDER;
@@ -50,6 +51,9 @@ public class ObjectServiceImplTest implements FedoraJcrTypes {
     @Mock
     private Node mockNode;
 
+    @Mock
+    private Node mockParent;
+
     @Mock
     private NodeType mockNodeType;
 
@@ -66,32 +70,30 @@ public void setUp() throws RepositoryException {
         testObj = new ObjectServiceImpl();
         when(mockSession.getRootNode()).thenReturn(mockRoot);
         when(mockRoot.getNode(testPath.substring(1))).thenReturn(mockNode);
+        when(mockNode.getParent()).thenReturn(mockRoot);
+        when(mockRoot.isNew()).thenReturn(false);
     }
 
     @Test
     public void testCreateObject() throws Exception {
-        when(mockNodeType.getName()).thenReturn(FEDORA_OBJECT);
-        final NodeType mockNodeType = mock(NodeType.class);
-        when(mockNodeType.getName()).thenReturn("nt:folder");
-        when(mockNode.getPrimaryNodeType()).thenReturn(mockNodeType);
-        when(mockNode.getMixinNodeTypes()).thenReturn(
-                new NodeType[] {mockNodeType});
+        final Node actual = testObj.findOrCreateObject(mockSession, testPath).getNode();
+        assertEquals(mockNode, actual);
+    }
+
+    @Test
+    public void testCreateObjectWithHierarchy() throws Exception {
+        when(mockNode.getParent()).thenReturn(mockParent);
+        when(mockParent.getParent()).thenReturn(mockRoot);
+        when(mockParent.isNew()).thenReturn(true);
 
         final Node actual =
                 testObj.findOrCreateObject(mockSession, testPath).getNode();
         assertEquals(mockNode, actual);
+        verify(mockParent).addMixin(FedoraJcrTypes.FEDORA_PAIRTREE);
     }
 
     @Test
     public void testGetObject() throws RepositoryException {
-        when(mockNodeType.getName()).thenReturn(FEDORA_OBJECT);
-        final NodeType mockNodeType = mock(NodeType.class);
-        when(mockNodeType.getName()).thenReturn("nt:folder");
-        when(mockNode.isNew()).thenReturn(false);
-        when(mockNode.getPrimaryNodeType()).thenReturn(mockNodeType);
-        when(mockNode.getMixinNodeTypes()).thenReturn(
-                new NodeType[] {mockNodeType});
-
         final String testPath = "/foo";
         when(mockSession.getNode(testPath)).thenReturn(mockNode);
         when(mockJcrTools.findOrCreateNode(mockSession, "/foo", NT_FOLDER, NT_FOLDER)).thenReturn(mockNode);

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/jcr/FedoraJcrTypes.java b/fcrepo-kernel/src/main/java/org/fcrepo/jcr/FedoraJcrTypes.java
@@ -31,6 +31,8 @@ public interface FedoraJcrTypes {
 
     String FEDORA_BINARY = "fedora:binary";
 
+    String FEDORA_PAIRTREE = "fedora:pairtree";
+
     String LDP_CONTAINER = "ldp:Container";
 
     String JCR_LASTMODIFIED = "jcr:lastModified";