JCR path service and datastream inputstream service

fcrepo · Feb 12, 2013 · c52a989 · c52a989
1 parent ede56f0
commit c52a989
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 0 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java
@@ -15,6 +15,7 @@
 
 import javax.inject.Inject;
 import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -81,4 +82,9 @@ public Node createDatastreamNode(final Session session,
 
         return ds;
     }
+
+    public InputStream getDatastreamContentInputStream(final Session session, final String dsPath) throws RepositoryException {
+        return session.getNode(dsPath).getNode(JCR_CONTENT).getProperty(JCR_DATA).getBinary()
+                .getStream();
+    }
 }
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/PathService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/PathService.java
@@ -0,0 +1,20 @@
+package org.fcrepo.services;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PathService {
+
+    private static final Logger logger = LoggerFactory
+            .getLogger(DatastreamService.class);
+
+
+    public String getObjectJcrNodePath(String pid) {
+        return "/objects/" + pid;
+    }
+
+    public String getDatastreamJcrNodePath(String pid, String dsid) {
+        return getObjectJcrNodePath(pid) + "/" + dsid;
+    }
+}
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/DatastreamServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/DatastreamServiceTest.java
@@ -0,0 +1,48 @@
+package org.fcrepo.services;
+
+import org.fcrepo.AbstractTest;
+import org.junit.Test;
+import org.springframework.test.context.ContextConfiguration;
+
+import javax.inject.Inject;
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import static org.jgroups.util.Util.assertEquals;
+import static org.jgroups.util.Util.assertTrue;
+import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
+import static org.modeshape.jcr.api.JcrConstants.JCR_DATA;
+
+
+@ContextConfiguration({ "/spring-test/repo.xml" })
+public class DatastreamServiceTest extends AbstractTest {
+
+    @Inject
+    private Repository repository;
+
+    @Test
+    public void testCreateDatastreamNode() throws Exception {
+        Session session = repository.login();
+        InputStream is = new ByteArrayInputStream("asdf".getBytes());
+
+        Node n = new DatastreamService().createDatastreamNode(session, "testDatastreamNode", "application/octet-stream", is);
+
+        session.save();
+
+        session = repository.login();
+
+        assertTrue(session.getRootNode().hasNode("testDatastreamNode"));
+
+        System.out.println(session.getNode("/testDatastreamNode").getNode(JCR_CONTENT).getProperty(JCR_DATA).getString());
+        assertEquals("asdf", session.getNode("/testDatastreamNode").getNode(JCR_CONTENT).getProperty(JCR_DATA).getString());
+
+    }
+
+    @Test
+    public void testGetDatastreamContentInputStream() throws Exception {
+
+    }
+}