Merge branch 'grahamtriggs-gt-defer-and-reader' into develop

webapp/src/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java

@@ -43,6 +43,14 @@ public interface SearchIndexer extends Application.Module {
      */
 	void pause();
 
+    /**
+     * Stop processing new tasks. Requests will be ignored and the index rebuilt when unpaused.
+     * Fires a PAUSED event to listeners.
+     *
+     * This call has no effect if already paused, or if called after shutdown.
+     */
+    void pauseWithoutDeferring();
+
     /**
 	 * Resume processing new tasks. Any requests that were received since the
 	 * call to pause() will now be scheduled for processing. Fires an UNPAUSED

webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java

@@ -104,7 +104,7 @@ public class ABoxRecomputer {
         }
         try {
             if  (searchIndexer != null) {
-                searchIndexer.pause();
+                searchIndexer.pauseWithoutDeferring();
             }
             recomputeABox();
         } finally {

webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java

@@ -9,30 +9,27 @@ import static edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndex
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.lang.StringUtils;
+import com.hp.hpl.jena.graph.Triple;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
 import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
 
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Event;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener;
 import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
+import org.apache.jena.riot.RDFLanguages;
+import org.apache.jena.riot.RiotReader;
 
 /**
  * When a change is heard, wait for an interval to see if more changes come in.
@@ -65,7 +62,7 @@ public class IndexingChangeListener implements ChangeListener,
 
 	private final SearchIndexer searchIndexer;
 	private final Ticker ticker;
-	private volatile boolean paused = true;
+    private final Model defaultModel;
 
 	/** All access to the list must be synchronized. */
 	private final List<Statement> changes;
@@ -73,82 +70,28 @@ public class IndexingChangeListener implements ChangeListener,
 	public IndexingChangeListener(SearchIndexer searchIndexer) {
 		this.searchIndexer = searchIndexer;
 		this.ticker = new Ticker();
+        this.defaultModel = ModelFactory.createDefaultModel();
 		this.changes = new ArrayList<>();
 
 		searchIndexer.addListener(this);
 	}
 
 	private synchronized void noteChange(Statement stmt) {
-		try {
+        changes.add(stmt);
-			changes.add(sanitize(stmt));
-			if (!paused) {
         ticker.start();
 	}
-		} catch (Exception e) {
-			log.warn("Failed to sanitize this statement: " + stmt);
-		}
-	}
-
-	private Statement sanitize(Statement rawStmt) {
-		return ResourceFactory.createStatement(
-				sanitizeSubject(rawStmt.getSubject()),
-				sanitizePredicate(rawStmt.getPredicate()),
-				sanitizeObject(rawStmt.getObject()));
-	}
-
-	private Resource sanitizeSubject(Resource rawSubject) {
-		if (rawSubject.isURIResource()) {
-			return ResourceFactory.createResource(rawSubject.getURI());
-		}
-		return ResourceFactory.createResource();
-	}
-
-	private Property sanitizePredicate(Property rawPredicate) {
-		return ResourceFactory.createProperty(rawPredicate.getURI());
-	}
-
-	private RDFNode sanitizeObject(RDFNode rawObject) {
-		if (rawObject.isURIResource()) {
-			return ResourceFactory.createResource(rawObject.asResource()
-					.getURI());
-		}
-		if (rawObject.isResource()) {
-			return ResourceFactory.createResource();
-		}
-		Literal l = rawObject.asLiteral();
-		if (StringUtils.isNotEmpty(l.getLanguage())) {
-			return ResourceFactory.createLangLiteral(l.getString(),
-					l.getLanguage());
-		}
-		if (null != l.getDatatype()) {
-			return ResourceFactory.createTypedLiteral(l.getValue());
-		}
-		return ResourceFactory.createPlainLiteral(l.getString());
-	}
 
 	@Override
 	public void receiveSearchIndexerEvent(Event event) {
-		if (event.getType() == PAUSE) {
-			paused = true;
-		} else if (event.getType() == UNPAUSE) {
-			paused = false;
-			ticker.start();
-		} else if (event.getType() == START_REBUILD) {
-			discardChanges();
-		}
 	}
 
 	private synchronized void respondToTicker() {
-		if (!paused && !changes.isEmpty()) {
+		if (!changes.isEmpty()) {
 			searchIndexer.scheduleUpdatesForStatements(changes);
 			changes.clear();
 		}
 	}
 
-	private synchronized void discardChanges() {
-		changes.clear();
-	}
-
 	public void shutdown() {
 		ticker.shutdown();
 	}
@@ -180,22 +123,27 @@ public class IndexingChangeListener implements ChangeListener,
 		}
 	}
 
-	// TODO avoid overhead of Model.
 	// TODO avoid duplication with JenaChangeListener
 	private Statement parseTriple(String serializedTriple) {
         try {
-			Model m = ModelFactory.createDefaultModel();
+            // Use RiotReader to parse a Triple
-			m.read(new ByteArrayInputStream(serializedTriple.getBytes("UTF-8")),
+            // NB A Triple can be serialized correctly with: FmtUtils.stringForTriple(triple, PrefixMapping.Factory.create()) + " .";
-					null, "N3");
+            Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream(serializedTriple.getBytes("UTF-8")), RDFLanguages.NTRIPLES, null);
-			StmtIterator sit = m.listStatements();
+
-			if (!sit.hasNext()) {
+            if (it.hasNext()) {
-				throw new RuntimeException("no triple parsed from change event");
+                Triple triple = it.next();
-			} else {
+
-				Statement s = sit.nextStatement();
+                if (it.hasNext()) {
-				if (sit.hasNext()) {
                     log.warn("More than one triple parsed from change event");
                 }
-				return s;
+
+                // Use the retained defaultModel instance to convert the Triple to a Statement
+                // This does not add the Statement to the Model, so the Statement can be disposed when unused
+                // And whilst the Model is attached to the Statement, using a single instance means only one Model
+                // is created and attached to all of the Statements created by this instance
+                return defaultModel.asStatement(triple);
+            } else {
+                throw new RuntimeException("no triple parsed from change event");
             }
         } catch (RuntimeException riot) {
             log.error("Failed to parse triple " + serializedTriple, riot);

webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java

@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import javax.servlet.ServletContext;
 
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -86,7 +87,7 @@ public class SearchIndexerImpl implements SearchIndexer {
 
 	private final ListenerList listeners = new ListenerList();
 	private final TaskQueue taskQueue = new TaskQueue();
-	private final Scheduler scheduler = new Scheduler(taskQueue);
+	private final Scheduler scheduler = new Scheduler(this, taskQueue);
 
 	private Integer threadPoolSize;
 	private WorkerThreadPool pool;
@@ -97,6 +98,9 @@ public class SearchIndexerImpl implements SearchIndexer {
 	private Set<IndexingUriFinder> uriFinders;
 	private WebappDaoFactory wadf;
 
+    private boolean ignoreTasksWhilePaused = false;
+    private boolean rebuildOnUnpause = false;
+
 	// ----------------------------------------------------------------------
 	// ConfigurationBeanLoader methods.
 	// ----------------------------------------------------------------------
@@ -197,6 +201,18 @@ public class SearchIndexerImpl implements SearchIndexer {
 	@Override
 	public void pause() {
 		if (!isPaused() && !isShutdown()) {
+            ignoreTasksWhilePaused = false;
+            rebuildOnUnpause = false;
+			scheduler.pause();
+			fireEvent(PAUSE);
+		}
+	}
+
+    @Override
+    public void pauseWithoutDeferring() {
+        if (!isPaused() && !isShutdown()) {
+            ignoreTasksWhilePaused = true;
+            rebuildOnUnpause = false;
             scheduler.pause();
             fireEvent(PAUSE);
         }
@@ -207,6 +223,10 @@ public class SearchIndexerImpl implements SearchIndexer {
 		if (isPaused() && !isShutdown()) {
 			scheduler.unpause();
 			fireEvent(UNPAUSE);
+            if (rebuildOnUnpause) {
+                rebuildOnUnpause = false;
+                rebuildIndex();
+            }
 		}
 	}
 
@@ -244,11 +264,12 @@ public class SearchIndexerImpl implements SearchIndexer {
 		if (changes == null || changes.isEmpty()) {
 			return;
 		}
+        if (ignoreTasksWhilePaused && isPaused()) {
+            rebuildOnUnpause = true;
+            return;
+        }
 
-		Task task = new UpdateStatementsTask(changes, createFindersList(),
+		scheduler.scheduleTask(new UpdateStatementsTask(new IndexerConfigImpl(this), changes));
-				createExcludersList(), createModifiersList(),
-				wadf.getIndividualDao(), listeners, pool);
-		scheduler.scheduleTask(task);
 		log.debug("Scheduled updates for " + changes.size() + " statements.");
 	}
 
@@ -261,10 +282,12 @@ public class SearchIndexerImpl implements SearchIndexer {
 		if (uris == null || uris.isEmpty()) {
 			return;
 		}
+        if (ignoreTasksWhilePaused && isPaused()) {
+            rebuildOnUnpause = true;
+            return;
+        }
 
-		Task task = new UpdateUrisTask(uris, createExcludersList(),
+		scheduler.scheduleTask(new UpdateUrisTask(new IndexerConfigImpl(this), uris));
-				createModifiersList(), wadf.getIndividualDao(), listeners, pool);
-		scheduler.scheduleTask(task);
 		log.debug("Scheduled updates for " + uris.size() + " uris.");
 	}
 
@@ -273,10 +296,12 @@ public class SearchIndexerImpl implements SearchIndexer {
 		if (isShutdown()) {
 			log.warn("Call to rebuildIndex after shutdown.");
 		}
+        if (ignoreTasksWhilePaused && isPaused()) {
+            rebuildOnUnpause = true;
+            return;
+        }
 
-		Task task = new RebuildIndexTask(createExcludersList(),
+		scheduler.scheduleTask(new RebuildIndexTask(new IndexerConfigImpl(this)));
-				createModifiersList(), wadf.getIndividualDao(), listeners, pool);
-		scheduler.scheduleTask(task);
 		log.debug("Scheduled a full rebuild.");
 	}
 
@@ -373,10 +398,12 @@ public class SearchIndexerImpl implements SearchIndexer {
 	private static class Scheduler {
 		private final TaskQueue taskQueue;
 		private final List<Task> deferredQueue;
+        private final SearchIndexerImpl indexer;
 		private volatile boolean started;
 		private volatile boolean paused;
 
-		public Scheduler(TaskQueue taskQueue) {
+		public Scheduler(SearchIndexerImpl indexer, TaskQueue taskQueue) {
+            this.indexer = indexer;
 			this.taskQueue = taskQueue;
 			this.deferredQueue = new ArrayList<Task>();
 		}
@@ -420,9 +447,11 @@ public class SearchIndexerImpl implements SearchIndexer {
 		private void processDeferredTasks() {
 			for (Task task : deferredQueue) {
                 taskQueue.scheduleTask(task);
-				log.debug("moved task from deferred queue to task queue: "
+				log.debug("moved task from deferred queue to task queue: " + task);
-						+ task);
 			}
+
+            // Empty out the deferred queue as we've now processed it
+            deferredQueue.clear();
 		}
 
 	}
@@ -525,6 +554,36 @@ public class SearchIndexerImpl implements SearchIndexer {
 		}
 	}
 
+    /**
+     * Interface for tasks to access the Indexer config
+     */
+    public static interface IndexerConfig {
+        public IndexingUriFinderList uriFinderList();
+        public SearchIndexExcluderList excluderList();
+        public DocumentModifierList documentModifierList();
+        public IndividualDao individualDao();
+        public ListenerList listenerList();
+        public WorkerThreadPool workerThreadPool();
+    }
+
+    /**
+     * Implementation of IndexerConfig
+     * Defers access to the configuration until the task is running, so a Task
+     * created and deferred before the indexer is started will not cause a NullPointerException
+     */
+    private static class IndexerConfigImpl implements IndexerConfig {
+        private final SearchIndexerImpl sii;
+
+        public IndexerConfigImpl(SearchIndexerImpl sii) { this.sii = sii; }
+
+        public IndexingUriFinderList uriFinderList()       { return sii.createFindersList(); }
+        public SearchIndexExcluderList excluderList()      { return sii.createExcludersList(); }
+        public DocumentModifierList documentModifierList() { return sii.createModifiersList(); }
+        public IndividualDao individualDao()               { return sii.wadf.getIndividualDao(); }
+        public ListenerList listenerList()                 { return sii.listeners; }
+        public WorkerThreadPool workerThreadPool()         { return sii.pool; }
+    }
+
 	public static interface Task extends Runnable {
 		public SearchIndexerStatus getStatus();
 
@@ -629,4 +688,28 @@ public class SearchIndexerImpl implements SearchIndexer {
 		}
 
 	}
+
+    private static class StatementList {
+        List<Statement> changes;
+
+        public StatementList() {
+            changes = new ArrayList<Statement>();
+        }
+
+        public synchronized void addStatement(Statement stmt) {
+            changes.add(stmt);
+        }
+
+        public synchronized List<Statement> getStatements() {
+            try {
+                return new ArrayList<>(changes);
+            } finally {
+                changes.clear();
+            }
+        }
+
+        public synchronized int size() {
+            return changes.size();
+        }
+    };
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java

@@ -22,6 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Even
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.RebuildCounts;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.State;
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.IndexerConfig;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.ListenerList;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.Task;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.WorkerThreadPool;
@@ -37,6 +38,41 @@ import edu.cornell.mannlib.vitro.webapp.searchindex.exclusions.SearchIndexExclud
  */
 public class RebuildIndexTask implements Task {
 	private static final Log log = LogFactory.getLog(RebuildIndexTask.class);
+	private final Date requestedAt;
+
+    private final IndexerConfig config;
+    private RebuildIndexTaskImpl impl;
+
+    public RebuildIndexTask(IndexerConfig config) {
+        this.config = config;
+        this.requestedAt = new Date();
+    }
+
+	@Override
+	public void run() {
+        impl = new RebuildIndexTaskImpl(config, requestedAt);
+        impl.run();
+	}
+
+	@Override
+	public SearchIndexerStatus getStatus() {
+        return impl == null ? null : impl.getStatus();
+	}
+
+	@Override
+	public void notifyWorkUnitCompletion(Runnable workUnit) {
+        if (impl != null) {
+            impl.notifyWorkUnitCompletion(workUnit);
+        }
+	}
+
+	@Override
+	public String toString() {
+		return "RebuildIndexTask[requestedAt=" + new SimpleDateFormat().format(requestedAt) + "]";
+	}
+
+    private static class RebuildIndexTaskImpl implements Task {
+        private final IndexerConfig config;
 
         private final IndividualDao indDao;
         private final SearchIndexExcluderList excluders;
@@ -50,18 +86,17 @@ public class RebuildIndexTask implements Task {
 
         private volatile SearchIndexerStatus status;
 
-	public RebuildIndexTask(SearchIndexExcluderList excluders,
+        public RebuildIndexTaskImpl(IndexerConfig config, Date requestedAt) {
-			DocumentModifierList modifiers, IndividualDao indDao,
+            this.config = config;
-			ListenerList listeners, WorkerThreadPool pool) {
+            this.excluders = config.excluderList();
-		this.excluders = excluders;
+            this.modifiers = config.documentModifierList();
-		this.modifiers = modifiers;
+            this.indDao = config.individualDao();
-		this.indDao = indDao;
+            this.listeners = config.listenerList();
-		this.listeners = listeners;
+            this.pool = config.workerThreadPool();
-		this.pool = pool;
 
             this.searchEngine = ApplicationUtils.instance().getSearchEngine();
 
-		this.requestedAt = new Date();
+            this.requestedAt = requestedAt;
             this.documentsBefore = getDocumentCount();
             this.status = buildStatus(REBUILDING, 0);
         }
@@ -97,8 +132,7 @@ public class RebuildIndexTask implements Task {
         }
 
         private void updateTheUris(Collection<String> uris) {
-		new UpdateUrisTask(uris, excluders, modifiers, indDao, listeners, pool)
+            UpdateUrisTask.runNow(uris, excluders, modifiers, indDao, listeners, pool);
-				.run();
         }
 
         private void deleteOutdatedDocuments() {
@@ -149,5 +183,5 @@ public class RebuildIndexTask implements Task {
             return "RebuildIndexTask[requestedAt="
                     + new SimpleDateFormat().format(requestedAt) + "]";
         }
-
+    }
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java

@@ -14,6 +14,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -23,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Event;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.StatementCounts;
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.IndexerConfig;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.ListenerList;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.Task;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.WorkerThreadPool;
@@ -49,9 +51,36 @@ import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinderLi
  * Set to remove duplicates, and then process the URIs in the set.
  */
 public class UpdateStatementsTask implements Task {
-	private static final Log log = LogFactory
+    private static final Log log = LogFactory.getLog(UpdateStatementsTask.class);
-			.getLog(UpdateStatementsTask.class);
 
+    private final IndexerConfig config;
+    private UpdateStatementsTaskImpl impl;
+
+    private List<Statement> changes;
+
+    public UpdateStatementsTask(IndexerConfig config, List<Statement> changes) {
+        this.config = config;
+        this.changes = new ArrayList<>(changes);
+    }
+
+    @Override
+    public void run() {
+        impl = new UpdateStatementsTaskImpl(config, changes);
+        impl.run();
+    }
+    @Override
+    public SearchIndexerStatus getStatus() {
+        return impl == null ? null : impl.getStatus();
+    }
+
+    @Override
+    public void notifyWorkUnitCompletion(Runnable workUnit) {
+        if (impl != null) {
+            impl.notifyWorkUnitCompletion(workUnit);
+        }
+    }
+
+    private static class UpdateStatementsTaskImpl implements Task {
         private final List<Statement> changes;
         private final IndexingUriFinderList uriFinders;
         private final SearchIndexExcluderList excluders;
@@ -63,17 +92,14 @@ public class UpdateStatementsTask implements Task {
         private final Set<String> uris;
         private final Status status;
 
-	public UpdateStatementsTask(List<Statement> changes,
+        public UpdateStatementsTaskImpl(IndexerConfig config, List<Statement> changes) {
-			IndexingUriFinderList uriFinders,
+            this.changes = changes;
-			SearchIndexExcluderList excluders, DocumentModifierList modifiers,
+            this.uriFinders = config.uriFinderList();
-			IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+            this.excluders = config.excluderList();
-		this.changes = new ArrayList<>(changes);
+            this.modifiers = config.documentModifierList();
-		this.uriFinders = uriFinders;
+            this.indDao = config.individualDao();
-		this.excluders = excluders;
+            this.listeners = config.listenerList();
-		this.modifiers = modifiers;
+            this.pool = config.workerThreadPool();
-		this.indDao = indDao;
-		this.listeners = listeners;
-		this.pool = pool;
 
             this.uris = Collections.synchronizedSet(new HashSet<String>());
 
@@ -128,8 +154,7 @@ public class UpdateStatementsTask implements Task {
         }
 
         private void updateTheUris() {
-		new UpdateUrisTask(uris, excluders, modifiers, indDao, listeners, pool)
+            UpdateUrisTask.runNow(uris, excluders, modifiers, indDao, listeners, pool);
-				.run();
         }
 
         @Override
@@ -190,5 +215,5 @@ public class UpdateStatementsTask implements Task {
             }
 
         }
-
+    }
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java

@@ -7,11 +7,7 @@ import static edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndex
 import static edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Event.Type.STOP_URIS;
 import static edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.State.PROCESSING_URIS;
 
-import java.util.Collection;
+import java.util.*;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Even
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.UriCounts;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerUtils;
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.IndexerConfig;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.ListenerList;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.Task;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.WorkerThreadPool;
@@ -51,7 +48,46 @@ import edu.cornell.mannlib.vitro.webapp.searchindex.exclusions.SearchIndexExclud
 public class UpdateUrisTask implements Task {
     private static final Log log = LogFactory.getLog(UpdateUrisTask.class);
 
-	private final Set<String> uris;
+    private final IndexerConfig config;
+    private UpdateUrisTaskImpl impl;
+
+    private final Collection<String> uris;
+    private Date since = new Date();
+
+    public UpdateUrisTask(IndexerConfig config, Collection<String> uris) {
+        this.config = config;
+        this.uris = new HashSet<>(uris);
+    }
+
+    static void runNow(Collection<String> uris, SearchIndexExcluderList excluders, DocumentModifierList modifiers, IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+        UpdateUrisTaskImpl impl = new UpdateUrisTaskImpl(uris, excluders, modifiers, indDao, listeners, pool);
+        impl.run();
+    }
+
+    @Override
+    public void run() {
+        impl = new UpdateUrisTaskImpl(config, uris);
+        impl.run();
+    }
+
+    @Override
+    public SearchIndexerStatus getStatus() {
+        if (impl != null) {
+            return impl.getStatus();
+        }
+
+        return new SearchIndexerStatus(PROCESSING_URIS, since, new UriCounts(0, 0, 0, uris.size(), uris.size()));
+    }
+
+    @Override
+    public void notifyWorkUnitCompletion(Runnable workUnit) {
+        if (impl != null) {
+            impl.notifyWorkUnitCompletion(workUnit);
+        }
+    }
+
+    private static class UpdateUrisTaskImpl implements Task {
+        private final Collection<String> uris;
         private final IndividualDao indDao;
         private final SearchIndexExcluderList excluders;
         private final DocumentModifierList modifiers;
@@ -61,26 +97,34 @@ public class UpdateUrisTask implements Task {
         private final Status status;
         private final SearchEngine searchEngine;
 
-	public UpdateUrisTask(Collection<String> uris,
+        public UpdateUrisTaskImpl(IndexerConfig config, Collection<String> uris) {
-			SearchIndexExcluderList excluders, DocumentModifierList modifiers,
+            this.excluders = config.excluderList();
-			IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+            this.modifiers = config.documentModifierList();
-		this.uris = new HashSet<>(uris);
+            this.indDao = config.individualDao();
+            this.listeners = config.listenerList();
+            this.pool = config.workerThreadPool();
+
+            this.uris = uris;
+            this.status = new Status(this, uris.size(), 500);
+
+            this.searchEngine = ApplicationUtils.instance().getSearchEngine();
+        }
+
+        public UpdateUrisTaskImpl(Collection<String> uris, SearchIndexExcluderList excluders, DocumentModifierList modifiers, IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+            this.uris = uris;
             this.excluders = excluders;
             this.modifiers = modifiers;
             this.indDao = indDao;
             this.listeners = listeners;
             this.pool = pool;
-
             this.status = new Status(this, uris.size(), 500);
 
             this.searchEngine = ApplicationUtils.instance().getSearchEngine();
-
         }
 
         @Override
         public void run() {
-		listeners.fireEvent(new Event(START_URIS, status
+            listeners.fireEvent(new Event(START_URIS, status.getSearchIndexerStatus()));
-				.getSearchIndexerStatus()));
             excluders.startIndexing();
             modifiers.startIndexing();
 
@@ -107,8 +151,7 @@ public class UpdateUrisTask implements Task {
 
             excluders.stopIndexing();
             modifiers.stopIndexing();
-		listeners.fireEvent(new Event(STOP_URIS, status
+            listeners.fireEvent(new Event(STOP_URIS, status.getSearchIndexerStatus()));
-				.getSearchIndexerStatus()));
         }
 
         private boolean isInterrupted() {
@@ -132,7 +175,9 @@ public class UpdateUrisTask implements Task {
             return excluders.isExcluded(ind);
         }
 
-	/** A delete is fast enough to be done synchronously. */
+        /**
+         * A delete is fast enough to be done synchronously.
+         */
         private void deleteDocument(String uri) {
             try {
                 searchEngine.deleteById(SearchIndexerUtils.getIdForUri(uri));
@@ -146,7 +191,9 @@ public class UpdateUrisTask implements Task {
             }
         }
 
-	/** An exclusion is just a delete for different reasons. */
+        /**
+         * An exclusion is just a delete for different reasons.
+         */
         private void excludeDocument(String uri) {
             try {
                 searchEngine.deleteById(SearchIndexerUtils.getIdForUri(uri));
@@ -193,16 +240,12 @@ public class UpdateUrisTask implements Task {
             return status.getSearchIndexerStatus();
         }
 
-	// ----------------------------------------------------------------------
-	// helper classes
-	// ----------------------------------------------------------------------
-
         /**
          * A thread-safe collection of status information. All methods are
          * synchronized.
          */
         private static class Status {
-		private final UpdateUrisTask parent;
+            private final UpdateUrisTaskImpl parent;
             private final int total;
             private final int progressInterval;
             private int updated = 0;
@@ -210,7 +253,7 @@ public class UpdateUrisTask implements Task {
             private int excluded = 0;
             private Date since = new Date();
 
-		public Status(UpdateUrisTask parent, int total, int progressInterval) {
+            public Status(UpdateUrisTaskImpl parent, int total, int progressInterval) {
                 this.parent = parent;
                 this.total = total;
                 this.progressInterval = progressInterval;
@@ -243,9 +286,12 @@ public class UpdateUrisTask implements Task {
                 return new SearchIndexerStatus(PROCESSING_URIS, since,
                         new UriCounts(excluded, deleted, updated, remaining, total));
             }
-
+        }
     }
 
+    // ----------------------------------------------------------------------
+    // helper classes
+    // ----------------------------------------------------------------------
     /**
      * This will be first in the list of SearchIndexExcluders.
      */
@@ -263,6 +309,5 @@ public class UpdateUrisTask implements Task {
         public String toString() {
             return "Internal: ExcludeIfNoVClasses";
         }
-
    }
 }

webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java

@@ -31,6 +31,11 @@ public class SearchIndexerStub implements SearchIndexer {
 		paused = true;
 	}
 
+    @Override
+    public void pauseWithoutDeferring() {
+        paused = true;
+    }
+
     @Override
 	public void unpause() {
 		paused = false;