only lookup the mask or target if lookup is supported

Author: cgoina

colormipsearch-persist/src/itest/java/org/janelia/colormipsearch/dao/mongo/PPPMatchesMongoDaoITest.java

@@ -1,7 +1,6 @@
 package org.janelia.colormipsearch.dao.mongo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -18,7 +17,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 
 public class PPPMatchesMongoDaoITest extends AbstractMongoDaoITest {
 

colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dao/mongo/AbstractNeuronMatchesMongoDao.java

@@ -333,22 +333,26 @@ protected List<Bson> createQueryPipeline(NeuronsMatchFilter<R> matchFilter,
             );
         }
 
-        pipeline.add(maskLookup);
-        pipeline.add(targetLookup);
+        if (supportsMaskLookup()) {
+            pipeline.add(maskLookup);
+            pipeline.add(Aggregates.unwind(
+                    "$maskImage",
+                    new UnwindOptions().preserveNullAndEmptyArrays(false)));
+        }
 
-        pipeline.add(Aggregates.unwind(
-                "$maskImage",
-                new UnwindOptions().preserveNullAndEmptyArrays(preserveNullsWhenUnwindingMasks())));
-        pipeline.add(Aggregates.unwind(
-                "$image",
-                new UnwindOptions().preserveNullAndEmptyArrays(preserveNullsWhenUnwindingTargets())));
+        if (supportsTargetLookup()) {
+            pipeline.add(targetLookup);
+            pipeline.add(Aggregates.unwind(
+                    "$image",
+                    new UnwindOptions().preserveNullAndEmptyArrays(false)));
+        }
 
         return pipeline;
     }
 
-    abstract boolean preserveNullsWhenUnwindingMasks();
+    abstract boolean supportsMaskLookup();
 
-    abstract boolean preserveNullsWhenUnwindingTargets();
+    abstract boolean supportsTargetLookup();
 
     private boolean hasBothImageRefs(R match) {
         return match.hasMaskImageRefId() && match.hasMatchedImageRefId();

colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dao/mongo/CDMatchesMongoDao.java

@@ -13,12 +13,12 @@ public CDMatchesMongoDao(MongoDatabase mongoDatabase, IdGenerator idGenerator, b
     }
 
     @Override
-    boolean preserveNullsWhenUnwindingMasks() {
-        return false;
+    boolean supportsMaskLookup() {
+        return true;
     }
 
     @Override
-    boolean preserveNullsWhenUnwindingTargets() {
-        return false;
+    boolean supportsTargetLookup() {
+        return true;
     }
 }

colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dao/mongo/PPPMatchesMongoDao.java

@@ -26,12 +26,12 @@ protected void createDocumentIndexes(boolean createAllIndexes) {
     }
 
     @Override
-    boolean preserveNullsWhenUnwindingMasks() {
-        return false;
+    boolean supportsMaskLookup() {
+        return true;
     }
 
     @Override
-    boolean preserveNullsWhenUnwindingTargets() {
-        return true;
+    boolean supportsTargetLookup() {
+        return false;
     }
 }