root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-18803 The acls would appear at the wrong level of the metadata shell "tree" (#18916) 

Reviewers: David Arthur <mumrah@gmail.com>, Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Jhen-Yung Hsu 2025-02-17 03:53:18 +08:00 committed by Chia-Ping Tsai
parent c455c10405
commit 0c288599c5
3 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
metadata/src/main/java/org/apache/kafka/image/AclsImage.java
View File

@ -18,7 +18,7 @@
package org.apache.kafka.image;
import org.apache.kafka.common.Uuid;
import org.apache.kafka.image.node.AclsImageByIdNode;
import org.apache.kafka.image.node.AclsImageNode;
import org.apache.kafka.image.writer.ImageWriter;
import org.apache.kafka.image.writer.ImageWriterOptions;
import org.apache.kafka.metadata.authorizer.StandardAcl;
@ -76,6 +76,6 @@ public final class AclsImage {
@Override
public String toString() {
return new AclsImageByIdNode(this).stringify();
return new AclsImageNode(this).stringify();
}
}

2
metadata/src/main/java/org/apache/kafka/image/node/MetadataImageNode.java
View File

@ -48,7 +48,7 @@ public class MetadataImageNode implements MetadataNode {
children.put(ConfigurationsImageNode.NAME, image -> new ConfigurationsImageNode(image.configs()));
children.put(ClientQuotasImageNode.NAME, image -> new ClientQuotasImageNode(image.clientQuotas()));
children.put(ProducerIdsImageNode.NAME, image -> new ProducerIdsImageNode(image.producerIds()));
children.put(AclsImageNode.NAME, image -> new AclsImageByIdNode(image.acls()));
children.put(AclsImageNode.NAME, image -> new AclsImageNode(image.acls()));
children.put(ScramImageNode.NAME, image -> new ScramImageNode(image.scram()));
children.put(DelegationTokenImageNode.NAME, image -> new DelegationTokenImageNode(image.delegationTokens()));
CHILDREN = Collections.unmodifiableMap(children);

54
metadata/src/test/java/org/apache/kafka/image/node/MetadataImageNodeTest.java Normal file
View File

@ -0,0 +1,54 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.image.node;
import org.apache.kafka.image.AclsImage;
import org.apache.kafka.image.MetadataImage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@Timeout(value = 40)
public class MetadataImageNodeTest {
private MetadataImageNode metadataImageNode;
private MetadataImage mockMetadataImage;
private AclsImage mockAclsImage;
@BeforeEach
public void setup() {
mockMetadataImage = mock(MetadataImage.class);
mockAclsImage = mock(AclsImage.class);
metadataImageNode = new MetadataImageNode(mockMetadataImage);
}
@Test
public void shouldGetAclsImageNode() {
when(mockMetadataImage.acls()).thenReturn(mockAclsImage);
MetadataNode aclsNode = metadataImageNode.child(AclsImageNode.NAME);
assertNotNull(aclsNode);
assertEquals(AclsImageNode.class, aclsNode.getClass());
}
}