FedoraRepositoryNamespaces now streams RDF

fcrepo · Nov 24, 2013 · daac99d · daac99d
1 parent 449420b
commit daac99d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryNamespaces.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryNamespaces.java
@@ -45,6 +45,7 @@
 import org.fcrepo.http.commons.AbstractResource;
 import org.fcrepo.http.commons.responses.HtmlTemplate;
 import org.fcrepo.http.commons.session.InjectedSession;
+import org.fcrepo.kernel.utils.iterators.RdfStream;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
@@ -82,7 +83,7 @@ public Response updateNamespaces(final InputStream requestBodyStream)
 
         try {
             final Dataset dataset =
-                nodeService.getNamespaceRegistryGraph(session);
+                nodeService.getNamespaceRegistryDataset(session);
             parseExecute(IOUtils.toString(requestBodyStream), dataset);
             session.save();
             return status(SC_NO_CONTENT).build();
@@ -101,14 +102,7 @@ public Response updateNamespaces(final InputStream requestBodyStream)
     @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES,
             TEXT_HTML})
     @HtmlTemplate("jcr:namespaces")
-    public Dataset getNamespaces() throws RepositoryException, IOException {
-
-        try {
-            final Dataset dataset =
-                nodeService.getNamespaceRegistryGraph(session);
-            return dataset;
-        } finally {
-            session.logout();
-        }
+    public RdfStream getNamespaces() throws RepositoryException, IOException {
+        return nodeService.getNamespaceRegistryStream(session).session(session);
     }
 }
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraRepositoryNamespacesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraRepositoryNamespacesTest.java
@@ -33,6 +33,7 @@
 
 import org.fcrepo.http.api.repository.FedoraRepositoryNamespaces;
 import org.fcrepo.kernel.services.NodeService;
+import org.fcrepo.kernel.utils.iterators.RdfStream;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -51,6 +52,8 @@ public class FedoraRepositoryNamespacesTest {
     @Mock
     private Dataset mockDataset;
 
+    private RdfStream testRdfStream = new RdfStream();
+
     private Session mockSession;
 
     @Before
@@ -66,17 +69,17 @@ public void setUp() throws RepositoryException, URISyntaxException,
 
     @Test
     public void testGetNamespaces() throws RepositoryException, IOException {
-        when(mockNodeService.getNamespaceRegistryGraph(mockSession))
-                .thenReturn(mockDataset);
-        assertEquals(mockDataset, testObj.getNamespaces());
+        when(mockNodeService.getNamespaceRegistryStream(mockSession))
+                .thenReturn(testRdfStream);
+        assertEquals(testRdfStream, testObj.getNamespaces());
     }
 
     @Test
     public void testUpdateNamespaces() throws RepositoryException, IOException {
 
         final Model model = createDefaultModel();
         final Dataset mockDataset = DatasetFactory.create(model);
-        when(mockNodeService.getNamespaceRegistryGraph(mockSession))
+        when(mockNodeService.getNamespaceRegistryDataset(mockSession))
                 .thenReturn(mockDataset);
 
         testObj.updateNamespaces(new ByteArrayInputStream(

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/RepositoryService.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/RepositoryService.java
@@ -184,7 +184,7 @@ public String apply(final String p) {
      * @return
      * @throws RepositoryException
      */
-    public Dataset getNamespaceRegistryGraph(final Session session)
+    public Dataset getNamespaceRegistryDataset(final Session session)
         throws RepositoryException {
 
         final Model model =
@@ -199,6 +199,21 @@ public Dataset getNamespaceRegistryGraph(final Session session)
 
     }
 
+    /**
+     * Serialize the JCR namespace information as an {@link RdfStream}
+     *
+     * @param session
+     * @return
+     * @throws RepositoryException
+     */
+    public RdfStream getNamespaceRegistryStream(final Session session)
+        throws RepositoryException {
+
+        return JcrRdfTools.withContext(null, session).getNamespaceTriples();
+
+    }
+
+
     /**
      * Perform a full-text search on the whole repository and return the
      * information as an RDF Dataset

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/services/ObjectServiceIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/services/ObjectServiceIT.java
@@ -81,7 +81,7 @@ public void testGetNamespaceRegistryGraph() throws Exception {
         final Session session = repository.login();
 
         final Dataset registryGraph =
-            objectService.getNamespaceRegistryGraph(session);
+            objectService.getNamespaceRegistryDataset(session);
 
         final NamespaceRegistry namespaceRegistry =
             session.getWorkspace().getNamespaceRegistry();
@@ -107,7 +107,7 @@ public void testUpdateNamespaceRegistryGraph() throws Exception {
         final Session session = repository.login();
 
         final Dataset registryGraph =
-            objectService.getNamespaceRegistryGraph(session);
+            objectService.getNamespaceRegistryDataset(session);
         final NamespaceRegistry namespaceRegistry =
             session.getWorkspace().getNamespaceRegistry();