fix: Tree.getAllLeaves() only yielding one value

Author: Col-E

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>software.coley</groupId>
     <artifactId>extra-collections</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
 
     <name>Extra Collections</name>
     <description>Extra useful collection types and utilities</description>

src/main/java/software/coley/collections/tree/NavigableTreeImpl.java

@@ -4,6 +4,7 @@
 
 import javax.annotation.Nonnull;
 import java.util.NavigableMap;
+import java.util.Objects;
 import java.util.TreeMap;
 import java.util.function.Supplier;
 
@@ -141,4 +142,25 @@ private NavigableTree<K, V> from(NavigableMap<K, Tree<K, V>> subMap) {
 		subTree.putAll(subMap);
 		return subTree;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof Tree) || !super.equals(o)) return false;
+
+		Tree<?, ?> that = (Tree<?, ?>) o;
+		return Objects.equals(value, that.getValue());
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + (value != null ? value.hashCode() : 0);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "NavigableTreeImpl{" + value + '}';
+	}
 }

src/main/java/software/coley/collections/tree/SortedTreeImpl.java

@@ -3,6 +3,7 @@
 import software.coley.collections.delegate.DelegatingSortedMap;
 
 import javax.annotation.Nonnull;
+import java.util.Objects;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.function.Supplier;
@@ -117,4 +118,25 @@ private SortedTree<K, V> from(SortedMap<K, Tree<K, V>> subMap) {
 		subTree.putAll(subMap);
 		return subTree;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof Tree) || !super.equals(o)) return false;
+
+		Tree<?, ?> that = (Tree<?, ?>) o;
+		return Objects.equals(value, that.getValue());
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + value.hashCode();
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "SortedTreeImpl{" + value + '}';
+	}
 }

src/test/java/software/coley/collections/TreeTest.java

@@ -5,6 +5,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -131,4 +132,21 @@ public void test_navigable_descending() {
 		assertEquals("keyA", descending.lastKey());
 		assertEquals(Lists.reversed(keys), new ArrayList<>(descending.keySet()));
 	}
+
+	@Test
+	public void test_tree_gets_all_leaves() {
+		SortedTree<String, String> tree = new SortedTreeImpl<>("root");
+		// Populate original tree
+		tree.putTree("key1", "value1");
+		Tree<String, String> sub1 = tree.get("key1");
+		sub1.putTree("key1-a", "value1a");
+		sub1.putTree("key1-b", "value1b");
+		tree.putTree("key2", "value2");
+		tree.putTree("key3", "value3");
+		tree.putTree("key4", "value4");
+		tree.putTree("key5", "value5");
+		// There are 6 leaves, as key1 has two children
+		Set<Tree<String, String>> foo = tree.getAllLeaves();
+		assertEquals(6, foo.size());
+	}
 }