Merge pull request #790 from fcrepo4/fcrepo-1531

Using premis:hasMessageDigest for checksums
fcrepo · Jul 12, 2015 · 4c4e1c3 · 4c4e1c3
2 parents 3e88453 + aba7e4b
commit 4c4e1c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java
@@ -61,6 +61,7 @@
 import static org.fcrepo.kernel.RdfLexicon.FIRST_PAGE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_CHILD;
 import static org.fcrepo.kernel.RdfLexicon.HAS_MEMBER_RELATION;
+import static org.fcrepo.kernel.RdfLexicon.HAS_MESSAGE_DIGEST;
 import static org.fcrepo.kernel.RdfLexicon.HAS_OBJECT_COUNT;
 import static org.fcrepo.kernel.RdfLexicon.HAS_OBJECT_SIZE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_PRIMARY_IDENTIFIER;
@@ -473,6 +474,8 @@ public void testGetNonRDFSourceDescription() throws Exception {
                         createURI(REPOSITORY_NAMESPACE + "NonRdfSourceDescription")));
         assertTrue("Binary should be a ldp:NonRDFSource",
                 graphStore.contains(ANY, createURI(serverAddress + pid + "/x"), rdfType, NON_RDF_SOURCE.asNode()));
+        assertTrue("Binary should have a checksum",
+                graphStore.contains(ANY, createURI(serverAddress + pid + "/x"), HAS_MESSAGE_DIGEST.asNode(), ANY));
     }
 
     @Test

diff --git a/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd b/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd
@@ -68,7 +68,7 @@
 [fedora:Binary] > fedora:Resource mixin
   - premis:hasOriginalName (STRING)
   - premis:hasSize (LONG) COPY
-  - fedora:digest (URI) COPY
+  - premis:hasMessageDigest (URI) COPY
 
 [fedora:Skolem] > mix:referenceable mixin
 

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java
@@ -58,7 +58,7 @@ public interface FedoraJcrTypes {
 
     String CONTENT_SIZE = "premis:hasSize";
 
-    String CONTENT_DIGEST = "fedora:digest";
+    String CONTENT_DIGEST = "premis:hasMessageDigest";
 
     String FCR_METADATA = "fcr:metadata";