diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java index d11bce6c0..8f2e31420 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java @@ -3,6 +3,7 @@ package cn.hutool.core.collection.iter; import java.io.Serializable; import java.lang.reflect.Array; import java.util.NoSuchElementException; +import java.util.Objects; /** * 数组Iterator对象 @@ -75,7 +76,7 @@ public class ArrayIter implements IterableIter, ResettableIter, Seriali * @throws NullPointerException array对象为null */ public ArrayIter(final Object array, final int startIndex, final int endIndex) { - this.endIndex = Array.getLength(array); + this.endIndex = Array.getLength(Objects.requireNonNull(array)); if (endIndex > 0 && endIndex < this.endIndex) { this.endIndex = endIndex; } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java index 389a2fff3..61061eb73 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java @@ -39,7 +39,7 @@ public class CopiedIter implements IterableIter, Serializable { } /** - * 构造 + * 构造，当{@code iterator}为空时，默认复制一个空迭代器 * * @param iterator 被复制的Iterator */ diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java index 883ac31fa..174450a0e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java @@ -1,7 +1,5 @@ package cn.hutool.core.collection.iter; -import cn.hutool.core.collection.iter.IterableIter; - import java.io.Serializable; import java.util.Enumeration; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java index b281ffd9b..7a8145c4c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java @@ -1,11 +1,9 @@ package cn.hutool.core.collection.iter; import cn.hutool.core.lang.Chain; +import cn.hutool.core.util.ArrayUtil; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; +import java.util.*; /** * 组合{@link Iterator}，将多个{@link Iterator}组合在一起，便于集中遍历。
@@ -28,16 +26,27 @@ public class IterChain implements Iterator, Chain, IterChain... iterators) { - for (final Iterator iterator : iterators) { - addChain(iterator); + if (ArrayUtil.isNotEmpty(iterators)) { + for (final Iterator iterator : iterators) { + addChain(iterator); + } } } + /** + * 添加迭代器 + * + * @param iterator 迭代器 + * @return 当前实例 + * @throws IllegalArgumentException 当迭代器被重复添加，或待添加的迭代器为{@code null}时抛出 + */ @Override public IterChain addChain(final Iterator iterator) { + Objects.requireNonNull(iterator); if (allIterators.contains(iterator)) { throw new IllegalArgumentException("Duplicate iterator"); } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java index 69d049104..8ca37b3b0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java @@ -1,11 +1,12 @@ package cn.hutool.core.collection.iter; -import cn.hutool.core.collection.iter.IterableIter; +import cn.hutool.core.lang.Assert; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Objects; /** * 分批迭代工具，可以分批处理数据 @@ -36,9 +37,11 @@ public class PartitionIter implements IterableIter>, Serializable { * * @param iterator 迭代器 * @param partitionSize 每批大小，最后一批不满一批算一批 + * @throws IllegalArgumentException 当{@code partitionSize}小于等于0，或{@code iterator}为{@code null}时抛出 */ public PartitionIter(final Iterator iterator, final int partitionSize) { - this.iterator = iterator; + Assert.isTrue(partitionSize > 0, "partition size must greater than 0"); + this.iterator = Objects.requireNonNull(iterator); this.partitionSize = partitionSize; } diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/ArrayIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/iter/ArrayIterTest.java new file mode 100644 index 000000000..48aef57a1 --- /dev/null +++ b/hutool-core/src/test/java/cn/hutool/core/collection/iter/ArrayIterTest.java @@ -0,0 +1,50 @@ +package cn.hutool.core.collection.iter; + +import org.junit.Assert; +import org.junit.Test; + +/** + * test for {@link ArrayIter} + */ +public class ArrayIterTest { + + @Test + public void testHasNext() { + Integer[] arr = new Integer[]{ 1, 2, 3 }; + ArrayIter iter = new ArrayIter<>(arr); + Assert.assertTrue(iter.hasNext()); + } + + @Test + public void testNext() { + Integer[] arr = new Integer[]{ 1, 2, 3 }; + ArrayIter iter = new ArrayIter<>(arr); + Assert.assertEquals((Integer)1, iter.next()); + Assert.assertEquals((Integer)2, iter.next()); + Assert.assertEquals((Integer)3, iter.next()); + } + + @Test + public void testRemove() { + Integer[] arr = new Integer[]{ 1, 2, 3 }; + ArrayIter iter = new ArrayIter<>(arr); + Assert.assertThrows(UnsupportedOperationException.class, iter::remove); + } + + @Test + public void testGetArray() { + Integer[] arr = new Integer[]{ 1, 2, 3 }; + ArrayIter iter = new ArrayIter<>(arr); + Assert.assertEquals(arr, iter.getArray()); + } + + @Test + public void testReset() { + Integer[] arr = new Integer[]{ 1, 2, 3 }; + ArrayIter iter = new ArrayIter<>(arr); + Assert.assertEquals((Integer)1, iter.next()); + iter.reset(); + Assert.assertEquals((Integer)1, iter.next()); + } + +} diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/CopiedIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/iter/CopiedIterTest.java new file mode 100644 index 000000000..76e86a7c2 --- /dev/null +++ b/hutool-core/src/test/java/cn/hutool/core/collection/iter/CopiedIterTest.java @@ -0,0 +1,47 @@ +package cn.hutool.core.collection.iter; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +/** + * test for {@link CopiedIter} + */ +public class CopiedIterTest { + + @Test + public void copyOf() { + List list = Arrays.asList(1, 2, 3); + Iterator iter = list.iterator(); + Assert.assertEquals((Integer)1, iter.next()); + + Assert.assertEquals((Integer)2, CopiedIter.copyOf(iter).next()); + } + + @Test + public void hasNext() { + Assert.assertTrue(CopiedIter.copyOf(Arrays.asList(1, 2, 3).iterator()).hasNext()); + Assert.assertFalse(CopiedIter.copyOf(Collections.emptyIterator()).hasNext()); + } + + @Test + public void next() { + List list = Arrays.asList(1, 2, 3); + Iterator iter = CopiedIter.copyOf(list.iterator()); + Assert.assertEquals((Integer)1, iter.next()); + Assert.assertEquals((Integer)2, iter.next()); + Assert.assertEquals((Integer)3, iter.next()); + } + + @Test + public void remove() { + List list = Arrays.asList(1, 2, 3); + Iterator iter = CopiedIter.copyOf(list.iterator()); + Assert.assertThrows(UnsupportedOperationException.class, iter::remove); + } + +} diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java index 79cacae3c..4778a320d 100755 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java @@ -4,7 +4,10 @@ import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; +import java.util.function.Predicate; public class FilterIterTest { @@ -20,4 +23,40 @@ public class FilterIterTest { } Assert.assertEquals(2, count); } + + @Test + public void hasNext() { + Iterator iter = new FilterIter<>(Arrays.asList(1, 2, 3).iterator(), i -> true); + Assert.assertTrue(iter.hasNext()); + iter = new FilterIter<>(Collections.emptyIterator(), i -> true); + Assert.assertFalse(iter.hasNext()); + } + + @Test + public void next() { + // 只保留奇数 + Iterator iter = new FilterIter<>(Arrays.asList(1, 2, 3).iterator(), i -> (i & 1) == 1); + Assert.assertEquals((Integer)1, iter.next()); + Assert.assertEquals((Integer)3, iter.next()); + } + + @Test + public void remove() { + Iterator iter = new FilterIter<>(Collections.emptyIterator(), i -> true); + Assert.assertThrows(IllegalStateException.class, iter::remove); + } + + @Test + public void getIterator() { + FilterIter iter = new FilterIter<>(Collections.emptyIterator(), i -> true); + Assert.assertSame(Collections.emptyIterator(), iter.getIterator()); + } + + @Test + public void getFilter() { + Predicate predicate = i -> true; + FilterIter iter = new FilterIter<>(Collections.emptyIterator(), predicate); + Assert.assertSame(predicate, iter.getFilter()); + } + } diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterChainTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterChainTest.java new file mode 100644 index 000000000..96d49471b --- /dev/null +++ b/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterChainTest.java @@ -0,0 +1,66 @@ +package cn.hutool.core.collection.iter; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; + +/** + * test for {@link IterChain} + */ +public class IterChainTest { + + @Test + public void addChain() { + Iterator iter1 = Arrays.asList(1, 2).iterator(); + Iterator iter2 = Arrays.asList(3, 4).iterator(); + IterChain iterChain = new IterChain<>(); + Assert.assertSame(iterChain, iterChain.addChain(iter1)); + Assert.assertSame(iterChain, iterChain.addChain(iter2)); + Assert.assertEquals(2, iterChain.allIterators.size()); + } + + @Test + public void hasNext() { + IterChain iterChain = new IterChain<>(); + Assert.assertFalse(iterChain.hasNext()); + Assert.assertFalse(iterChain.addChain(Collections.emptyIterator()).hasNext()); + Assert.assertTrue(iterChain.addChain(Arrays.asList(3, 4).iterator()).hasNext()); + } + + @Test + public void next() { + Iterator iter1 = Arrays.asList(1, 2).iterator(); + Iterator iter2 = Arrays.asList(3, 4).iterator(); + IterChain iterChain = new IterChain<>(); + Assert.assertSame(iterChain, iterChain.addChain(iter1)); + Assert.assertSame(iterChain, iterChain.addChain(iter2)); + Assert.assertEquals((Integer)1, iterChain.next()); + Assert.assertEquals((Integer)2, iterChain.next()); + Assert.assertEquals((Integer)3, iterChain.next()); + Assert.assertEquals((Integer)4, iterChain.next()); + } + + @Test + public void remove() { + IterChain iterChain = new IterChain<>(); + iterChain.addChain(Arrays.asList(1, 2).iterator()); + Assert.assertThrows(IllegalStateException.class, iterChain::remove); + } + + @Test + public void iterator() { + Iterator iter1 = Arrays.asList(1, 2).iterator(); + Iterator iter2 = Arrays.asList(3, 4).iterator(); + IterChain iterChain = new IterChain<>(); + Assert.assertSame(iterChain, iterChain.addChain(iter1)); + Assert.assertSame(iterChain, iterChain.addChain(iter2)); + + Iterator> iterators = iterChain.iterator(); + Assert.assertSame(iter1, iterators.next()); + Assert.assertSame(iter2, iterators.next()); + } + +} diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterUtilTest.java new file mode 100644 index 000000000..b9f64521d --- /dev/null +++ b/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterUtilTest.java @@ -0,0 +1,67 @@ +package cn.hutool.core.collection.iter; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; + +/** + * test for {@link IterUtil} + */ +public class IterUtilTest { + + @Test + public void testGetIter() { + Assert.assertNull(IterUtil.getIter(null)); + Assert.assertEquals(Collections.emptyIterator(), IterUtil.getIter(Collections.emptyList())); + } + + @Test + public void testIsEmpty() { + Assert.assertTrue(IterUtil.isEmpty(Collections.emptyIterator())); + Assert.assertFalse(IterUtil.isEmpty(Arrays.asList(1, 2).iterator())); + + Assert.assertTrue(IterUtil.isEmpty(Collections.emptyList())); + Assert.assertFalse(IterUtil.isEmpty(Arrays.asList(1, 2))); + } + + @Test + public void testIsNotEmpty() { + Assert.assertFalse(IterUtil.isNotEmpty(Collections.emptyIterator())); + Assert.assertTrue(IterUtil.isNotEmpty(Arrays.asList(1, 2).iterator())); + + Assert.assertFalse(IterUtil.isNotEmpty(Collections.emptyList())); + Assert.assertTrue(IterUtil.isNotEmpty(Arrays.asList(1, 2))); + } + + @Test + public void testHasNull() { + Assert.assertFalse(IterUtil.hasNull(Arrays.asList(1, 3, 2).iterator())); + Assert.assertTrue(IterUtil.hasNull(Arrays.asList(1, null, 2).iterator())); + Assert.assertFalse(IterUtil.hasNull(Collections.emptyIterator())); + Assert.assertTrue(IterUtil.hasNull(null)); + } + + @Test + public void testIsAllNull() { + Assert.assertTrue(IterUtil.isAllNull(Arrays.asList(null, null))); + Assert.assertFalse(IterUtil.isAllNull(Arrays.asList(1, null))); + Assert.assertTrue(IterUtil.isAllNull((Iterable)null)); + Assert.assertTrue(IterUtil.isAllNull(Arrays.asList(null, null).iterator())); + Assert.assertFalse(IterUtil.isAllNull(Arrays.asList(1, null).iterator())); + Assert.assertTrue(IterUtil.isAllNull((Iterator)null)); + } + + @Test + public void testCountMap() { + Object o1 = new Object(); + Object o2 = new Object(); + Map countMap = IterUtil.countMap(Arrays.asList(o1, o2, o1, o1).iterator()); + Assert.assertEquals((Integer)3, countMap.get(o1)); + Assert.assertEquals((Integer)1, countMap.get(o2)); + } + +} diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/PartitionIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/iter/PartitionIterTest.java new file mode 100644 index 000000000..f48acafc1 --- /dev/null +++ b/hutool-core/src/test/java/cn/hutool/core/collection/iter/PartitionIterTest.java @@ -0,0 +1,31 @@ +package cn.hutool.core.collection.iter; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; + +/** + * test for {@link PartitionIter} + */ +public class PartitionIterTest { + + @Test + public void hasNext() { + Iterator iter = Arrays.asList(1, 2, 3, 4).iterator(); + PartitionIter partitionIter = new PartitionIter<>(iter, 2); + Assert.assertTrue(partitionIter.hasNext()); + Assert.assertFalse(new PartitionIter<>(Collections.emptyIterator(), 1).hasNext()); + } + + @Test + public void next() { + Iterator iter = Arrays.asList(1, 2, 3, 4).iterator(); + PartitionIter partitionIter = new PartitionIter<>(iter, 2); + Assert.assertEquals(Arrays.asList(1, 2), partitionIter.next()); + Assert.assertEquals(Arrays.asList(3, 4), partitionIter.next()); + } + +}