Merge branch 'trunk' into KAFKA-17668

apache · Jan 19, 2025 · 83d61d2 · 83d61d2
2 parents 80cbd3d + bb3944c
commit 83d61d2
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 372 deletions.
diff --git a/core/src/main/scala/kafka/zookeeper/ZooKeeperClient.scala b/core/src/main/scala/kafka/zookeeper/ZooKeeperClient.scala
diff --git a/core/src/test/scala/unit/kafka/security/authorizer/BaseAuthorizerTest.scala b/core/src/test/scala/unit/kafka/security/authorizer/BaseAuthorizerTest.scala
@@ -20,7 +20,6 @@ package kafka.security.authorizer
 import java.net.InetAddress
 import java.util.UUID
 import kafka.server.KafkaConfig
-import kafka.zookeeper.ZooKeeperClient
 import org.apache.kafka.common.acl.AclOperation.{ALL, READ, WRITE}
 import org.apache.kafka.common.acl.AclPermissionType.{ALLOW, DENY}
 import org.apache.kafka.common.acl.{AccessControlEntry, AccessControlEntryFilter, AclBinding, AclBindingFilter, AclOperation}
@@ -50,7 +49,6 @@ trait BaseAuthorizerTest {
   val requestContext: RequestContext = newRequestContext(principal, InetAddress.getByName("192.168.0.1"))
   val superUserName = "superuser1"
   var config: KafkaConfig = _
-  var zooKeeperClient: ZooKeeperClient = _
   var resource: ResourcePattern = _
 
   @Test