This is an automated email from the ASF dual-hosted git repository. mjsax pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push: new b22bbd656c6 MINOR: cleanup internal Iterator impl (#14889) b22bbd656c6 is described below commit b22bbd656c6fd5784417c92bbc4652672ff554bc Author: Matthias J. Sax <matth...@confluent.io> AuthorDate: Fri Dec 1 11:53:07 2023 -0800 MINOR: cleanup internal Iterator impl (#14889) makeNext() is internal and visibility should not be extended to `public` Reviewers: Walker Carlson <wcarl...@confluent.io> --- .../main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java | 2 +- .../main/java/org/apache/kafka/common/utils/FlattenedIterator.java | 2 +- .../test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java | 2 +- .../java/org/apache/kafka/streams/state/internals/ListValueStore.java | 2 +- .../apache/kafka/streams/state/internals/RocksDBRangeIterator.java | 2 +- .../apache/kafka/streams/state/internals/RocksDBTimestampedStore.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java index 92390e91907..17ad8123e2d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java @@ -104,7 +104,7 @@ public class ConsumerRecords<K, V> implements Iterable<ConsumerRecord<K, V>> { Iterator<? extends Iterable<ConsumerRecord<K, V>>> iters = iterables.iterator(); Iterator<ConsumerRecord<K, V>> current; - public ConsumerRecord<K, V> makeNext() { + protected ConsumerRecord<K, V> makeNext() { while (current == null || !current.hasNext()) { if (iters.hasNext()) current = iters.next().iterator(); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/FlattenedIterator.java b/clients/src/main/java/org/apache/kafka/common/utils/FlattenedIterator.java index 48bf3b7199e..4e28bb35c66 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/FlattenedIterator.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/FlattenedIterator.java @@ -33,7 +33,7 @@ public final class FlattenedIterator<O, I> extends AbstractIterator<I> { } @Override - public I makeNext() { + protected I makeNext() { while (innerIterator == null || !innerIterator.hasNext()) { if (outerIterator.hasNext()) innerIterator = innerIteratorFunction.apply(outerIterator.next()); diff --git a/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java b/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java index 939b2f6daa2..5f3ca4ddf0d 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java @@ -61,7 +61,7 @@ public class AbstractIteratorTest { this.list = l; } - public T makeNext() { + protected T makeNext() { if (position < list.size()) return list.get(position++); else diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java index 13e8997518b..628bfedc42f 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java @@ -143,7 +143,7 @@ public class ListValueStore } @Override - public KeyValue<Bytes, byte[]> makeNext() { + protected KeyValue<Bytes, byte[]> makeNext() { while (currList.isEmpty() && bytesIterator.hasNext()) { final KeyValue<Bytes, byte[]> next = bytesIterator.next(); nextKey = next.key; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBRangeIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBRangeIterator.java index f16ed084423..64aaff05ca3 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBRangeIterator.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBRangeIterator.java @@ -58,7 +58,7 @@ class RocksDBRangeIterator extends RocksDbIterator { } @Override - public KeyValue<Bytes, byte[]> makeNext() { + protected KeyValue<Bytes, byte[]> makeNext() { final KeyValue<Bytes, byte[]> next = super.makeNext(); if (next == null) { return allDone(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java index d2876c63f5b..ea940ca8fb6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java @@ -324,7 +324,7 @@ public class RocksDBTimestampedStore extends RocksDBStore implements Timestamped } @Override - public KeyValue<Bytes, byte[]> makeNext() { + protected KeyValue<Bytes, byte[]> makeNext() { if (nextNoTimestamp == null && iterNoTimestamp.isValid()) { nextNoTimestamp = iterNoTimestamp.key(); } @@ -448,7 +448,7 @@ public class RocksDBTimestampedStore extends RocksDBStore implements Timestamped } @Override - public KeyValue<Bytes, byte[]> makeNext() { + protected KeyValue<Bytes, byte[]> makeNext() { final KeyValue<Bytes, byte[]> next = super.makeNext(); if (next == null) {