[#343] wires memory Document collections into CLI

ICIJ · Jan 9, 2020 · 0128c80 · 0128c80
1 parent a13c4a7
commit 0128c80
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
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
@@ -20,6 +20,7 @@
 import org.icij.datashare.extract.RedisUserDocumentQueue;
 import org.icij.datashare.extract.RedisUserDocumentSet;
 import org.icij.datashare.tasks.DocumentCollectionFactory;
+import org.icij.datashare.tasks.MemoryDocumentCollectionFactory;
 import org.icij.datashare.tasks.TaskFactory;
 import org.icij.datashare.tasks.TaskManager;
 import org.icij.datashare.text.indexing.Indexer;
@@ -80,10 +81,14 @@ protected void configure() {
         bind(Indexer.class).to(ElasticsearchIndexer.class).asEagerSingleton();
         bind(TaskManager.class).toInstance(new TaskManager(propertiesProvider));
         install(new FactoryModuleBuilder().build(TaskFactory.class));
-        install(new FactoryModuleBuilder().
+        if ("memory".equals(propertiesProvider.getProperties().get("queueType"))) {
+            bind(DocumentCollectionFactory.class).to(MemoryDocumentCollectionFactory.class).asEagerSingleton();
+        } else {
+            install(new FactoryModuleBuilder().
                 implement(DocumentQueue.class, RedisUserDocumentQueue.class).
                 implement(DocumentSet.class, RedisUserDocumentSet.class).
                 build(DocumentCollectionFactory.class));
+        }
         bind(Publisher.class).to(RedisPublisher.class);
     }
 

diff --git a/datashare-cli/src/main/java/org/icij/datashare/cli/DatashareCli.java b/datashare-cli/src/main/java/org/icij/datashare/cli/DatashareCli.java
@@ -47,6 +47,8 @@ public boolean parseArguments(String[] args) {
         DatashareCliOptions.queueName(parser);
 
         DatashareCliOptions.cors(parser);
+        DatashareCliOptions.queueType(parser);
+        DatashareCliOptions.busType(parser);
         DatashareCliOptions.messageBusAddress(parser);
         DatashareCliOptions.redisAddress(parser);
         DatashareCliOptions.dataSourceUrl(parser);

diff --git a/datashare-cli/src/main/java/org/icij/datashare/cli/DatashareCliOptions.java b/datashare-cli/src/main/java/org/icij/datashare/cli/DatashareCliOptions.java
@@ -129,6 +129,14 @@ static OptionSpec<String> messageBusAddress(OptionParser parser) {
                 .defaultsTo("redis");
     }
 
+    public static OptionSpec<String> busType(OptionParser parser) {
+        return parser.acceptsAll(
+                singletonList("busType"),
+                "Backend data bus type. Values can be \"memory\" or \"redis\"")
+                .withRequiredArg()
+                .defaultsTo("redis");
+    }
+
     static OptionSpec<String> redisAddress(OptionParser parser) {
             return parser.acceptsAll(
                     singletonList("redisAddress"),
@@ -137,6 +145,14 @@ static OptionSpec<String> redisAddress(OptionParser parser) {
                     .defaultsTo("redis://redis:6379");
         }
 
+    static OptionSpec<String> queueType(OptionParser parser) {
+            return parser.acceptsAll(
+                    singletonList("queueType"),
+                    "Backend queues and sets type. Values can be \"memory\" or \"redis\"")
+                    .withRequiredArg()
+                    .defaultsTo("redis");
+        }
+
     static OptionSpec<Integer> fileParserParallelism(OptionParser parser) {
         return parser.acceptsAll(
                 asList("pp", "parserParallelism"),