fix: PipelineRegistry that had a double singleton

ICIJ · Jan 29, 2025 · 92b06b3 · 92b06b3
1 parent 923a80a
commit 92b06b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/datashare-app/src/main/java/org/icij/datashare/PipelineRegistry.java b/datashare-app/src/main/java/org/icij/datashare/PipelineRegistry.java
diff --git a/datashare-app/src/main/java/org/icij/datashare/mode/CommonMode.java b/datashare-app/src/main/java/org/icij/datashare/mode/CommonMode.java
@@ -17,22 +17,21 @@
 import net.codestory.http.injection.GuiceAdapter;
 import net.codestory.http.misc.Env;
 import net.codestory.http.routes.Routes;
-import org.icij.datashare.PipelineRegistry;
 import org.icij.datashare.PropertiesProvider;
 import org.icij.datashare.Repository;
 import org.icij.datashare.asynctasks.TaskManager;
 import org.icij.datashare.asynctasks.TaskModifier;
 import org.icij.datashare.asynctasks.TaskRepository;
-import org.icij.datashare.cli.TaskRepositoryType;
-import org.icij.datashare.db.JooqTaskRepository;
-import org.icij.datashare.tasks.TaskRepositoryRedis;
 import org.icij.datashare.asynctasks.TaskSupplier;
 import org.icij.datashare.batch.BatchSearchRepository;
 import org.icij.datashare.cli.Mode;
 import org.icij.datashare.cli.QueueType;
+import org.icij.datashare.cli.TaskRepositoryType;
 import org.icij.datashare.com.queue.AmqpInterlocutor;
+import org.icij.datashare.db.JooqTaskRepository;
 import org.icij.datashare.db.RepositoryFactoryImpl;
 import org.icij.datashare.extension.ExtensionLoader;
+import org.icij.datashare.extension.PipelineRegistry;
 import org.icij.datashare.extract.DocumentCollectionFactory;
 import org.icij.datashare.extract.MemoryDocumentCollectionFactory;
 import org.icij.datashare.extract.RedisDocumentCollectionFactory;
@@ -42,6 +41,7 @@
 import org.icij.datashare.tasks.TaskManagerAmqp;
 import org.icij.datashare.tasks.TaskManagerMemory;
 import org.icij.datashare.tasks.TaskManagerRedis;
+import org.icij.datashare.tasks.TaskRepositoryRedis;
 import org.icij.datashare.tasks.TaskSupplierAmqp;
 import org.icij.datashare.tasks.TaskSupplierRedis;
 import org.icij.datashare.text.indexing.Indexer;
@@ -87,7 +87,6 @@
 public abstract class CommonMode extends AbstractModule implements Closeable {
     protected Logger logger = LoggerFactory.getLogger(getClass());
     public static final String DS_TASK_MANAGER_MAP_NAME = "ds:task:manager:tasks";
-    public static final String DS_TASK_MANAGER_QUEUE_NAME = "ds:task:manager";
 
     protected final PropertiesProvider propertiesProvider;
     protected final Mode mode;
@@ -208,7 +207,7 @@ LanguageGuesser provideLanguageGuesser() throws IOException {
     }
 
     @Provides @Singleton
-    org.icij.datashare.extension.PipelineRegistry providePipelineRegistry(final PropertiesProvider propertiesProvider) {
+    PipelineRegistry providePipelineRegistry(final PropertiesProvider propertiesProvider) {
         PipelineRegistry pipelineRegistry = new PipelineRegistry(propertiesProvider);
         pipelineRegistry.register(EmailPipeline.class);
         pipelineRegistry.register(Pipeline.Type.CORENLP);