frankvicky commented on code in PR #19804:
URL: https://github.com/apache/kafka/pull/19804#discussion_r2113154732
##########
core/src/test/scala/unit/kafka/cluster/PartitionTest.scala:
##########
@@ -1234,7 +1235,7 @@ class PartitionTest extends AbstractPartitionTest {
.setLeaderEpoch(leaderEpoch + 2)
.setIsr(isr)
.setPartitionEpoch(1)
- .setReplicas(replicas.map(Int.box).asJava)
+ .setReplicas(replicas)
.setIsNew(false)
assertTrue(partition.makeLeader(newLeaderState, offsetCheckpoints,
topicId),
"Expected makeLeader() to return 'leader changed' after makeFollower()")
Review Comment:
Is it possible to change `scala.collection.Iterable` to `java.lang.Iterable`
?
For example: L1263 `createRecords` L1272 `createIdempotentRecords` L1285
`createTransactionalRecords`
##########
core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala:
##########
@@ -26,92 +26,92 @@ import scala.jdk.CollectionConverters._
object AssignmentStateTest {
import AbstractPartitionTest._
- def parameters: java.util.stream.Stream[Arguments] = Seq[Arguments](
+ def parameters: java.util.stream.Stream[Arguments] =
java.util.List.of[Arguments](
Review Comment:
Could we import `java.util` ?
##########
core/src/test/scala/unit/kafka/integration/UncleanLeaderElectionTest.scala:
##########
@@ -317,7 +317,7 @@ class UncleanLeaderElectionTest extends QuorumTestHarness {
valueDeserializer = new StringDeserializer)
try {
val tp = new TopicPartition(topic, partitionId)
- consumer.assign(Seq(tp).asJava)
+ consumer.assign(java.util.List.of(tp))
Review Comment:
import `java.util`
##########
core/src/test/scala/unit/kafka/metrics/MetricsTest.scala:
##########
@@ -124,7 +124,7 @@ class MetricsTest extends KafkaServerTestHarness with
Logging {
def testUpdateJMXFilter(): Unit = {
// verify previously exposed metrics are removed and existing matching
metrics are added
brokers.foreach(broker => broker.kafkaYammerMetrics.reconfigure(
- Map(JmxReporter.EXCLUDE_CONFIG ->
"kafka.controller:type=KafkaController,name=ActiveControllerCount").asJava
+ java.util.Map.of(JmxReporter.EXCLUDE_CONFIG,
"kafka.controller:type=KafkaController,name=ActiveControllerCount")
Review Comment:
import java.util
##########
core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala:
##########
@@ -364,7 +364,7 @@ abstract class KafkaServerTestHarness extends
QuorumTestHarness {
def changeClientIdConfig(sanitizedClientId: String, configs: Properties):
Unit = {
Using.resource(createAdminClient(brokers, listenerName)) {
admin => {
- admin.alterClientQuotas(Collections.singleton(
+ admin.alterClientQuotas(util.Set.of(
new ClientQuotaAlteration(
new ClientQuotaEntity(Map(ClientQuotaEntity.CLIENT_ID -> (if
(sanitizedClientId == "<default>") null else sanitizedClientId)).asJava),
Review Comment:
Could it be `java.util.Map.of` ?
##########
core/src/test/scala/unit/kafka/coordinator/transaction/TransactionStateManagerTest.scala:
##########
@@ -73,7 +72,7 @@ class TransactionStateManagerTest {
when(metadataCache.features()).thenReturn {
new FinalizedFeatures(
MetadataVersion.latestTesting(),
- Collections.singletonMap(TransactionVersion.FEATURE_NAME,
TransactionVersion.TV_2.featureLevel()),
+ java.util.Map.of(TransactionVersion.FEATURE_NAME,
TransactionVersion.TV_2.featureLevel()),
Review Comment:
ditto
##########
core/src/test/scala/unit/kafka/coordinator/transaction/TransactionLogTest.scala:
##########
@@ -115,14 +113,14 @@ class TransactionLogTest {
@Test
def testSerializeTransactionLogValueToHighestNonFlexibleVersion(): Unit = {
- val txnTransitMetadata = new TxnTransitMetadata(1, 1, 1, 1, 1, 1000,
TransactionState.COMPLETE_COMMIT, Collections.emptySet(), 500, 500, TV_0)
+ val txnTransitMetadata = new TxnTransitMetadata(1, 1, 1, 1, 1, 1000,
TransactionState.COMPLETE_COMMIT, java.util.Set.of, 500, 500, TV_0)
val txnLogValueBuffer =
ByteBuffer.wrap(TransactionLog.valueToBytes(txnTransitMetadata, TV_0))
assertEquals(0, txnLogValueBuffer.getShort)
}
@Test
def testSerializeTransactionLogValueToFlexibleVersion(): Unit = {
- val txnTransitMetadata = new TxnTransitMetadata(1, 1, 1, 1, 1, 1000,
TransactionState.COMPLETE_COMMIT, Collections.emptySet(), 500, 500, TV_2)
+ val txnTransitMetadata = new TxnTransitMetadata(1, 1, 1, 1, 1, 1000,
TransactionState.COMPLETE_COMMIT, java.util.Set.of, 500, 500, TV_2)
Review Comment:
ditto
##########
core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala:
##########
@@ -87,7 +86,7 @@ class TransactionCoordinatorConcurrencyTest extends
AbstractCoordinatorConcurren
when(metadataCache.features()).thenReturn {
new FinalizedFeatures(
MetadataVersion.latestTesting(),
- Collections.singletonMap(TransactionVersion.FEATURE_NAME,
TransactionVersion.TV_2.featureLevel()),
+ java.util.Map.of(TransactionVersion.FEATURE_NAME,
TransactionVersion.TV_2.featureLevel()),
Review Comment:
ditto
##########
core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala:
##########
@@ -75,8 +74,8 @@ class CoordinatorPartitionWriterTest {
replicaManager
)
- when(replicaManager.getLogConfig(tp)).thenReturn(Some(new
LogConfig(Map.empty.asJava)))
- assertEquals(new LogConfig(Map.empty.asJava),
partitionRecordWriter.config(tp))
+ when(replicaManager.getLogConfig(tp)).thenReturn(Some(new
LogConfig(java.util.Map.of)))
+ assertEquals(new LogConfig(java.util.Map.of),
partitionRecordWriter.config(tp))
Review Comment:
import `java.util`
##########
core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala:
##########
@@ -139,8 +139,8 @@ class PartitionLockTest extends Logging {
def testGetReplicaWithUpdateAssignmentAndIsr(): Unit = {
val active = new AtomicBoolean(true)
val replicaToCheck = 3
- val firstReplicaSet = Seq[Integer](3, 4, 5).asJava
- val secondReplicaSet = Seq[Integer](1, 2, 3).asJava
+ val firstReplicaSet = java.util.List.of[Integer](3, 4, 5)
Review Comment:
ditto
##########
core/src/test/scala/unit/kafka/integration/UncleanLeaderElectionTest.scala:
##########
@@ -411,9 +411,9 @@ class UncleanLeaderElectionTest extends QuorumTestHarness {
private def alterTopicConfigs(adminClient: Admin, topic: String,
topicConfigs: Properties): AlterConfigsResult = {
val configEntries = topicConfigs.asScala.map { case (k, v) => new
ConfigEntry(k, v) }.toList.asJava
- adminClient.incrementalAlterConfigs(Map(new
ConfigResource(ConfigResource.Type.TOPIC, topic) ->
+ adminClient.incrementalAlterConfigs(java.util.Map.of(new
ConfigResource(ConfigResource.Type.TOPIC, topic),
configEntries.asScala.map((e: ConfigEntry) => new AlterConfigOp(e,
AlterConfigOp.OpType.SET)).toSeq
- .asJavaCollection).asJava)
+ .asJavaCollection))
Review Comment:
Could we eliminate asJavaCollection here?
##########
core/src/test/scala/unit/kafka/integration/UncleanLeaderElectionTest.scala:
##########
@@ -411,9 +411,9 @@ class UncleanLeaderElectionTest extends QuorumTestHarness {
private def alterTopicConfigs(adminClient: Admin, topic: String,
topicConfigs: Properties): AlterConfigsResult = {
val configEntries = topicConfigs.asScala.map { case (k, v) => new
ConfigEntry(k, v) }.toList.asJava
Review Comment:
Could we eliminate conversion here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
