You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ch...@apache.org on 2024/10/14 09:13:27 UTC
(kafka) branch trunk updated: KAFKA-17746 Replace JavaConverters with CollectionConverters (#17451)
This is an automated email from the ASF dual-hosted git repository.
chia7712 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 76a1af984b3 KAFKA-17746 Replace JavaConverters with CollectionConverters (#17451)
76a1af984b3 is described below
commit 76a1af984b39d9890fe26954aff36bb1a321af77
Author: Linsiyuan9 <15...@users.noreply.github.com>
AuthorDate: Mon Oct 14 17:13:20 2024 +0800
KAFKA-17746 Replace JavaConverters with CollectionConverters (#17451)
Reviewers: Chia-Ping Tsai <ch...@gmail.com>
---
checkstyle/import-control.xml | 1 +
.../java/kafka/log/remote/RemoteLogManager.java | 4 ++--
.../main/java/kafka/server/TierStateMachine.java | 4 ++--
.../kafka/server/builders/LogManagerBuilder.java | 7 +++---
.../DescribeTopicPartitionsRequestHandler.java | 6 ++---
core/src/test/java/kafka/admin/AclCommandTest.java | 8 +++----
.../kafka/log/remote/RemoteLogManagerTest.java | 28 +++++++++++-----------
.../java/kafka/test/api/ShareConsumerTest.java | 3 +--
.../apache/kafka/jmh/server/CheckpointBench.java | 9 ++++---
.../kafka/jmh/server/PartitionCreationBench.java | 7 +++---
.../tiered/storage/TieredStorageTestContext.java | 5 ++--
.../tiered/storage/TieredStorageTestHarness.java | 16 +++++--------
.../TransactionsWithTieredStoreTest.java | 17 ++++++-------
.../kafka/tools/LeaderElectionCommandTest.java | 21 ++++++++--------
.../consumer/group/AuthorizerIntegrationTest.java | 5 ++--
.../SaslClientsWithInvalidCredentialsTest.java | 7 +++---
.../tools/other/ReplicationQuotasTestRig.java | 9 ++++---
17 files changed, 70 insertions(+), 87 deletions(-)
diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
index 91cdca970ac..9cb08778db1 100644
--- a/checkstyle/import-control.xml
+++ b/checkstyle/import-control.xml
@@ -310,6 +310,7 @@
<allow pkg="javax.rmi.ssl"/>
<allow pkg="kafka.utils" />
<allow pkg="scala.collection" />
+ <allow pkg="scala.jdk.javaapi" />
<allow pkg="org.apache.kafka.coordinator.transaction" />
<allow pkg="org.apache.kafka.coordinator.group" />
<allow pkg="org.apache.kafka.tools" />
diff --git a/core/src/main/java/kafka/log/remote/RemoteLogManager.java b/core/src/main/java/kafka/log/remote/RemoteLogManager.java
index 094a2bf030e..7f3b23a4ead 100644
--- a/core/src/main/java/kafka/log/remote/RemoteLogManager.java
+++ b/core/src/main/java/kafka/log/remote/RemoteLogManager.java
@@ -141,7 +141,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import scala.Option;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import scala.util.Either;
import static org.apache.kafka.server.config.ServerLogConfigs.LOG_DIR_CONFIG;
@@ -862,7 +862,7 @@ public class RemoteLogManager implements Closeable {
*/
List<EnrichedLogSegment> candidateLogSegments(UnifiedLog log, Long fromOffset, Long lastStableOffset) {
List<EnrichedLogSegment> candidateLogSegments = new ArrayList<>();
- List<LogSegment> segments = JavaConverters.seqAsJavaList(log.logSegments(fromOffset, Long.MAX_VALUE).toSeq());
+ List<LogSegment> segments = CollectionConverters.asJava(log.logSegments(fromOffset, Long.MAX_VALUE).toSeq());
if (!segments.isEmpty()) {
for (int idx = 1; idx < segments.size(); idx++) {
LogSegment previousSeg = segments.get(idx - 1);
diff --git a/core/src/main/java/kafka/server/TierStateMachine.java b/core/src/main/java/kafka/server/TierStateMachine.java
index a7b1835b0b2..f5f83cb240b 100644
--- a/core/src/main/java/kafka/server/TierStateMachine.java
+++ b/core/src/main/java/kafka/server/TierStateMachine.java
@@ -55,7 +55,7 @@ import java.util.List;
import java.util.Map;
import scala.Option;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.storage.internals.log.LogStartOffsetIncrementReason.LeaderOffsetIncremented;
@@ -135,7 +135,7 @@ public class TierStateMachine {
// Find the end-offset for the epoch earlier to the given epoch from the leader
Map<TopicPartition, OffsetForLeaderEpochRequestData.OffsetForLeaderPartition> partitionsWithEpochs = new HashMap<>();
partitionsWithEpochs.put(partition, new OffsetForLeaderEpochRequestData.OffsetForLeaderPartition().setPartition(partition.partition()).setCurrentLeaderEpoch(currentLeaderEpoch).setLeaderEpoch(previousEpoch));
- Option<OffsetForLeaderEpochResponseData.EpochEndOffset> maybeEpochEndOffset = leader.fetchEpochEndOffsets(JavaConverters.mapAsScalaMap(partitionsWithEpochs)).get(partition);
+ Option<OffsetForLeaderEpochResponseData.EpochEndOffset> maybeEpochEndOffset = leader.fetchEpochEndOffsets(CollectionConverters.asScala(partitionsWithEpochs)).get(partition);
if (maybeEpochEndOffset.isEmpty()) {
throw new KafkaException("No response received for partition: " + partition);
}
diff --git a/core/src/main/java/kafka/server/builders/LogManagerBuilder.java b/core/src/main/java/kafka/server/builders/LogManagerBuilder.java
index 671321cb20f..44711760421 100644
--- a/core/src/main/java/kafka/server/builders/LogManagerBuilder.java
+++ b/core/src/main/java/kafka/server/builders/LogManagerBuilder.java
@@ -34,7 +34,7 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
public class LogManagerBuilder {
@@ -168,9 +168,8 @@ public class LogManagerBuilder {
if (scheduler == null) throw new RuntimeException("you must set scheduler");
if (brokerTopicStats == null) throw new RuntimeException("you must set brokerTopicStats");
if (logDirFailureChannel == null) throw new RuntimeException("you must set logDirFailureChannel");
-
- return new LogManager(JavaConverters.asScalaIteratorConverter(logDirs.iterator()).asScala().toSeq(),
- JavaConverters.asScalaIteratorConverter(initialOfflineDirs.iterator()).asScala().toSeq(),
+ return new LogManager(CollectionConverters.asScala(logDirs).toSeq(),
+ CollectionConverters.asScala(initialOfflineDirs).toSeq(),
configRepository,
initialDefaultConfig,
cleanerConfig,
diff --git a/core/src/main/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandler.java b/core/src/main/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandler.java
index 3e65628e059..bfadde3bfb0 100644
--- a/core/src/main/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandler.java
+++ b/core/src/main/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandler.java
@@ -38,7 +38,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.common.acl.AclOperation.DESCRIBE;
import static org.apache.kafka.common.resource.ResourceType.TOPIC;
@@ -65,7 +65,7 @@ public class DescribeTopicPartitionsRequestHandler {
DescribeTopicPartitionsRequestData.Cursor cursor = request.cursor();
String cursorTopicName = cursor != null ? cursor.topicName() : "";
if (fetchAllTopics) {
- JavaConverters.asJavaCollection(metadataCache.getAllTopics()).forEach(topicName -> {
+ CollectionConverters.asJavaCollection(metadataCache.getAllTopics()).forEach(topicName -> {
if (topicName.compareTo(cursorTopicName) >= 0) {
topics.add(topicName);
}
@@ -105,7 +105,7 @@ public class DescribeTopicPartitionsRequestHandler {
});
DescribeTopicPartitionsResponseData response = metadataCache.getTopicMetadataForDescribeTopicResponse(
- JavaConverters.asScalaIterator(authorizedTopicsStream.iterator()),
+ CollectionConverters.asScala(authorizedTopicsStream.iterator()),
abstractRequest.context().listenerName,
(String topicName) -> topicName.equals(cursorTopicName) ? cursor.partitionIndex() : 0,
Math.max(Math.min(config.maxRequestPartitionSizeLimit(), request.responsePartitionLimit()), 1),
diff --git a/core/src/test/java/kafka/admin/AclCommandTest.java b/core/src/test/java/kafka/admin/AclCommandTest.java
index 8965d3733b7..4f9bfff0f9d 100644
--- a/core/src/test/java/kafka/admin/AclCommandTest.java
+++ b/core/src/test/java/kafka/admin/AclCommandTest.java
@@ -64,7 +64,7 @@ import java.util.stream.Collectors;
import javax.management.InstanceAlreadyExistsException;
import scala.Console;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.common.acl.AccessControlEntryFilter.ANY;
import static org.apache.kafka.common.acl.AclOperation.ALTER;
@@ -605,14 +605,12 @@ public class AclCommandTest {
return new SimpleImmutableEntry<>(outBuf.toString(), errBuf.toString());
}
- @SuppressWarnings("deprecation")
private static <T> scala.collection.immutable.Set<T> asScalaSet(Set<T> javaSet) {
- return JavaConverters.asScalaSet(javaSet).toSet();
+ return CollectionConverters.asScala(javaSet).toSet();
}
- @SuppressWarnings("deprecation")
private static <T> Set<T> asJavaSet(scala.collection.immutable.Set<T> scalaSet) {
- return JavaConverters.setAsJavaSet(scalaSet);
+ return CollectionConverters.asJava(scalaSet);
}
private void assertInitializeInvalidOptionsExitCodeAndMsg(List<String> args, String expectedMsg) {
diff --git a/core/src/test/java/kafka/log/remote/RemoteLogManagerTest.java b/core/src/test/java/kafka/log/remote/RemoteLogManagerTest.java
index 16c626d28d9..d78ee7359c7 100644
--- a/core/src/test/java/kafka/log/remote/RemoteLogManagerTest.java
+++ b/core/src/test/java/kafka/log/remote/RemoteLogManagerTest.java
@@ -132,7 +132,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import scala.Option;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static kafka.log.remote.RemoteLogManager.isRemoteSegmentWithinLeaderEpochs;
import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_COMMON_CLIENT_PREFIX;
@@ -518,7 +518,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -632,7 +632,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -724,7 +724,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -812,7 +812,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -933,7 +933,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -1054,7 +1054,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldestSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldestSegment, olderSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldestSegment, olderSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -1210,7 +1210,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
when(mockLog.producerStateManager()).thenReturn(mockStateManager);
@@ -1279,7 +1279,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
when(mockLog.lastStableOffset()).thenReturn(250L);
// Ensure the metrics for remote write requests/failures is zero before attempt to copy log segment
@@ -1941,7 +1941,7 @@ public class RemoteLogManagerTest {
when(activeSegment.baseOffset()).thenReturn(15L);
when(log.logSegments(5L, Long.MAX_VALUE))
- .thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(segment1, segment2, activeSegment)));
+ .thenReturn(CollectionConverters.asScala(Arrays.asList(segment1, segment2, activeSegment)));
RemoteLogManager.RLMCopyTask task = remoteLogManager.new RLMCopyTask(leaderTopicIdPartition, 128);
List<RemoteLogManager.EnrichedLogSegment> expected =
@@ -1967,7 +1967,7 @@ public class RemoteLogManagerTest {
when(activeSegment.baseOffset()).thenReturn(20L);
when(log.logSegments(5L, Long.MAX_VALUE))
- .thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(segment1, segment2, segment3, activeSegment)));
+ .thenReturn(CollectionConverters.asScala(Arrays.asList(segment1, segment2, segment3, activeSegment)));
RemoteLogManager.RLMCopyTask task = remoteLogManager.new RLMCopyTask(leaderTopicIdPartition, 128);
List<RemoteLogManager.EnrichedLogSegment> expected =
@@ -2257,7 +2257,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
File mockProducerSnapshotIndex = TestUtils.tempFile();
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
@@ -3352,7 +3352,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(oldSegment, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(oldSegment, activeSegment)));
File mockProducerSnapshotIndex = TestUtils.tempFile();
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
@@ -3422,7 +3422,7 @@ public class RemoteLogManagerTest {
when(mockLog.activeSegment()).thenReturn(activeSegment);
when(mockLog.logStartOffset()).thenReturn(oldestSegmentStartOffset);
- when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(JavaConverters.collectionAsScalaIterable(Arrays.asList(segmentToCopy, segmentToThrottle, activeSegment)));
+ when(mockLog.logSegments(anyLong(), anyLong())).thenReturn(CollectionConverters.asScala(Arrays.asList(segmentToCopy, segmentToThrottle, activeSegment)));
File mockProducerSnapshotIndex = TestUtils.tempFile();
ProducerStateManager mockStateManager = mock(ProducerStateManager.class);
diff --git a/core/src/test/java/kafka/test/api/ShareConsumerTest.java b/core/src/test/java/kafka/test/api/ShareConsumerTest.java
index 3de2ff0cad9..fe32014bf7c 100644
--- a/core/src/test/java/kafka/test/api/ShareConsumerTest.java
+++ b/core/src/test/java/kafka/test/api/ShareConsumerTest.java
@@ -91,7 +91,6 @@ import static org.junit.jupiter.api.Assertions.fail;
@Timeout(600)
@Tag("integration")
-@SuppressWarnings("deprecation")
public class ShareConsumerTest {
private KafkaClusterTestKit cluster;
private final TopicPartition tp = new TopicPartition("topic", 0);
@@ -1635,7 +1634,7 @@ public class ShareConsumerTest {
private void warmup() throws InterruptedException, ExecutionException, TimeoutException {
createTopic(warmupTp.topic());
TestUtils.waitForCondition(() ->
- !scala.collection.JavaConverters.seqAsJavaList(cluster.brokers().get(0).metadataCache().getAliveBrokerNodes(new ListenerName("EXTERNAL"))).isEmpty(),
+ !cluster.brokers().get(0).metadataCache().getAliveBrokerNodes(new ListenerName("EXTERNAL")).isEmpty(),
DEFAULT_MAX_WAIT_MS, 100L, () -> "cache not up yet");
ProducerRecord<byte[], byte[]> record = new ProducerRecord<>(warmupTp.topic(), warmupTp.partition(), null, "key".getBytes(), "value".getBytes());
KafkaProducer<byte[], byte[]> producer = createProducer(new ByteArraySerializer(), new ByteArraySerializer());
diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java
index 06d2fe7bade..07b1ecedd08 100644
--- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java
+++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/CheckpointBench.java
@@ -64,7 +64,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import scala.Option;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.server.common.KRaftVersion.KRAFT_VERSION_1;
@@ -98,7 +98,6 @@ public class CheckpointBench {
private AlterPartitionManager alterPartitionManager;
- @SuppressWarnings("deprecation")
@Setup(Level.Trial)
public void setup() {
this.scheduler = new KafkaScheduler(1, true, "scheduler-thread");
@@ -110,8 +109,8 @@ public class CheckpointBench {
this.time = new MockTime();
this.failureChannel = new LogDirFailureChannel(brokerProperties.logDirs().size());
final List<File> files =
- JavaConverters.seqAsJavaList(brokerProperties.logDirs()).stream().map(File::new).collect(Collectors.toList());
- this.logManager = TestUtils.createLogManager(JavaConverters.asScalaBuffer(files),
+ CollectionConverters.asJava(brokerProperties.logDirs()).stream().map(File::new).collect(Collectors.toList());
+ this.logManager = TestUtils.createLogManager(CollectionConverters.asScala(files),
new LogConfig(new Properties()), new MockConfigRepository(), new CleanerConfig(1, 4 * 1024 * 1024L, 0.9d,
1024 * 1024, 32 * 1024 * 1024, Double.MAX_VALUE, 15 * 1000, true), time, MetadataVersion.latestTesting(), 4, false, Option.empty(), false, ServerLogConfigs.LOG_INITIAL_TASK_DELAY_MS_DEFAULT);
scheduler.startup();
@@ -161,7 +160,7 @@ public class CheckpointBench {
this.metrics.close();
this.scheduler.shutdown();
this.quotaManagers.shutdown();
- for (File dir : JavaConverters.asJavaCollection(logManager.liveLogDirs())) {
+ for (File dir : CollectionConverters.asJavaCollection(logManager.liveLogDirs())) {
Utils.delete(dir);
}
}
diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java
index 968fdcb27bf..c04106040a1 100644
--- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java
+++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/server/PartitionCreationBench.java
@@ -69,7 +69,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import scala.Option;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.server.common.KRaftVersion.KRAFT_VERSION_1;
@@ -100,7 +100,6 @@ public class PartitionCreationBench {
private AlterPartitionManager alterPartitionManager;
private List<TopicPartition> topicPartitions;
- @SuppressWarnings("deprecation")
@Setup(Level.Invocation)
public void setup() {
if (useTopicIds)
@@ -118,7 +117,7 @@ public class PartitionCreationBench {
this.failureChannel = new LogDirFailureChannel(brokerProperties.logDirs().size());
final BrokerTopicStats brokerTopicStats = new BrokerTopicStats(false);
final List<File> files =
- JavaConverters.seqAsJavaList(brokerProperties.logDirs()).stream().map(File::new).collect(Collectors.toList());
+ CollectionConverters.asJava(brokerProperties.logDirs()).stream().map(File::new).collect(Collectors.toList());
CleanerConfig cleanerConfig = new CleanerConfig(1,
4 * 1024 * 1024L, 0.9d,
1024 * 1024, 32 * 1024 * 1024,
@@ -170,7 +169,7 @@ public class PartitionCreationBench {
this.metrics.close();
this.scheduler.shutdown();
this.quotaManagers.shutdown();
- for (File dir : JavaConverters.asJavaCollection(logManager.liveLogDirs())) {
+ for (File dir : CollectionConverters.asJava(logManager.liveLogDirs())) {
Utils.delete(dir);
}
}
diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java
index e0fd4fc6ec7..ff61e29d93c 100644
--- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java
+++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java
@@ -68,7 +68,7 @@ import java.util.stream.Collectors;
import scala.Function0;
import scala.Function1;
import scala.Option;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.clients.producer.ProducerConfig.LINGER_MS_CONFIG;
@@ -93,7 +93,6 @@ public final class TieredStorageTestContext implements AutoCloseable {
initContext();
}
- @SuppressWarnings("deprecation")
private void initClients() {
// rediscover the new bootstrap-server port incase of broker restarts
ListenerName listenerName = harness.listenerName();
@@ -108,7 +107,7 @@ public final class TieredStorageTestContext implements AutoCloseable {
producer = harness.createProducer(ser, ser, producerOverrideProps);
consumer = harness.createConsumer(de, de, commonOverrideProps,
- JavaConverters.asScalaBuffer(Collections.<String>emptyList()).toList());
+ CollectionConverters.asScala(Collections.<String>emptyList()).toList());
admin = harness.createAdminClient(listenerName, commonOverrideProps);
}
diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java
index fc21758518b..97feae05654 100644
--- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java
+++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java
@@ -45,8 +45,8 @@ import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
-import scala.collection.JavaConverters;
import scala.collection.Seq;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.STORAGE_WAIT_TIMEOUT_SEC;
import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.createPropsForRemoteStorage;
@@ -62,18 +62,16 @@ public abstract class TieredStorageTestHarness extends IntegrationTestHarness {
private String testClassName = "";
private String storageDirPath = "";
- @SuppressWarnings("deprecation")
@Override
public void modifyConfigs(Seq<Properties> props) {
- for (Properties p : JavaConverters.seqAsJavaList(props)) {
+ for (Properties p : CollectionConverters.asJava(props)) {
p.putAll(overridingProps());
}
}
- @SuppressWarnings("deprecation")
@Override
public Seq<Properties> kraftControllerConfigs(TestInfo testInfo) {
- return JavaConverters.asScalaBuffer(Collections.singletonList(overridingProps())).toSeq();
+ return CollectionConverters.asScala(Collections.singletonList(overridingProps())).toSeq();
}
protected int numRemoteLogMetadataPartitions() {
@@ -130,10 +128,9 @@ public abstract class TieredStorageTestHarness extends IntegrationTestHarness {
}
}
- @SuppressWarnings("deprecation")
public static List<LocalTieredStorage> remoteStorageManagers(Seq<KafkaBroker> brokers) {
List<LocalTieredStorage> storages = new ArrayList<>();
- JavaConverters.seqAsJavaList(brokers).forEach(broker -> {
+ CollectionConverters.asJava(brokers).forEach(broker -> {
if (broker.remoteLogManagerOpt().isDefined()) {
RemoteLogManager remoteLogManager = broker.remoteLogManagerOpt().get();
RemoteStorageManager storageManager = remoteLogManager.storageManager();
@@ -154,10 +151,9 @@ public abstract class TieredStorageTestHarness extends IntegrationTestHarness {
return storages;
}
- @SuppressWarnings("deprecation")
public static List<BrokerLocalStorage> localStorages(Seq<KafkaBroker> brokers) {
- return JavaConverters.seqAsJavaList(brokers).stream()
- .map(b -> new BrokerLocalStorage(b.config().brokerId(), JavaConverters.setAsJavaSet(b.config().logDirs().toSet()),
+ return CollectionConverters.asJava(brokers).stream()
+ .map(b -> new BrokerLocalStorage(b.config().brokerId(), CollectionConverters.asJava(b.config().logDirs().toSet()),
STORAGE_WAIT_TIMEOUT_SEC))
.collect(Collectors.toList());
}
diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java
index 4f8ae1630a8..7d60c55f4f5 100644
--- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java
+++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java
@@ -35,7 +35,7 @@ import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.STORAGE_WAIT_TIMEOUT_SEC;
import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.createPropsForRemoteStorage;
@@ -72,12 +72,11 @@ public class TransactionsWithTieredStoreTest extends TransactionsTest {
return overridingTopicProps;
}
- @SuppressWarnings("deprecation")
@Override
public void maybeWaitForAtLeastOneSegmentUpload(scala.collection.Seq<TopicPartition> topicPartitions) {
- JavaConverters.seqAsJavaList(topicPartitions).forEach(topicPartition -> {
- List<BrokerLocalStorage> localStorages = JavaConverters.bufferAsJavaList(brokers()).stream()
- .map(b -> new BrokerLocalStorage(b.config().brokerId(), JavaConverters.setAsJavaSet(b.config().logDirs().toSet()), STORAGE_WAIT_TIMEOUT_SEC))
+ CollectionConverters.asJava(topicPartitions).forEach(topicPartition -> {
+ List<BrokerLocalStorage> localStorages = CollectionConverters.asJava(brokers()).stream()
+ .map(b -> new BrokerLocalStorage(b.config().brokerId(), CollectionConverters.asJava(b.config().logDirs().toSet()), STORAGE_WAIT_TIMEOUT_SEC))
.collect(Collectors.toList());
localStorages
.stream()
@@ -92,13 +91,12 @@ public class TransactionsWithTieredStoreTest extends TransactionsTest {
});
}
- @SuppressWarnings("deprecation")
@Override
public void maybeVerifyLocalLogStartOffsets(scala.collection.immutable.Map<TopicPartition, Long> partitionLocalStartOffsets) throws InterruptedException {
Map<Integer, Long> offsets = new HashMap<>();
TestUtils.waitForCondition(() ->
- JavaConverters.seqAsJavaList(brokers()).stream().allMatch(broker ->
- JavaConverters.mapAsJavaMapConverter(partitionLocalStartOffsets).asJava()
+ CollectionConverters.asJava(brokers()).stream().allMatch(broker ->
+ CollectionConverters.asJava(partitionLocalStartOffsets)
.entrySet().stream().allMatch(entry -> {
long offset = broker.replicaManager().localLog(entry.getKey()).get().localLogStartOffset();
offsets.put(broker.config().brokerId(), offset);
@@ -107,10 +105,9 @@ public class TransactionsWithTieredStoreTest extends TransactionsTest {
), () -> "local log start offset doesn't change to the expected position:" + partitionLocalStartOffsets + ", current position:" + offsets);
}
- @SuppressWarnings("deprecation")
private boolean isAssignedReplica(TopicPartition topicPartition,
Integer replicaId) {
- Optional<KafkaBroker> brokerOpt = JavaConverters.seqAsJavaList(brokers())
+ Optional<KafkaBroker> brokerOpt = CollectionConverters.asJava(brokers())
.stream()
.filter(b -> b.config().brokerId() == replicaId).findFirst();
boolean isAssigned = false;
diff --git a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
index 5b4ea11bfd7..0b0b2831617 100644
--- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
@@ -51,7 +51,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
@@ -61,7 +61,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@SuppressWarnings("deprecation")
@ExtendWith(value = ClusterTestExtensions.class)
@ClusterTestDefaults(brokers = 3, serverProperties = {
@ClusterConfigProperty(key = "auto.create.topics.enable", value = "false"),
@@ -96,8 +95,8 @@ public class LeaderElectionCommandTest {
TestUtils.assertLeader(client, topicPartition, broker2);
cluster.shutdownBroker(broker3);
TestUtils.waitForBrokersOutOfIsr(client,
- JavaConverters.asScalaBuffer(singletonList(topicPartition)).toSet(),
- JavaConverters.asScalaBuffer(singletonList(broker3)).toSet()
+ CollectionConverters.asScala(singletonList(topicPartition)).toSet(),
+ CollectionConverters.asScala(singletonList(broker3)).toSet()
);
cluster.shutdownBroker(broker2);
TestUtils.assertNoLeader(client, topicPartition);
@@ -152,8 +151,8 @@ public class LeaderElectionCommandTest {
cluster.shutdownBroker(broker3);
TestUtils.waitForBrokersOutOfIsr(client,
- JavaConverters.asScalaBuffer(singletonList(topicPartition)).toSet(),
- JavaConverters.asScalaBuffer(singletonList(broker3)).toSet()
+ CollectionConverters.asScala(singletonList(topicPartition)).toSet(),
+ CollectionConverters.asScala(singletonList(broker3)).toSet()
);
cluster.shutdownBroker(broker2);
TestUtils.assertNoLeader(client, topicPartition);
@@ -189,8 +188,8 @@ public class LeaderElectionCommandTest {
cluster.shutdownBroker(broker3);
TestUtils.waitForBrokersOutOfIsr(client,
- JavaConverters.asScalaBuffer(singletonList(topicPartition)).toSet(),
- JavaConverters.asScalaBuffer(singletonList(broker3)).toSet()
+ CollectionConverters.asScala(singletonList(topicPartition)).toSet(),
+ CollectionConverters.asScala(singletonList(broker3)).toSet()
);
cluster.shutdownBroker(broker2);
TestUtils.assertNoLeader(client, topicPartition);
@@ -229,7 +228,7 @@ public class LeaderElectionCommandTest {
TestUtils.assertLeader(client, topicPartition, broker3);
cluster.startBroker(broker2);
TestUtils.waitForBrokersInIsr(client, topicPartition,
- JavaConverters.asScalaBuffer(singletonList(broker2)).toSet()
+ CollectionConverters.asScala(singletonList(broker2)).toSet()
);
assertEquals(0, LeaderElectionCommand.mainNoExit(
@@ -279,10 +278,10 @@ public class LeaderElectionCommandTest {
TestUtils.assertLeader(client, topicPartition0, broker3);
cluster.startBroker(broker2);
TestUtils.waitForBrokersInIsr(client, topicPartition0,
- JavaConverters.asScalaBuffer(singletonList(broker2)).toSet()
+ CollectionConverters.asScala(singletonList(broker2)).toSet()
);
TestUtils.waitForBrokersInIsr(client, topicPartition1,
- JavaConverters.asScalaBuffer(singletonList(broker2)).toSet()
+ CollectionConverters.asScala(singletonList(broker2)).toSet()
);
Path topicPartitionPath = tempTopicPartitionFile(asList(topicPartition0, topicPartition1));
diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/AuthorizerIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/AuthorizerIntegrationTest.java
index 71ed768973c..1e92e81fad2 100644
--- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/AuthorizerIntegrationTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/AuthorizerIntegrationTest.java
@@ -25,17 +25,16 @@ import org.junit.jupiter.params.provider.ValueSource;
import java.util.Collections;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
import static org.apache.kafka.common.acl.AclOperation.DESCRIBE;
import static org.apache.kafka.common.acl.AclPermissionType.ALLOW;
public class AuthorizerIntegrationTest extends AbstractAuthorizerIntegrationTest {
- @SuppressWarnings({"deprecation"})
@ParameterizedTest
@ValueSource(strings = {"zk", "kraft"})
public void testDescribeGroupCliWithGroupDescribe(String quorum) throws Exception {
- addAndVerifyAcls(JavaConverters.asScalaSet(Collections.singleton(new AccessControlEntry(ClientPrincipal().toString(), "*", DESCRIBE, ALLOW))).toSet(), groupResource());
+ addAndVerifyAcls(CollectionConverters.asScala(Collections.singleton(new AccessControlEntry(ClientPrincipal().toString(), "*", DESCRIBE, ALLOW))).toSet(), groupResource());
String[] cgcArgs = new String[]{"--bootstrap-server", bootstrapServers(listenerName()), "--describe", "--group", group()};
ConsumerGroupCommandOptions opts = ConsumerGroupCommandOptions.fromArgs(cgcArgs);
diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java
index 953609c1c83..19f1922ac6e 100644
--- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java
@@ -42,8 +42,8 @@ import java.util.Properties;
import scala.Option;
import scala.Some$;
-import scala.collection.JavaConverters;
import scala.collection.Seq;
+import scala.jdk.javaapi.CollectionConverters;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -54,15 +54,14 @@ public class SaslClientsWithInvalidCredentialsTest extends AbstractSaslTest {
public static final int NUM_PARTITIONS = 1;
public static final int BROKER_COUNT = 1;
public static final String KAFKA_CLIENT_SASL_MECHANISM = "SCRAM-SHA-256";
- private static final Seq<String> KAFKA_SERVER_SASL_MECHANISMS = JavaConverters.asScalaIteratorConverter(Collections.singletonList(KAFKA_CLIENT_SASL_MECHANISM).iterator()).asScala().toSeq();
+ private static final Seq<String> KAFKA_SERVER_SASL_MECHANISMS = CollectionConverters.asScala(Collections.singletonList(KAFKA_CLIENT_SASL_MECHANISM)).toSeq();
- @SuppressWarnings({"deprecation"})
private Consumer<byte[], byte[]> createConsumer() {
return createConsumer(
new ByteArrayDeserializer(),
new ByteArrayDeserializer(),
new Properties(),
- JavaConverters.asScalaSet(Collections.<String>emptySet()).toList()
+ CollectionConverters.asScala(Collections.<String>emptySet()).toList()
);
}
diff --git a/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java b/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java
index 510c31231a9..64599c688fa 100644
--- a/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java
+++ b/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java
@@ -74,8 +74,8 @@ import java.util.stream.IntStream;
import javax.imageio.ImageIO;
import scala.Option;
-import scala.collection.JavaConverters;
import scala.collection.Seq;
+import scala.jdk.javaapi.CollectionConverters;
import static java.nio.file.StandardOpenOption.APPEND;
import static java.nio.file.StandardOpenOption.CREATE;
@@ -187,7 +187,7 @@ public class ReplicationQuotasTestRig {
super.tearDown();
}
- @SuppressWarnings({"unchecked", "deprecation"})
+ @SuppressWarnings("unchecked")
public void run(ExperimentDef config, Journal journal, boolean displayChartsOnScreen) throws Exception {
experimentName = config.name;
List<Integer> brokers = IntStream.rangeClosed(100, 100 + config.brokers).boxed().collect(Collectors.toList());
@@ -208,7 +208,7 @@ public class ReplicationQuotasTestRig {
));
startBrokers(brokers);
- TestUtils.createTopic(zkClient(), TOPIC_NAME, (scala.collection.Map) JavaConverters.mapAsScalaMap(replicas), seq(servers));
+ TestUtils.createTopic(zkClient(), TOPIC_NAME, (scala.collection.Map) CollectionConverters.asScala(replicas), seq(servers));
System.out.println("Writing Data");
KafkaProducer<byte[], byte[]> producer = createProducer(TestUtils.plaintextBootstrapServers(seq(servers)));
@@ -477,8 +477,7 @@ public class ReplicationQuotasTestRig {
}
}
- @SuppressWarnings({"deprecation"})
private static <T> Seq<T> seq(Collection<T> seq) {
- return JavaConverters.asScalaIteratorConverter(seq.iterator()).asScala().toSeq();
+ return CollectionConverters.asScala(seq).toSeq();
}
}