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

MINOR: Fix class comparison in `AlterConfigPolicy.RequestMetadata.equals()` (#11900) 

This patch fixes a bug in the `AlterConfigPolicy.RequestMetadata.equals` method where we were not comparing the class correctly.

Co-authored-by: David Jacot <djacot@confluent.io>

Reviewers: David Jacot <djacot@confluent.io>
This commit is contained in:
Idan Kamara 2022-03-22 10:45:04 +02:00 committed by GitHub
parent be4ef3df42
commit eddb98df67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
checkstyle/import-control.xml
View File

@ -310,6 +310,9 @@
<subpackage name="server">
<allow pkg="org.apache.kafka.common" />
<!-- This is required to make AlterConfigPolicyTest work. -->
<allow pkg="org.apache.kafka.server.policy" />
<subpackage name="common">
<allow pkg="org.apache.kafka.server.common" />
</subpackage>

2
clients/src/main/java/org/apache/kafka/server/policy/AlterConfigPolicy.java
View File

@ -71,7 +71,7 @@ public interface AlterConfigPolicy extends Configurable, AutoCloseable {
@Override
public boolean equals(Object o) {
if (o == null || o.getClass() != o.getClass()) return false;
if ((o == null) || (!o.getClass().equals(getClass()))) return false;
RequestMetadata other = (RequestMetadata) o;
return resource.equals(other.resource) &&
configs.equals(other.configs);

51
clients/src/test/java/org/apache/kafka/server/policy/AlterConfigPolicyTest.java Normal file
View File

@ -0,0 +1,51 @@
/*
* 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.server.policy;
import org.apache.kafka.common.config.ConfigResource;
import org.apache.kafka.common.config.ConfigResource.Type;
import org.apache.kafka.server.policy.AlterConfigPolicy.RequestMetadata;
import org.junit.jupiter.api.Test;
import java.util.Collections;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class AlterConfigPolicyTest {
@Test
public void testRequestMetadataEquals() {
RequestMetadata requestMetadata = new RequestMetadata(
new ConfigResource(Type.BROKER, "0"),
Collections.singletonMap("foo", "bar")
);
assertEquals(requestMetadata, requestMetadata);
assertNotEquals(requestMetadata, null);
assertNotEquals(requestMetadata, new Object());
assertNotEquals(requestMetadata, new RequestMetadata(
new ConfigResource(Type.BROKER, "1"),
Collections.singletonMap("foo", "bar")
));
assertNotEquals(requestMetadata, new RequestMetadata(
new ConfigResource(Type.BROKER, "0"),
Collections.emptyMap()
));
}
}