[COLLECTIONS-795] Add a new Iterator to allowing zipping over two iterators of different types #238

anantdamle · 2021-05-26T17:53:13Z

[COLLECTIONS-795] Add a new Iterator to allowing zipping over two iterators of different types.

garydgregory · 2021-05-26T18:54:59Z

src/main/java/org/apache/commons/collections4/iterators/ZippedTupleIterator.java

+ * @param <L> the left elements' type
+ * @param <R> the right elements' type
+ */
+public class ZippedTupleIterator<L, R> implements Iterator<ZippedTuple<L, R>> {


Why is this prefixed with "zip" when it has nothing to do with zip files?

I think it is related to zipper. Like Python stdlib's zip function. Scala and Clojure also have a similar function I think.

Maybe but the prefix here is "zipped" not "zipper", terrible name IMO.

I'm not good naming things, so can't really suggest a better one. The code example in the Python docs uses zipped too for the variable that contains the tuples returned with zip (that were zipped), so that should sound OK for users coming from Python (or JS using Lodash's zip/unzip which I'm using in my current project). But if that's confusing for other users, we can try to think in a better name I think.

Updated to use PairedIterator and PairedIterable names. Hope is acceptable to all.

src/test/java/org/apache/commons/collections4/iterators/ZippedTupleIteratorTest.java

anantdamle · 2021-05-27T12:22:58Z

The CI flagged failing tests are not stemming from any code that I have touched,
How to resolve?

XenoAmess · 2021-05-28T13:26:00Z

The CI flagged failing tests are not stemming from any code that I have touched,
How to resolve?

checkstyles fails.

https://travis-ci.com/github/apache/commons-collections/jobs/508633787

[ERROR] src/main/java/org/apache/commons/collections4/IterableUtils.java:[574,21] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/IterableUtils.java:[574,46] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/IterableUtils.java:[578,47] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/IterableUtils.java:[580,41] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[74,7] (indentation) Indentation: 'ctor def' child has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[75,7] (indentation) Indentation: 'ctor def' child has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[88,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[101,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[114,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[125,7] (indentation) Indentation: 'if' has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[126,9] (indentation) Indentation: 'if' child has incorrect indentation level 8, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[127,7] (indentation) Indentation: 'if rcurly' has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[129,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[140,5] (indentation) Indentation: 'member def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[142,5] (indentation) Indentation: 'member def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[144,5] (indentation) Indentation: 'ctor def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[145,7] (indentation) Indentation: 'ctor def' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[146,7] (indentation) Indentation: 'ctor def' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[147,5] (indentation) Indentation: 'ctor def rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[156,5] (indentation) Indentation: 'method def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[157,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[158,5] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[160,5] (indentation) Indentation: 'method def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[161,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[162,5] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[164,5] (indentation) Indentation: 'method def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[165,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[166,5] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[168,5] (indentation) Indentation: 'method def modifier' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[170,7] (indentation) Indentation: 'method def' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[171,5] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java:[172,3] (indentation) Indentation: 'class def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/main/java/org/apache/commons/collections4/IteratorUtils.java:[921,21] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/IteratorUtils.java:[921,41] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/PairedIterable.java:[85,21] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/PairedIterable.java:[85,41] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/main/java/org/apache/commons/collections4/PairedIterable.java:[97,31] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
[ERROR] src/test/java/org/apache/commons/collections4/PairedIterableTest.java:[64,9] (whitespace) WhitespaceAfter: 'for' is not followed by whitespace.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[33,3] (indentation) Indentation: 'ctor def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[34,5] (indentation) Indentation: 'ctor def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[35,3] (indentation) Indentation: 'ctor def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[39,3] (indentation) Indentation: 'member def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[40,3] (indentation) Indentation: 'member def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[41,3] (indentation) Indentation: 'member def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[42,3] (indentation) Indentation: 'member def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[45,3] (indentation) Indentation: 'member def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[46,3] (indentation) Indentation: 'member def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[48,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[50,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[52,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[53,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[54,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[55,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[57,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[59,5] (indentation) Indentation: 'for' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[60,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[61,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[62,5] (indentation) Indentation: 'for rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[64,5] (indentation) Indentation: 'for' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[65,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[66,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[67,5] (indentation) Indentation: 'for rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[68,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[70,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[72,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[73,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[77,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[79,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[80,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[82,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[84,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[85,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[87,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[88,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[92,5] (indentation) Indentation: 'for' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[93,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[94,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[96,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[96,44] (whitespace) NoWhitespaceBefore: ',' is preceded with whitespace.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[97,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[97,41] (whitespace) NoWhitespaceBefore: ',' is preceded with whitespace.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[98,5] (indentation) Indentation: 'for rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[100,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[101,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[103,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[104,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[108,5] (indentation) Indentation: 'for' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[109,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[110,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[112,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[112,44] (whitespace) NoWhitespaceBefore: ',' is preceded with whitespace.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[113,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[113,41] (whitespace) NoWhitespaceBefore: ',' is preceded with whitespace.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[114,5] (indentation) Indentation: 'for rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[116,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[117,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[119,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[120,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[123,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[124,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[126,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[127,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[130,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[131,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[134,3] (indentation) Indentation: 'method def modifier' has incorrect indentation level 2, expected level should be 4.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[135,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[139,5] (indentation) Indentation: 'for' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[140,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[141,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[143,7] (indentation) Indentation: 'for' child has incorrect indentation level 6, expected level should be 12.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[146,5] (indentation) Indentation: 'for rcurly' has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[148,5] (indentation) Indentation: 'method def' child has incorrect indentation level 4, expected level should be 8.
[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[149,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.

kinow · 2021-05-28T21:34:58Z

@anantdamle

The CI flagged failing tests are not stemming from any code that I have touched,
How to resolve?

Click on the link of the failed Travis CI builds. Then choose one of the JDK versions (e.g. 8). There you should find the logs of the job that failed. For instance:

[ERROR] src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java:[149,3] (indentation) Indentation: 'method def rcurly' has incorrect indentation level 2, expected level should be 4.

anantdamle · 2021-05-29T02:38:12Z

thanks @XenoAmess and @kinow
Fixed checkstyles issues (also checked locally using mvn checkstyle:check)

The sytle checks & corrections can be simplified using spotless plugin.
Should I create a separate PR to implement spotless plugin for auto style correction?

coveralls · 2021-05-29T02:40:56Z

Coverage decreased (-0.008%) to 90.134% when pulling 1ed50ce on anantdamle:collections_795 into 0f54cb2 on apache:master.

anantdamle · 2021-05-29T04:30:52Z

Added tests to improve coverage

anantdamle · 2021-06-01T17:04:12Z

What are the next steps?

garydgregory

I'll try to take a look again later this week but did I miss something or are there no tests for empty lists, lists of unequal sizes, null inputs?

src/main/java/org/apache/commons/collections4/IteratorUtils.java

src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java

garydgregory · 2021-06-01T19:34:17Z

src/main/java/org/apache/commons/collections4/iterators/PairedIterator.java

+     *
+     * @param <L> the left elements' type
+     * @param <R> the right elements' type
+     */


We need to think about this because Common Lang already defines different kinds of Pair classes...

I usually use ImmutablePair, but that is in apache/commons-lang3 , that is not a dependency in this project and didn't think should add, but open to ideas. If you point me to a Pair Class, would be open to using an existing pair class.

src/test/java/org/apache/commons/collections4/PairedIterableTest.java

garydgregory · 2021-06-01T19:37:15Z

src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java

+    private ArrayList<Integer> largeIntsList = null;
+
+    // Unequal sized lists
+    private static final int SMALL_LIST_SIZE = 20;


If you expect the sizes to be different, you should assert that fact somewhere.

added two tests: testLeftIteratorLargerThanRight and testRightIteratorLargerThanLeft to match the tests of same name from PairedIteratorTest

garydgregory

Hi All,
See 2 minor comments. Another class to inspect is the existing ZippingIterator which should be considered for reuse; but note its different 'switching' aspect. Also, ZippingIterator will work for any number of input iterators (ZippingIterator.ZippingIterator(Iterator<? extends E>...)), not just two. So perhaps this PR should as well, which would remove the need for the pair class.

src/main/java/org/apache/commons/collections4/IteratorUtils.java

src/main/java/org/apache/commons/collections4/IterableUtils.java

anantdamle · 2021-06-04T00:54:41Z

@garydgregory there is one big difference with ZippingIterator, ZippingIterator<T> allows iterating over iterators of same generic type, whereas the proposed solution (PairedIterator<L, R>) allows using two different types and hence needs a Pair equivalent class.
Its also clearly demonstrated in the unit tests, by using Lists of two different types .

anantdamle · 2021-06-10T10:34:12Z

@garydgregory gentle bump up.

anantdamle · 2021-06-16T00:13:32Z

Gentle bump: any comments or changes today I should be doing?

anantdamle · 2021-06-18T04:56:19Z

Gentle Bump: Any review comments or improvements

garydgregory · 2021-06-18T11:14:52Z

No bumping needed. We are all volunteers. We are all busy. Please be patient.

anantdamle · 2021-08-03T07:41:50Z

sorry to nag! Any updates?

garydgregory · 2021-08-03T11:32:09Z

@anantdamle
We are volunteers here, we do what we can when we can ;-)

garydgregory · 2021-08-03T17:52:55Z

I'll try to take a look this week...

anantdamle · 2022-01-21T02:19:15Z

Any updates on this one?

@ben-manes

…llections (apache#301) * [COLLECTIONS-811] Integrate Guava Testlib tests for Apache Commons Collections * [COLLECTIONS-811] Add tests for Lists too, thanks to @ben-manes

Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.16.0 to 3.17.0. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](apache/maven-pmd-plugin@maven-pmd-plugin-3.16.0...maven-pmd-plugin-3.17.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

@SInCE

* Fixed some unit tests * First set with complete test cases. * Cleaned up hasher collecton processing * cleaned up code * added license headers * Refactored and cleaned up Moved to dependency on BitMapProducer, IndexProducer and BitCountProducer to retrieve internal representations of the data. * Added license header. * Updated documentation * Fixed bug and added tests * Added "@SInCE 4.5" where necessary * Added BitMapProducer constructor to SimpleBloomFilter * added BitMapProducer.fromLongArray() and Hasher.isEmpty() * Changes to speed up Simple filter processing * Null hasher used when a hasher is required but no values are available. * Added Hasher.Filter and Hasher.FilteredIntConsumer * Updated documentation + formatted. * Added license * fixed checkstyle issues * fixed javadoc issues * fixed test issue * fixed javadoc issues * Reduced the acceptable delta for p tests * Updated docs and test cases * Updated docs and test cases * fixed issue with Shape javadoc * Added more test coverage. * fixed formatting issues * Updated tests to use assertThrows. * fixed indents * Added constructor with IndexProducer * Fixed issue with compare and different length bitMap arrays * fixed formatting issues * Efficiency changes cleaned up asIndexArray BitMapProducer to IndexProducer conversion * changed XProviers to use XPredicates * Removed NoMatchException * Removed unneeded BitMap funcs Moves isSparse() to Shape. * fixed checkstyle issues * Fixed javadoc errors * simplified parameter in BitMapProducer.fromIndexProducer * fixed tests * added BitMapping verification * Added more tests * Added more tests * Fixed typos * Changes requested by aherbert * fixed "bit map" in documentation * Renamed tests * Removed blank lines * changed new X<foo> to new X<> * updated documentation * Added BloomFilter.copy() * changed ArrayCountingBloomFilter to use copy() method * cleaned up numberOfBitsMaps() * added asBitMapArray() and makePredicate() to BitMapProducer * Moved asIndexArray() to IndexProducer * harmonized Simple and Sparse Bloom filter constructors * Implemented AbstractCountingBloomFilter.asindexArray() * updated documentation * fixed up NullHasher * implemented hasher filter * Fixed style issues * added default SimpleHasher increment. * Added modulus calculation to SimpleHasher * fixed Hashing issues * moved hasher/filter/* to /hasher * moved bloomfilter/hasher to bloomfilter * fixed up checkstyle issues * Made Filter -> IndexFilter -w- factory * moved IndexFilter into Hasher * updated hashing tests & fixed checksyle * removed SingleItemhasherCollection as associated methods * Fixed some unit tests * First set with complete test cases. * Cleaned up hasher collecton processing * cleaned up code * added license headers * Refactored and cleaned up Moved to dependency on BitMapProducer, IndexProducer and BitCountProducer to retrieve internal representations of the data. * Added license header. * Updated documentation * Fixed bug and added tests * Added "@SInCE 4.5" where necessary * Added BitMapProducer constructor to SimpleBloomFilter * added BitMapProducer.fromLongArray() and Hasher.isEmpty() * Changes to speed up Simple filter processing * Null hasher used when a hasher is required but no values are available. * Added Hasher.Filter and Hasher.FilteredIntConsumer * Updated documentation + formatted. * Added license * fixed checkstyle issues * fixed javadoc issues * fixed test issue * fixed javadoc issues * Reduced the acceptable delta for p tests * Updated docs and test cases * Updated docs and test cases * fixed issue with Shape javadoc * Added more test coverage. * fixed formatting issues * Updated tests to use assertThrows. * fixed indents * Added constructor with IndexProducer * Fixed issue with compare and different length bitMap arrays * fixed formatting issues * Efficiency changes cleaned up asIndexArray BitMapProducer to IndexProducer conversion * changed XProviers to use XPredicates * Removed NoMatchException * Removed unneeded BitMap funcs Moves isSparse() to Shape. * fixed checkstyle issues * Fixed javadoc errors * simplified parameter in BitMapProducer.fromIndexProducer * fixed tests * added BitMapping verification * Added more tests * Added more tests * Fixed typos * Changes requested by aherbert * fixed "bit map" in documentation * Renamed tests * Removed blank lines * changed new X<foo> to new X<> * updated documentation * Added BloomFilter.copy() * changed ArrayCountingBloomFilter to use copy() method * cleaned up numberOfBitsMaps() * added asBitMapArray() and makePredicate() to BitMapProducer * Moved asIndexArray() to IndexProducer * harmonized Simple and Sparse Bloom filter constructors * Implemented AbstractCountingBloomFilter.asindexArray() * updated documentation * fixed up NullHasher * implemented hasher filter * Fixed style issues * added default SimpleHasher increment. * Added modulus calculation to SimpleHasher * fixed Hashing issues * moved hasher/filter/* to /hasher * moved bloomfilter/hasher to bloomfilter * fixed up checkstyle issues * Made Filter -> IndexFilter -w- factory * moved IndexFilter into Hasher * updated hashing tests & fixed checksyle * removed SingleItemhasherCollection as associated methods * fixed javadoc issues * fixed javadoc issues * added checks for BitMapProducer limits and index limits * updated tests * added tests * fixed checkstyle issues * fixed formatting and test coverage * fixed javadoc issue * put back checkstyle.xml * switched to forEachBitMapPair * updated BitMap and Index array production * fixed merge with BitMapProducer * Cleaned up formatting * fixed checkstyle issues * fixed coding issues * updated documentation * simplified test * removed unwanted merge files * removed duplicate entry * put back test that incorrectly removed * fixed asIndexArray error * fixed checkstyle errors * Changes for last review

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.1.3 to 2.2.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](ossf/scorecard-action@80e868c...08b4669) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [guava-testlib](https://github.com/google/guava) from 32.0.1-jre to 32.1.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava-testlib dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [guava-testlib](https://github.com/google/guava) from 32.1.0-jre to 32.1.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava-testlib dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

OrderedPropertiesFactory

Passes locally, fails on GHA

* Make AbstractPatriciaTrie public * Added javadocs

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.11.0...v3.12.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dicate) (apache#409) resolves grammar and punctuation issues

…ache#411) Bumps [com.google.guava:guava-testlib](https://github.com/google/guava) from 32.1.1-jre to 32.1.2-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava-testlib dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

apache#404, apache#405, apache#441. Bump com.google.guava:guava-testlib from 32.1.1-jre to 32.1.2-jre apache#411

…s_795 # Conflicts: # src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java

anantdamle · 2023-08-14T12:23:02Z

Closing this as rebase to master created 100s of commits polluting the PR.
Created a fresh PR #412 with updates to Junit5

garydgregory reviewed May 26, 2021

View reviewed changes

kinow reviewed May 26, 2021

View reviewed changes

src/test/java/org/apache/commons/collections4/iterators/ZippedTupleIteratorTest.java Outdated Show resolved Hide resolved

garydgregory requested changes Jun 1, 2021

View reviewed changes

garydgregory requested changes Jun 3, 2021

View reviewed changes

src/main/java/org/apache/commons/collections4/IteratorUtils.java Outdated Show resolved Hide resolved

src/main/java/org/apache/commons/collections4/IterableUtils.java Show resolved Hide resolved

src/main/java/org/apache/commons/collections4/IterableUtils.java Show resolved Hide resolved

anantdamle requested review from garydgregory and kinow June 11, 2021 02:33

garydgregory and others added 8 commits August 14, 2023 19:25

Use java.lang.Objects#equals; eliminate a couple of nulls apache#307

afa8fe8

Replace JUnit 3/4 @ignore with JUnit 5 @disabled

8aa1cd4

[COLLECTIONS-811] Integrate Guava Testlib tests for Apache Commons Co…

2a6308e

…llections (apache#301) * [COLLECTIONS-811] Integrate Guava Testlib tests for Apache Commons Collections * [COLLECTIONS-811] Add tests for Lists too, thanks to @ben-manes

Bump actions/cache from 3.0.3 to 3.0.4

61d87b9

Remove obsolete Maven profile

cf3fb3d

Fix and update site build (except jdepend/site broken compatibility)

a22a2b9

dependabot bot and others added 26 commits August 14, 2023 19:26

Bump guava-testlib from 32.0.1-jre to 32.1.0-jre apache#404

9fec5f4

Throw a RuntimeException subclass instead of RuntimeException

08fa869

Throw a RuntimeException subclass instead of an Error

37a1dc2

Bump guava-testlib from 32.1.0-jre to 32.1.1-jre apache#405

fac9baa

Add missing entry

b459495

Add org.apache.commons.collections4.properties.OrderedProperties and

170a776

OrderedPropertiesFactory

Support entrySet() and forEach()

46a364d

Disable testToString for now

b88df81

Passes locally, fails on GHA

Must override toString() for Java 17

4104913

Remove unused import

21e2208

Make AbstractPatriciaTrie public (apache#407)

782d3bb

* Make AbstractPatriciaTrie public * Added javadocs

Make AbstractPatriciaTrie public apache#407

c91927a

Bump commons-parent from 58 to 59

cd33766

Bump commons-lang3 from 3.12.0 to 3.13.0

6d765ac

Bump commons-lang3 from 3.12.0 to 3.13.0

f12c3af

fixes misplaced symbols in javadoc (mainly in Hasher, CountingLongPre…

b6e7ac2

…dicate) (apache#409) resolves grammar and punctuation issues

Fix punctuation and minor Javadoc issues apache#409

23ce3d3

(doc) Fix grammatical error in Javadoc

a30ac76

Bump guava-testlib from 31.1-jre to 32.1.2-jre apache#394, apache#395,

e7b796d

apache#404, apache#405, apache#441. Bump com.google.guava:guava-testlib from 32.1.1-jre to 32.1.2-jre apache#411

Fix JUNIT-5 update on master

45af3cc

Merge remote-tracking branch 'origin/collections_795' into collection…

dd42aa7

…s_795 # Conflicts: # src/test/java/org/apache/commons/collections4/iterators/PairedIteratorTest.java

anantdamle mentioned this pull request Aug 14, 2023

[COLLECTIONS-795] Add PairedIterator to allow iterating over different-types of iterators #412

Open

anantdamle closed this Aug 14, 2023

anantdamle deleted the collections_795 branch August 14, 2023 12:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[COLLECTIONS-795] Add a new Iterator to allowing zipping over two iterators of different types #238

[COLLECTIONS-795] Add a new Iterator to allowing zipping over two iterators of different types #238

anantdamle commented May 26, 2021

garydgregory May 26, 2021

kinow May 26, 2021

garydgregory May 26, 2021

kinow May 26, 2021

anantdamle May 27, 2021

anantdamle commented May 27, 2021

XenoAmess commented May 28, 2021

kinow commented May 28, 2021 •

edited

anantdamle commented May 29, 2021 •

edited

coveralls commented May 29, 2021 •

edited

anantdamle commented May 29, 2021

anantdamle commented Jun 1, 2021

garydgregory left a comment

garydgregory Jun 1, 2021

anantdamle Jun 2, 2021 •

edited

garydgregory Jun 1, 2021

anantdamle Jun 2, 2021 •

edited

garydgregory left a comment

anantdamle commented Jun 4, 2021 •

edited

anantdamle commented Jun 10, 2021

anantdamle commented Jun 16, 2021

anantdamle commented Jun 18, 2021

garydgregory commented Jun 18, 2021

anantdamle commented Aug 3, 2021

garydgregory commented Aug 3, 2021

garydgregory commented Aug 3, 2021

anantdamle commented Jan 21, 2022

anantdamle commented Aug 14, 2023

[COLLECTIONS-795] Add a new Iterator to allowing zipping over two iterators of different types #238

[COLLECTIONS-795] Add a new Iterator to allowing zipping over two iterators of different types #238

Conversation

anantdamle commented May 26, 2021

garydgregory May 26, 2021

Choose a reason for hiding this comment

kinow May 26, 2021

Choose a reason for hiding this comment

garydgregory May 26, 2021

Choose a reason for hiding this comment

kinow May 26, 2021

Choose a reason for hiding this comment

anantdamle May 27, 2021

Choose a reason for hiding this comment

anantdamle commented May 27, 2021

XenoAmess commented May 28, 2021

kinow commented May 28, 2021 • edited

anantdamle commented May 29, 2021 • edited

coveralls commented May 29, 2021 • edited

anantdamle commented May 29, 2021

anantdamle commented Jun 1, 2021

garydgregory left a comment

Choose a reason for hiding this comment

garydgregory Jun 1, 2021

Choose a reason for hiding this comment

anantdamle Jun 2, 2021 • edited

Choose a reason for hiding this comment

garydgregory Jun 1, 2021

Choose a reason for hiding this comment

anantdamle Jun 2, 2021 • edited

Choose a reason for hiding this comment

garydgregory left a comment

Choose a reason for hiding this comment

anantdamle commented Jun 4, 2021 • edited

anantdamle commented Jun 10, 2021

anantdamle commented Jun 16, 2021

anantdamle commented Jun 18, 2021

garydgregory commented Jun 18, 2021

anantdamle commented Aug 3, 2021

garydgregory commented Aug 3, 2021

garydgregory commented Aug 3, 2021

anantdamle commented Jan 21, 2022

anantdamle commented Aug 14, 2023

kinow commented May 28, 2021 •

edited

anantdamle commented May 29, 2021 •

edited

coveralls commented May 29, 2021 •

edited

anantdamle Jun 2, 2021 •

edited

anantdamle Jun 2, 2021 •

edited

anantdamle commented Jun 4, 2021 •

edited