(kafka) branch 3.7 updated: MINOR: fix imports in AdminFenceProducersIntegrationTest (#16342)

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jolshan pushed a commit to branch 3.7
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.7 by this push:
     new b4099736f20 MINOR: fix imports in AdminFenceProducersIntegrationTest (#16342)
b4099736f20 is described below

commit b4099736f2083ee7037580eee46ffc15298a782c
Author: Justine Olshan <jo...@confluent.io>
AuthorDate: Fri Jun 14 19:04:21 2024 -0700

    MINOR: fix imports in AdminFenceProducersIntegrationTest (#16342)
    
    * Fix imports as the config files were moved after the 3.7 release.
    
    * MINOR: Add integration tag to AdminFenceProducersIntegrationTest (#16326)
    Add @tag("integration") to AdminFenceProducersIntegrationTest
    Co-authored-by: Edoardo Comar <ec...@uk.ibm.com>
    
    Reviewers: Bill Bejeck <bi...@confluent.io>, Mickael Maison <mi...@gmail.com>, Edoardo Comar <ec...@uk.ibm.com>
---
 .../kafka/admin/AdminFenceProducersIntegrationTest.scala | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/test/scala/integration/kafka/admin/AdminFenceProducersIntegrationTest.scala b/core/src/test/scala/integration/kafka/admin/AdminFenceProducersIntegrationTest.scala
index fdddbd1568e..25e85e10885 100644
--- a/core/src/test/scala/integration/kafka/admin/AdminFenceProducersIntegrationTest.scala
+++ b/core/src/test/scala/integration/kafka/admin/AdminFenceProducersIntegrationTest.scala
@@ -18,14 +18,13 @@
 package integration.kafka.admin
 
 import kafka.api.IntegrationTestHarness
+import kafka.server.KafkaConfig
 import org.apache.kafka.clients.admin._
 import org.apache.kafka.clients.producer.{KafkaProducer, ProducerConfig, ProducerRecord}
 import org.apache.kafka.common.errors.{InvalidProducerEpochException, ProducerFencedException}
 import org.apache.kafka.common.utils.Utils
-import org.apache.kafka.coordinator.transaction.{TransactionLogConfigs, TransactionStateManagerConfigs}
-import org.apache.kafka.server.config.ServerLogConfigs
 import org.junit.jupiter.api.Assertions.{assertInstanceOf, assertThrows, assertTrue, fail}
-import org.junit.jupiter.api.{AfterEach, BeforeEach, TestInfo}
+import org.junit.jupiter.api.{AfterEach, BeforeEach, Tag, TestInfo}
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
@@ -33,6 +32,7 @@ import java.util.concurrent.ExecutionException
 import java.util.{Collections, Properties}
 import scala.collection.Seq
 
+@Tag("integration")
 class AdminFenceProducersIntegrationTest extends IntegrationTestHarness {
   override def brokerCount = 1
 
@@ -57,12 +57,12 @@ class AdminFenceProducersIntegrationTest extends IntegrationTestHarness {
 
   def overridingProps(): Properties = {
     val props = new Properties()
-    props.put(ServerLogConfigs.AUTO_CREATE_TOPICS_ENABLE_CONFIG, false.toString)
+    props.put(KafkaConfig.AutoCreateTopicsEnableProp, false.toString)
     // Set a smaller value for the number of partitions for speed
-    props.put(TransactionLogConfigs.TRANSACTIONS_TOPIC_PARTITIONS_CONFIG, 1.toString)
-    props.put(TransactionLogConfigs.TRANSACTIONS_TOPIC_REPLICATION_FACTOR_CONFIG, 1.toString)
-    props.put(TransactionLogConfigs.TRANSACTIONS_TOPIC_MIN_ISR_CONFIG, 1.toString)
-    props.put(TransactionStateManagerConfigs.TRANSACTIONS_ABORT_TIMED_OUT_TRANSACTION_CLEANUP_INTERVAL_MS_CONFIG, "2000")
+    props.put(KafkaConfig.TransactionsTopicPartitionsProp, 1.toString)
+    props.put(KafkaConfig.TransactionsTopicReplicationFactorProp, 1.toString)
+    props.put(KafkaConfig.TransactionsTopicMinISRProp, 1.toString)
+    props.put(KafkaConfig.TransactionsAbortTimedOutTransactionCleanupIntervalMsProp, "2000")
     props
   }