From 7b9c3e42885ff69d3f76fba0505a0c3bd58041ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Proch=C3=A1zka?= <david@prochazka.dev>
Date: Tue, 9 Feb 2021 15:42:29 +0100
Subject: [PATCH] FIX: consistency of stream functions
---
src/mhtree/InternalNode.java | 3 ++-
src/mhtree/Node.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/mhtree/InternalNode.java b/src/mhtree/InternalNode.java
index 4d418d4..c786940 100644
--- a/src/mhtree/InternalNode.java
+++ b/src/mhtree/InternalNode.java
@@ -70,7 +70,8 @@ public class InternalNode extends Node implements Serializable {
if (getLevel() == level) return Collections.singletonList(this);
return children.stream()
- .flatMap(child -> child.getNodesOnLevel(level).stream())
+ .map(child -> child.getNodesOnLevel(level))
+ .flatMap(Collection::stream)
.collect(Collectors.toList());
}
}
diff --git a/src/mhtree/Node.java b/src/mhtree/Node.java
index 509ef30..6f042bf 100644
--- a/src/mhtree/Node.java
+++ b/src/mhtree/Node.java
@@ -7,6 +7,7 @@ import messif.objects.LocalAbstractObject;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@@ -28,7 +29,8 @@ public abstract class Node implements Serializable {
public static InternalNode createParent(List<Node> nodes, PrecomputedDistances distances, InsertType insertType) {
List<LocalAbstractObject> objects = nodes.stream()
- .flatMap(node -> node.getObjects().stream())
+ .map(Node::getObjects)
+ .flatMap(Collection::stream)
.collect(Collectors.toList());
return new InternalNode(distances.getSubset(objects), insertType);
--
GitLab