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 5b8319e6c2a KAFKA-18399 Remove ZooKeeper from KafkaApis (11/N): CREATE_ACLS and DELETE_ACLS (#18540) 5b8319e6c2a is described below commit 5b8319e6c2a488c1da191ec083bdb240088f0785 Author: Ted Yan <tedy...@hotmail.com> AuthorDate: Wed Jan 15 04:46:50 2025 -0600 KAFKA-18399 Remove ZooKeeper from KafkaApis (11/N): CREATE_ACLS and DELETE_ACLS (#18540) Reviewers: Chia-Ping Tsai <chia7...@gmail.com> --- core/src/main/scala/kafka/server/KafkaApis.scala | 10 -------- .../scala/unit/kafka/server/KafkaApisTest.scala | 28 ---------------------- 2 files changed, 38 deletions(-) diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala b/core/src/main/scala/kafka/server/KafkaApis.scala index 32362913b46..135e418a3fa 100644 --- a/core/src/main/scala/kafka/server/KafkaApis.scala +++ b/core/src/main/scala/kafka/server/KafkaApis.scala @@ -2055,16 +2055,6 @@ class KafkaApis(val requestChannel: RequestChannel, aclApis.handleDescribeAcls(request) } - def handleCreateAcls(request: RequestChannel.Request): Unit = { - metadataSupport.requireZkOrThrow(KafkaApis.shouldAlwaysForward(request)) - aclApis.handleCreateAcls(request) - } - - def handleDeleteAcls(request: RequestChannel.Request): Unit = { - metadataSupport.requireZkOrThrow(KafkaApis.shouldAlwaysForward(request)) - aclApis.handleDeleteAcls(request) - } - def handleOffsetForLeaderEpochRequest(request: RequestChannel.Request): Unit = { val offsetForLeaderEpoch = request.body[OffsetsForLeaderEpochRequest] val topics = offsetForLeaderEpoch.data.topics.asScala.toSeq diff --git a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala index d4cad343c04..a19e1a4296c 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala @@ -9773,34 +9773,6 @@ class KafkaApisTest extends Logging { assertEquals("Ongoing", transactionState.transactionState) } - private def createMockRequest(): RequestChannel.Request = { - val request: RequestChannel.Request = mock(classOf[RequestChannel.Request]) - val requestHeader: RequestHeader = mock(classOf[RequestHeader]) - when(request.header).thenReturn(requestHeader) - when(requestHeader.apiKey()).thenReturn(ApiKeys.values().head) - request - } - - private def verifyShouldAlwaysForwardErrorMessage(handler: RequestChannel.Request => Unit): Unit = { - val request = createMockRequest() - val e = assertThrows(classOf[UnsupportedVersionException], () => handler(request)) - assertEquals(KafkaApis.shouldAlwaysForward(request).getMessage, e.getMessage) - } - - @Test - def testRaftShouldAlwaysForwardCreateAcls(): Unit = { - metadataCache = MetadataCache.kRaftMetadataCache(brokerId, () => KRaftVersion.KRAFT_VERSION_0) - kafkaApis = createKafkaApis(raftSupport = true) - verifyShouldAlwaysForwardErrorMessage(kafkaApis.handleCreateAcls) - } - - @Test - def testRaftShouldAlwaysForwardDeleteAcls(): Unit = { - metadataCache = MetadataCache.kRaftMetadataCache(brokerId, () => KRaftVersion.KRAFT_VERSION_0) - kafkaApis = createKafkaApis(raftSupport = true) - verifyShouldAlwaysForwardErrorMessage(kafkaApis.handleDeleteAcls) - } - @Test def testEmptyLegacyAlterConfigsRequestWithKRaft(): Unit = { val request = buildRequest(new AlterConfigsRequest(new AlterConfigsRequestData(), 1.toShort))