fixup after rebase

Author: lassewesth

algo/src/main/java/org/neo4j/gds/similarity/filteredknn/FilteredKnn.java

@@ -25,10 +25,6 @@
 import org.neo4j.gds.similarity.knn.Knn;
 import org.neo4j.gds.similarity.knn.KnnContext;
 
-<<<<<<< HEAD
-=======
-import java.util.List;
-
 /**
  * Filtered KNN is the same as ordinary KNN, _but_ we allow users to regulate final output in two ways.
  *
@@ -74,10 +70,10 @@ public FilteredKnnResult compute() {
         Knn.Result result = delegate.compute();
 
         return ImmutableFilteredKnnResult.of(
-            targetNodeFiltering,
             result.ranIterations(),
             result.didConverge(),
             result.nodePairsConsidered(),
+            targetNodeFiltering,
             sourceNodeFilter
         );
     }

algo/src/main/java/org/neo4j/gds/similarity/filteredknn/FilteredKnnResult.java

@@ -22,25 +22,26 @@
 import org.neo4j.gds.annotation.ValueClass;
 import org.neo4j.gds.similarity.SimilarityResult;
 
-import java.util.List;
 import java.util.stream.Stream;
 
 @ValueClass
 public abstract class FilteredKnnResult {
-    abstract TargetNodeFiltering neighbourConsumers();
-
     public abstract int ranIterations();
 
     public abstract boolean didConverge();
 
     public abstract long nodePairsConsidered();
 
-    public abstract List<Long> sourceNodes();
-
     public Stream<SimilarityResult> similarityResultStream() {
         TargetNodeFiltering neighbourConsumers = neighbourConsumers();
-        List<Long> sourceNodes = sourceNodes();
+        NodeFilter sourceNodeFilter = sourceNodeFilter();
 
-        return neighbourConsumers.asSimilarityResultStream(sourceNodes::contains);
+        return neighbourConsumers.asSimilarityResultStream(sourceNodeFilter);
     }
+
+    // ***
+    // Below is for internal use only
+    // ***
+    abstract TargetNodeFiltering neighbourConsumers();
+    abstract NodeFilter sourceNodeFilter();
 }