diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala b/core/src/main/scala/kafka/server/KafkaApis.scala index 318ca8f4263f1..b1e7c2bf429da 100644 --- a/core/src/main/scala/kafka/server/KafkaApis.scala +++ b/core/src/main/scala/kafka/server/KafkaApis.scala @@ -2058,16 +2058,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 34b1d7cd27436..65e7ec27494a0 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala @@ -9881,34 +9881,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))