Merge pull request #41 from acoburn/fcrepo-2009

Follow-on to cleanup of RdfLexicon
fcrepo-exts · Oct 28, 2016 · fe77da1 · fe77da1
2 parents 4b9acf8 + 802c147
commit fe77da1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/org/fcrepo/audit/AuditProperties.java b/src/main/java/org/fcrepo/audit/AuditProperties.java
@@ -17,14 +17,13 @@
  */
 package org.fcrepo.audit;
 
+import static org.apache.jena.vocabulary.RDF.type;
 import static org.fcrepo.audit.AuditNamespaces.REPOSITORY;
 import static org.fcrepo.audit.AuditNamespaces.AUDIT;
 import static org.fcrepo.audit.AuditNamespaces.PREMIS;
 import static org.fcrepo.audit.AuditNamespaces.PROV;
 import static org.fcrepo.audit.AuditNamespaces.EVENT_TYPE;
 import static org.fcrepo.kernel.api.RdfLexicon.EVENT_NAMESPACE;
-import static org.fcrepo.kernel.api.RdfLexicon.RDF_NAMESPACE;
-
 
 /**
  * @author acoburn
@@ -48,7 +47,7 @@ public final class AuditProperties {
     public static final String PREMIS_AGENT = PREMIS + "hasEventRelatedAgent";
     public static final String PREMIS_TYPE = PREMIS + "hasEventType";
 
-    public static final String RDF_TYPE = RDF_NAMESPACE + "type";
+    public static final String RDF_TYPE = type.getURI();
 
     public static final String BINARY_TYPE = REPOSITORY + "Binary";
     public static final String RESOURCE_CREATION = EVENT_NAMESPACE + "ResourceCreation";

diff --git a/src/test/java/org/fcrepo/audit/InternalAuditorTest.java b/src/test/java/org/fcrepo/audit/InternalAuditorTest.java
@@ -28,7 +28,7 @@
 import static org.fcrepo.audit.AuditNamespaces.PREMIS;
 import static org.fcrepo.audit.AuditNamespaces.PROV;
 import static org.fcrepo.audit.AuditNamespaces.REPOSITORY;
-import static org.fcrepo.kernel.api.RdfLexicon.RDF_NAMESPACE;
+import static org.fcrepo.audit.AuditProperties.RDF_TYPE;
 import static org.fcrepo.kernel.api.observer.EventType.RESOURCE_CREATION;
 import static org.fcrepo.kernel.api.observer.EventType.RESOURCE_DELETION;
 import static org.fcrepo.kernel.api.observer.EventType.RESOURCE_MODIFICATION;
@@ -173,11 +173,11 @@ public void testNodeAddedWithProperties() throws Exception {
         when(mockContainerService.findOrCreate(any(FedoraSession.class), anyString())).thenReturn(mockContainer);
         when(mockContainer.getNode()).thenReturn(mockNode);
         testTnternalAuditor.recordEvent(mockFedoraEvent);
-        verify(testTnternalAuditor).createStatement(any(Resource.class), eq(RDF_NAMESPACE + "type"),
+        verify(testTnternalAuditor).createStatement(any(Resource.class), eq(RDF_TYPE),
                 eq(createResource(AUDIT + "InternalEvent")));
-        verify(testTnternalAuditor).createStatement(any(Resource.class), eq(RDF_NAMESPACE + "type"),
+        verify(testTnternalAuditor).createStatement(any(Resource.class), eq(RDF_TYPE),
                 eq(createResource(PREMIS + "Event")));
-        verify(testTnternalAuditor).createStatement(any(Resource.class), eq(RDF_NAMESPACE + "type"),
+        verify(testTnternalAuditor).createStatement(any(Resource.class), eq(RDF_TYPE),
                 eq(createResource(PROV + "InstantaneousEvent")));
         verify(testTnternalAuditor).createStatement(any(Resource.class), eq(PREMIS + "hasEventDateTime"),
                 eq(createTypedLiteral("2015-04-10T14:30:36Z", XSDdateTime)));