Remove root version from triples

fcrepo · Oct 22, 2014 · 84ffee0 · 84ffee0
1 parent fee9733
commit 84ffee0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraVersionsIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraVersionsIT.java
@@ -72,6 +72,7 @@ public void testGetObjectVersionProfile() throws Exception {
 
         createObject(pid);
         enableVersioning(pid);
+        postObjectVersion(pid, "v0.0.1");
         final HttpGet getVersion =
             new HttpGet(serverAddress + pid + "/fcr:versions");
         logger.debug("Retrieved version profile:");

diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/rdf/impl/VersionsRdfContext.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/rdf/impl/VersionsRdfContext.java
@@ -22,6 +22,7 @@
 import static org.fcrepo.kernel.RdfLexicon.HAS_VERSION_LABEL;
 import static org.fcrepo.kernel.impl.identifiers.NodeResourceConverter.nodeConverter;
 import static org.fcrepo.kernel.impl.identifiers.NodeResourceConverter.nodeToResource;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.Iterator;
 
@@ -39,6 +40,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.Iterators;
 import com.hp.hpl.jena.graph.Triple;
+import org.slf4j.Logger;
 
 
 /**
@@ -56,6 +58,7 @@ public class VersionsRdfContext extends RdfStream {
 
     private final com.hp.hpl.jena.graph.Node subject;
 
+    private final Logger LOGGER = getLogger(VersionsRdfContext.class);
 
     /**
      * Ordinary constructor.
@@ -87,6 +90,11 @@ private Iterator<Triple> versionTriples() throws RepositoryException {
             public Iterator<Triple> apply(final Version version) {
 
                 try {
+                    /* Discard jcr:rootVersion */
+                    if (version.getName().equals(versionHistory.getRootVersion().getName())) {
+                        LOGGER.trace("Skipped root version from triples");
+                        return new RdfStream();
+                    }
                     final Node frozenNode = version.getFrozenNode();
                     final com.hp.hpl.jena.graph.Node versionSubject
                             = nodeToResource(idTranslator).convert(frozenNode).asNode();

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
@@ -66,6 +66,7 @@
 import org.fcrepo.kernel.services.BinaryService;
 import org.fcrepo.kernel.services.NodeService;
 import org.fcrepo.kernel.services.ObjectService;
+import org.fcrepo.kernel.services.VersionService;
 import org.fcrepo.kernel.utils.iterators.PropertyIterator;
 import org.fcrepo.kernel.utils.iterators.RdfStream;
 import org.junit.After;
@@ -103,6 +104,9 @@ public class FedoraResourceImplIT extends AbstractIT {
     @Inject
     BinaryService binaryService;
 
+    @Inject
+    VersionService versionService;
+
     private Session session;
 
     private DefaultIdentifierTranslator subjects;
@@ -386,11 +390,13 @@ public void testGetObjectVersionGraph() throws RepositoryException {
             objectService.findOrCreateObject(session, "/testObjectVersionGraph");
 
         object.getNode().addMixin("mix:versionable");
+        session.save();
 
+        // create a version and make sure there are 2 versions (root + created)
+        versionService.createVersion(session, object.getPath());
         session.save();
 
         object.addVersionLabel("v0.0.1");
-
         session.save();
 
         final Model graphStore = object.getTriples(subjects, VersionsRdfContext.class).asModel();