Node:stream{All => }: rename method
This commit is contained in:
parent
c772e90d68
commit
b644fb9dd8
4 changed files with 7 additions and 7 deletions
|
@ -249,7 +249,7 @@ public interface Node<T> {
|
|||
*
|
||||
* @return a stream of all the nodes in the tree below this node
|
||||
*/
|
||||
Stream<Node<T>> streamAll();
|
||||
Stream<Node<T>> stream();
|
||||
|
||||
/**
|
||||
* Returns a stream of all the node's ancestor nodes.
|
||||
|
|
|
@ -371,9 +371,9 @@ class NodeItem<T> implements Node<T> {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Stream<Node<T>> streamAll() {
|
||||
public Stream<Node<T>> stream() {
|
||||
return Stream.concat(Stream.of(this), getChildren().stream()
|
||||
.flatMap(Node::streamAll));
|
||||
.flatMap(Node::stream));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -437,14 +437,14 @@ public class ImmutableNodeItemTest {
|
|||
Nodes.namedChild("eight", "eight", n6);
|
||||
val immutableRoot = Nodes.asImmutable(node);
|
||||
//when
|
||||
val result = immutableRoot.streamAll()
|
||||
val result = immutableRoot.stream()
|
||||
.collect(Collectors.toList());
|
||||
//then
|
||||
assertThat(result).as("full tree")
|
||||
.hasSize(9);
|
||||
// and
|
||||
assertThat(immutableRoot.getChild("one")
|
||||
.streamAll()
|
||||
.stream()
|
||||
.collect(Collectors.toList())).as("sub-tree")
|
||||
.hasSize(4);
|
||||
}
|
||||
|
|
|
@ -920,13 +920,13 @@ public class NodeItemTest {
|
|||
val n7 = Nodes.namedChild("seven", "seven", n5);
|
||||
val n8 = Nodes.namedChild("eight", "eight", n6);
|
||||
//when
|
||||
val result = node.streamAll()
|
||||
val result = node.stream()
|
||||
.collect(Collectors.toList());
|
||||
//then
|
||||
assertThat(result).as("full tree")
|
||||
.contains(node, n1, n2, n3, n4, n5, n6, n7, n8);
|
||||
// and
|
||||
assertThat(n1.streamAll()
|
||||
assertThat(n1.stream()
|
||||
.collect(Collectors.toList())).as("sub-tree")
|
||||
.containsExactlyInAnyOrder(n1, n3, n5, n7);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue