Skip to content

Commit 2299a06

Browse files
authored
KAFKA-20297: Move AbstractIterator, CircularIterator, CloseableIterator... into internal (apache#22052)
We have exposed several classes in org.apache.kafka.common.utils as public APIs, which can be misleading since not all classes in this package are intended for external use. To clarify API boundaries and prevent unintended usage, we propose moving the following classes to an internal package: - AbstractIterator - CircularIterator - CloseableIterator - CopyOnWriteMap - FixedOrderMap - PrimitiveRef Reviewers: Christo <lolovc@amazon.com>, PoAn Yang <payang@apache.org>
1 parent e08a150 commit 2299a06

49 files changed

Lines changed: 58 additions & 57 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.apache.kafka.clients.consumer;
1818

1919
import org.apache.kafka.common.TopicPartition;
20-
import org.apache.kafka.common.utils.AbstractIterator;
20+
import org.apache.kafka.common.utils.internals.AbstractIterator;
2121

2222
import java.util.ArrayList;
2323
import java.util.Collections;

clients/src/main/java/org/apache/kafka/clients/consumer/RoundRobinAssignor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignor;
2020
import org.apache.kafka.common.TopicPartition;
21-
import org.apache.kafka.common.utils.CircularIterator;
2221
import org.apache.kafka.common.utils.Utils;
22+
import org.apache.kafka.common.utils.internals.CircularIterator;
2323

2424
import java.util.ArrayList;
2525
import java.util.HashMap;

clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.apache.kafka.common.requests.FetchResponse;
3636
import org.apache.kafka.common.serialization.Deserializer;
3737
import org.apache.kafka.common.utils.BufferSupplier;
38-
import org.apache.kafka.common.utils.CloseableIterator;
38+
import org.apache.kafka.common.utils.internals.CloseableIterator;
3939

4040
import org.slf4j.Logger;
4141

clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.apache.kafka.common.requests.ShareFetchResponse;
3535
import org.apache.kafka.common.serialization.Deserializer;
3636
import org.apache.kafka.common.utils.BufferSupplier;
37-
import org.apache.kafka.common.utils.CloseableIterator;
3837
import org.apache.kafka.common.utils.LogContext;
38+
import org.apache.kafka.common.utils.internals.CloseableIterator;
3939

4040
import org.slf4j.Logger;
4141

clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import org.apache.kafka.common.record.internal.MemoryRecordsBuilder;
3636
import org.apache.kafka.common.record.internal.Record;
3737
import org.apache.kafka.common.record.internal.RecordBatch;
38-
import org.apache.kafka.common.utils.CopyOnWriteMap;
3938
import org.apache.kafka.common.utils.LogContext;
4039
import org.apache.kafka.common.utils.ProducerIdAndEpoch;
4140
import org.apache.kafka.common.utils.Time;
41+
import org.apache.kafka.common.utils.internals.CopyOnWriteMap;
4242
import org.apache.kafka.common.utils.internals.ExponentialBackoff;
4343

4444
import org.slf4j.Logger;

clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.kafka.common.TopicPartition;
2121
import org.apache.kafka.common.record.internal.DefaultRecordBatch;
2222
import org.apache.kafka.common.requests.ProduceResponse;
23-
import org.apache.kafka.common.utils.PrimitiveRef;
2423
import org.apache.kafka.common.utils.ProducerIdAndEpoch;
24+
import org.apache.kafka.common.utils.internals.PrimitiveRef;
2525

2626
import java.util.Comparator;
2727
import java.util.OptionalInt;

clients/src/main/java/org/apache/kafka/common/header/internals/RecordHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.kafka.common.header.Header;
2020
import org.apache.kafka.common.header.Headers;
2121
import org.apache.kafka.common.record.internal.Record;
22-
import org.apache.kafka.common.utils.AbstractIterator;
22+
import org.apache.kafka.common.utils.internals.AbstractIterator;
2323

2424
import java.util.ArrayList;
2525
import java.util.Arrays;

clients/src/main/java/org/apache/kafka/common/record/internal/AbstractLegacyRecordBatch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import org.apache.kafka.common.errors.CorruptRecordException;
2323
import org.apache.kafka.common.header.Header;
2424
import org.apache.kafka.common.record.TimestampType;
25-
import org.apache.kafka.common.utils.AbstractIterator;
2625
import org.apache.kafka.common.utils.BufferSupplier;
2726
import org.apache.kafka.common.utils.ByteBufferOutputStream;
28-
import org.apache.kafka.common.utils.CloseableIterator;
2927
import org.apache.kafka.common.utils.Utils;
28+
import org.apache.kafka.common.utils.internals.AbstractIterator;
3029
import org.apache.kafka.common.utils.internals.ByteUtils;
30+
import org.apache.kafka.common.utils.internals.CloseableIterator;
3131

3232
import java.io.DataOutputStream;
3333
import java.io.IOException;

clients/src/main/java/org/apache/kafka/common/record/internal/AbstractRecords.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.apache.kafka.common.record.internal;
1818

1919
import org.apache.kafka.common.header.Header;
20-
import org.apache.kafka.common.utils.AbstractIterator;
2120
import org.apache.kafka.common.utils.Utils;
21+
import org.apache.kafka.common.utils.internals.AbstractIterator;
2222

2323
import java.nio.ByteBuffer;
2424
import java.util.Iterator;

clients/src/main/java/org/apache/kafka/common/record/internal/DefaultRecordBatch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.apache.kafka.common.record.TimestampType;
2525
import org.apache.kafka.common.utils.BufferSupplier;
2626
import org.apache.kafka.common.utils.ByteBufferOutputStream;
27-
import org.apache.kafka.common.utils.CloseableIterator;
2827
import org.apache.kafka.common.utils.Crc32C;
2928
import org.apache.kafka.common.utils.internals.ByteUtils;
29+
import org.apache.kafka.common.utils.internals.CloseableIterator;
3030

3131
import java.io.IOException;
3232
import java.io.InputStream;

0 commit comments

Comments
 (0)