LIB-16359 - Resolve issues with refreshing solr after move operations (#1379)

* Add missing indexing filter for move operations to fix bug where status values weren't getting cleared

* Invalidate path cache when an object is modified, to prevent stale value from preventing the path from updating in solr from a move operation if the same object had recently been indexed

* Reorder imports

Author: bbpennel

Diff for: model-api/src/main/java/edu/unc/lib/boxc/model/api/services/ContentPathFactory.java

@@ -34,4 +34,9 @@ public interface ContentPathFactory {
      */
     List<PID> getAncestorPids(PID pid);
 
+    /**
+     * Invalidates cached data for the provided pid
+     * @param pid
+     */
+    void invalidate(PID pid);
 }

Diff for: model-fcrepo/src/main/java/edu/unc/lib/boxc/model/fcrepo/services/ContentPathFactoryImpl.java

@@ -95,6 +95,11 @@ public List<PID> getAncestorPids(PID pid) {
         }
     }
 
+    @Override
+    public void invalidate(PID pid) {
+        childToParentCache.invalidate(pid);
+    }
+
     private List<PID> buildPath(PID pid) {
         PID currentPid = pid;
         List<PID> result = new ArrayList<>();

Diff for: services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/util/CacheInvalidatingProcessor.java

@@ -15,20 +15,20 @@
  */
 package edu.unc.lib.boxc.services.camel.util;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.fcrepo.camel.FcrepoHeaders;
-import org.slf4j.Logger;
-
 import edu.unc.lib.boxc.auth.fcrepo.services.ObjectAclFactory;
 import edu.unc.lib.boxc.fcrepo.FcrepoJmsConstants;
 import edu.unc.lib.boxc.model.api.ids.PID;
 import edu.unc.lib.boxc.model.api.ids.PIDConstants;
 import edu.unc.lib.boxc.model.api.objects.RepositoryObjectLoader;
+import edu.unc.lib.boxc.model.api.services.ContentPathFactory;
 import edu.unc.lib.boxc.model.fcrepo.ids.PIDs;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.fcrepo.camel.FcrepoHeaders;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Processor which invalidates cache entries for updated objects
@@ -39,6 +39,7 @@ public class CacheInvalidatingProcessor implements Processor {
     private static final Logger log = getLogger(CacheInvalidatingProcessor.class);
     private RepositoryObjectLoader repoObjLoader;
     private ObjectAclFactory objectAclFactory;
+    private ContentPathFactory contentPathFactory;
 
     @Override
     public void process(Exchange exchange) throws Exception {
@@ -64,6 +65,7 @@ public void process(Exchange exchange) throws Exception {
         log.debug("Invalidating caches for {}", pid);
         repoObjLoader.invalidate(pid);
         objectAclFactory.invalidate(pid);
+        contentPathFactory.invalidate(pid);
     }
 
     public void setRepositoryObjectLoader(RepositoryObjectLoader repoObjLoader) {
@@ -73,4 +75,8 @@ public void setRepositoryObjectLoader(RepositoryObjectLoader repoObjLoader) {
     public void setObjectAclFactory(ObjectAclFactory objectAclFactory) {
         this.objectAclFactory = objectAclFactory;
     }
+
+    public void setContentPathFactory(ContentPathFactory contentPathFactory) {
+        this.contentPathFactory = contentPathFactory;
+    }
 }

Diff for: services-camel-app/src/main/webapp/WEB-INF/service-context.xml

@@ -206,6 +206,7 @@
     <bean id="cacheInvalidatingProcessor" class="edu.unc.lib.boxc.services.camel.util.CacheInvalidatingProcessor">
         <property name="repositoryObjectLoader" ref="repositoryObjectLoader" />
         <property name="objectAclFactory" ref="objectAclFactory" />
+        <property name="contentPathFactory" ref="contentPathFactory" />
     </bean>
 
     <bean id="addSmallThumbnailProcessor" class="edu.unc.lib.boxc.services.camel.images.AddDerivativeProcessor">

Diff for: services-camel-app/src/main/webapp/WEB-INF/solr-indexing-context.xml

@@ -56,6 +56,7 @@
                 <ref bean="setRecordDatesFilter" />
                 <ref bean="setPathFilter" />
                 <ref bean="setAccessControlFilter" />
+                <ref bean="setAccessStatusFilter" />
                 <ref bean="setCollectionSupplementalInformationFilter" />
             </list>
         </property>

Diff for: services-camel-app/src/test/java/edu/unc/lib/boxc/services/camel/util/CacheInvalidatingProcessorTest.java

@@ -15,28 +15,27 @@
  */
 package edu.unc.lib.boxc.services.camel.util;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-
 import edu.unc.lib.boxc.auth.fcrepo.services.ObjectAclFactory;
 import edu.unc.lib.boxc.fcrepo.FcrepoJmsConstants;
 import edu.unc.lib.boxc.model.api.ids.PID;
 import edu.unc.lib.boxc.model.api.ids.PIDConstants;
+import edu.unc.lib.boxc.model.api.services.ContentPathFactory;
 import edu.unc.lib.boxc.model.fcrepo.ids.PIDs;
 import edu.unc.lib.boxc.model.fcrepo.services.RepositoryObjectLoaderImpl;
 import edu.unc.lib.boxc.model.fcrepo.test.TestHelper;
-import edu.unc.lib.boxc.services.camel.util.CacheInvalidatingProcessor;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 /**
  * @author bbpennel
@@ -50,6 +49,8 @@ public class CacheInvalidatingProcessorTest {
     private RepositoryObjectLoaderImpl repoObjLoader;
     @Mock
     private ObjectAclFactory objectAclFactory;
+    @Mock
+    private ContentPathFactory contentPathFactory;
 
     private CacheInvalidatingProcessor processor;
 
@@ -60,6 +61,7 @@ public void init() throws Exception {
         processor = new CacheInvalidatingProcessor();
         processor.setRepositoryObjectLoader(repoObjLoader);
         processor.setObjectAclFactory(objectAclFactory);
+        processor.setContentPathFactory(contentPathFactory);
     }
 
     @Test
@@ -72,6 +74,7 @@ public void invalidatesContentPidTest() throws Exception {
         PID pid = PIDs.get(FEDORA_BASE + objPath);
         verify(repoObjLoader).invalidate(pid);
         verify(objectAclFactory).invalidate(pid);
+        verify(contentPathFactory).invalidate(pid);
     }
 
     @Test
@@ -83,6 +86,7 @@ public void ignoresDepositPidTest() throws Exception {
 
         verify(repoObjLoader, never()).invalidate(any(PID.class));
         verify(objectAclFactory, never()).invalidate(any(PID.class));
+        verify(contentPathFactory, never()).invalidate(any(PID.class));
     }
 
     @Test
@@ -94,6 +98,7 @@ public void ignoresInvalidPidTest() throws Exception {
 
         verify(repoObjLoader, never()).invalidate(any(PID.class));
         verify(objectAclFactory, never()).invalidate(any(PID.class));
+        verify(contentPathFactory, never()).invalidate(any(PID.class));
     }
 
     private Exchange mockExchange(String rescPath) {

Diff for: services-camel-app/src/test/resources/solr-update-processor-it-context.xml

@@ -174,6 +174,7 @@
     <bean id="cacheInvalidatingProcessor" class="edu.unc.lib.boxc.services.camel.util.CacheInvalidatingProcessor">
         <property name="repositoryObjectLoader" ref="repositoryObjectLoader"/>
         <property name="objectAclFactory" ref="objectAclFactory"/>
+        <property name="contentPathFactory" ref="contentPathFactory"/>
     </bean>
 
     <bean id="solrUpdatePreprocessor" class="edu.unc.lib.boxc.services.camel.solrUpdate.SolrUpdatePreprocessor">