Merge pull request #1744 from UNC-Libraries/bxc-4590

BXC-4590 - Skip Derivatives for icon files

Author: sharonluong

services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessor.java

@@ -20,7 +20,7 @@ public class ImageDerivativeProcessor implements Processor {
 
     private static final Pattern MIMETYPE_PATTERN = Pattern.compile("^(image.*$|application.*?(photoshop|psd)$)");
 
-    private static final Pattern DISALLOWED_PATTERN = Pattern.compile(".*(vnd\\.fpx).*");
+    private static final Pattern DISALLOWED_PATTERN = Pattern.compile(".*(vnd\\.fpx|x-icon).*");
 
     /**
      * Returns true if the subject of the exchange is a binary which

services-camel-app/src/test/java/edu/unc/lib/boxc/services/camel/images/ImageEnhancementsRouterTest.java

@@ -36,13 +36,10 @@
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import edu.unc.lib.boxc.services.camel.images.AddDerivativeProcessor;
-
 public class ImageEnhancementsRouterTest extends CamelSpringTestSupport {
     private static final String EVENT_NS = "http://fedora.info/definitions/v4/event#";
     private static final String EVENT_TYPE = "org.fcrepo.jms.eventType";
@@ -423,6 +420,7 @@ public void testAccessCopyRouteForceFileExists() throws Exception {
     public void testAccessCopyRejection() throws Exception {
         createContext(accessCopyRoute);
 
+        when(addAccessCopyProcessor.needsRun(any())).thenReturn(true);
         getMockEndpoint("mock:process.enhancement.imageAccessCopy").expectedMessageCount(0);
 
         Map<String, Object> headers = createEvent(fileID, eventTypes, "false");
@@ -438,6 +436,7 @@ public void testAccessCopyRejection() throws Exception {
     public void testAccessCopyDisallowedImageType() throws Exception {
         createContext(accessCopyRoute);
 
+        when(addAccessCopyProcessor.needsRun(any())).thenReturn(true);
         getMockEndpoint("mock:exec:/bin/sh").expectedMessageCount(0);
 
         Map<String, Object> headers = createEvent(fileID, eventTypes, "false");
@@ -449,6 +448,23 @@ public void testAccessCopyDisallowedImageType() throws Exception {
         assertMockEndpointsSatisfied();
     }
 
+    @Test
+    public void testAccessCopyIconFile() throws Exception {
+        createContext(accessCopyRoute);
+
+        when(addAccessCopyProcessor.needsRun(any())).thenReturn(true);
+        getMockEndpoint("mock:exec:/bin/sh").expectedMessageCount(0);
+
+        Map<String, Object> headers = createEvent(fileID, eventTypes, "false");
+        headers.put(CdrBinaryMimeType, "image/x-icon");
+
+        template.sendBodyAndHeaders("", headers);
+
+        verify(addAccessCopyProcessor).needsRun(any(Exchange.class));
+        verify(addAccessCopyProcessor, never()).process(any(Exchange.class));
+        assertMockEndpointsSatisfied();
+    }
+
     private void createContext(String routeName) throws Exception {
         context.getRouteDefinition(routeName).adviceWith(context, new AdviceWithRouteBuilder() {
             @Override