Adding check to suppress events about internal audit nodes

fcrepo-exts · Apr 27, 2015 · 5fe0ddd · 5fe0ddd
1 parent ae8d4c2
commit 5fe0ddd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/audit-triplestore-web/src/main/resources/application.properties b/audit-triplestore-web/src/main/resources/application.properties
@@ -3,3 +3,4 @@ jms.fcrepoEndpoint=${fcrepo.jms.endpoint:topic:fedora}
 jms.brokerUrl=failover:(tcp://${fcrepo.jms.host:localhost}:${fcrepo.dynamic.jms.port:61616})?startupMaxReconnectAttempts=1&initialReconnectDelay=1
 triplestore.baseUrl=${fcrepo.audit.triplestore.baseUrl:localhost:3030/test/update}
 event.baseUri=${fcrepo.audit.baseUri:http://example.com/event}
+audit.container=${fcrepo.audit.container:/audit}
diff --git a/audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java b/audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java
@@ -15,6 +15,7 @@
  */
 package org.fcrepo.camel.audit.triplestore;
 
+import static org.apache.camel.builder.PredicateBuilder.not;
 
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.RouteBuilder;
@@ -43,7 +44,9 @@ public void configure() throws Exception {
          */
         from("activemq:{{jms.fcrepoEndpoint}}")
             .routeId("AuditFcrepoRouter")
-            .to("direct:event");
+            .choice()
+            .when(not(header("org.fcrepo.jms.identifier").startsWith("{{audit.container}}")))
+                .to("direct:event");
 
         from("direct:event")
             .routeId("AuditEventRouter")

diff --git a/audit-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/audit-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -16,6 +16,7 @@
        <cm:property name="triplestore.baseUrl" value="localhost:3030/test/update"/>
        <!-- Base URI to be used in contructing the URI for the JMS event -->
        <cm:property name="event.baseUri" value="http://example.com/event"/>
+       <cm:property name="audit.container" value="/audit"/>
      </cm:default-properties>
    </cm:property-placeholder>
 

diff --git a/audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteTest.java b/audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteTest.java
@@ -51,6 +51,7 @@ public class RouteTest extends CamelBlueprintTestSupport {
     private static final String baseURL = "http://localhost/rest";
     private static final String nodeID = "/foo";
     private static final String fileID = "/file1";
+    private static final String auditID = "/audit/1234";
     private static final long timestamp = 1428360320168L;
     private static final String eventDate = "2015-04-06T22:45:20Z";
     private static final String userID = "bypassAdmin";
@@ -87,6 +88,7 @@ public void configure() throws Exception {
         final String eventTypes = REPOSITORY + "NODE_REMOVED";
         final String eventProps = REPOSITORY + "hasContent";
         template.sendBodyAndHeaders("", createEvent(fileID, eventTypes, eventProps));
+        template.sendBodyAndHeaders("", createEvent(auditID, eventTypes, eventProps));
 
         assertMockEndpointsSatisfied();
         final String body = (String)resultEndpoint.assertExchangeReceived(0).getIn().getBody();