Using eventID to build URI instead of locally-generated UUID

fcrepo-exts · Jun 4, 2015 · 1465a97 · 1465a97
1 parent aff7752
commit 1465a97
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/src/main/java/org/fcrepo/audit/InternalAuditor.java b/src/main/java/org/fcrepo/audit/InternalAuditor.java
@@ -42,12 +42,10 @@
 
 import org.fcrepo.kernel.impl.rdf.impl.PrefixingIdentifierTranslator;
 import org.fcrepo.kernel.exception.RepositoryRuntimeException;
-import org.fcrepo.kernel.identifiers.PidMinter;
 import org.fcrepo.kernel.models.FedoraResource;
 import org.fcrepo.kernel.observer.FedoraEvent;
 import org.fcrepo.kernel.services.ContainerService;
 import org.fcrepo.kernel.utils.iterators.RdfStream;
-import org.fcrepo.mint.UUIDPathMinter;
 
 import org.modeshape.jcr.api.JcrTools;
 import org.modeshape.jcr.api.Repository;
@@ -95,8 +93,6 @@ public class InternalAuditor implements Auditor {
     private Session session;
     private static JcrTools jcrTools = new JcrTools(true);
 
-    private static final PidMinter pidMinter =  new UUIDPathMinter();
-
     /**
      * Register with the EventBus to receive events.
      * @throws RepositoryRuntimeException
@@ -190,7 +186,6 @@ public void releaseConnections() {
      */
     public void createAuditNode(final FedoraEvent event) throws RepositoryRuntimeException, IOException {
         try {
-            final String uuid = pidMinter.mintPid();
             final String userData = event.getUserData();
             final ObjectMapper mapper = new ObjectMapper();
             final JsonNode json = mapper.readTree(userData);
@@ -213,12 +208,12 @@ public void createAuditNode(final FedoraEvent event) throws RepositoryRuntimeExc
             final String properties = Joiner.on(',').join(event.getProperties());
             final String auditEventType = AuditUtils.getAuditEventType(eventType, properties);
             final FedoraResource auditResource = containerService.findOrCreate(session,
-                    AUDIT_CONTAINER_LOCATION + "/" + uuid);
+                    AUDIT_CONTAINER_LOCATION + "/" + event.getEventID());
 
-            LOGGER.debug("Audit node {} created for event.", uuid);
+            LOGGER.debug("Audit node {} created for event.", event.getEventID());
 
             final Model m = createDefaultModel();
-            final String auditResourceURI = baseURL + AUDIT_CONTAINER_LOCATION + "/" + uuid;
+            final String auditResourceURI = baseURL + AUDIT_CONTAINER_LOCATION + "/" + event.getEventID();
             final Resource s = createResource(auditResourceURI);
             m.add(createStatement(s, AuditProperties.RDF_TYPE, createResource(AuditProperties.INTERNAL_EVENT)));
             m.add(createStatement(s, AuditProperties.RDF_TYPE, createResource(AuditProperties.PREMIS_EVENT)));