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

MINOR: Cleanups in Connect (#20077) 

A few cleanups including Java 17 syntax, collections and assertEquals() order

Reviewers: Luke Chen <showuon@gmail.com>, Ken Huang <s7133700@gmail.com>, Jhen-Yung Hsu <jhenyunghsu@gmail.com>
This commit is contained in:
Mickael Maison 2025-09-03 11:11:57 +02:00 committed by GitHub
parent 4271fd8c8b
commit dd52058466
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 25 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java
View File

@ -57,7 +57,7 @@ public class FileStreamSinkTaskTest {
@Test
public void testPutFlush() {
HashMap<TopicPartition, OffsetAndMetadata> offsets = new HashMap<>();
Map<TopicPartition, OffsetAndMetadata> offsets = new HashMap<>();
final String newLine = System.lineSeparator();
// We do not call task.start() since it would override the output stream

2
connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
View File

@ -152,8 +152,6 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned {
return switch (config.decimalFormat()) {
case NUMERIC -> JSON_NODE_FACTORY.numberNode(decimal);
case BASE64 -> JSON_NODE_FACTORY.binaryNode(Decimal.fromLogical(schema, decimal));
default ->
throw new DataException("Unexpected " + JsonConverterConfig.DECIMAL_FORMAT_CONFIG + ": " + config.decimalFormat());
};
}

2
connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointTask.java
View File

@ -371,7 +371,7 @@ public class MirrorCheckpointTask extends SourceTask {
offsetToSync.put(topicPartition, convertedOffset);
}
if (offsetToSync.size() == 0) {
if (offsetToSync.isEmpty()) {
log.trace("skip syncing the offset for consumer group: {}", consumerGroupId);
continue;
}

2
connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorMaker.java
View File

@ -231,7 +231,7 @@ public class MirrorMaker {
}
private void addHerder(SourceAndTarget sourceAndTarget) {
log.info("creating herder for " + sourceAndTarget.toString());
log.info("creating herder for {}", sourceAndTarget.toString());
Map<String, String> workerProps = config.workerConfig(sourceAndTarget);
String encodedSource = encodePath(sourceAndTarget.source());
String encodedTarget = encodePath(sourceAndTarget.target());

2
connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorMakerConfig.java
View File

@ -277,7 +277,7 @@ public final class MirrorMakerConfig extends AbstractConfig {
return transformed;
}
protected static ConfigDef config() {
private static ConfigDef config() {
ConfigDef result = new ConfigDef()
.define(CLUSTERS_CONFIG, Type.LIST, Importance.HIGH, CLUSTERS_DOC)
.define(ENABLE_INTERNAL_REST_CONFIG, Type.BOOLEAN, false, Importance.HIGH, ENABLE_INTERNAL_REST_DOC)

24
connect/mirror/src/main/java/org/apache/kafka/connect/mirror/OffsetSync.java
View File

@ -25,7 +25,7 @@ import org.apache.kafka.common.protocol.types.Type;
import java.nio.ByteBuffer;
public class OffsetSync {
public record OffsetSync(TopicPartition topicPartition, long upstreamOffset, long downstreamOffset) {
public static final String TOPIC_KEY = "topic";
public static final String PARTITION_KEY = "partition";
public static final String UPSTREAM_OFFSET_KEY = "upstreamOffset";
@ -39,28 +39,6 @@ public class OffsetSync {
new Field(TOPIC_KEY, Type.STRING),
new Field(PARTITION_KEY, Type.INT32));
private final TopicPartition topicPartition;
private final long upstreamOffset;
private final long downstreamOffset;
public OffsetSync(TopicPartition topicPartition, long upstreamOffset, long downstreamOffset) {
this.topicPartition = topicPartition;
this.upstreamOffset = upstreamOffset;
this.downstreamOffset = downstreamOffset;
}
public TopicPartition topicPartition() {
return topicPartition;
}
public long upstreamOffset() {
return upstreamOffset;
}
public long downstreamOffset() {
return downstreamOffset;
}
@Override
public String toString() {
return String.format("OffsetSync{topicPartition=%s, upstreamOffset=%d, downstreamOffset=%d}",

7
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/CheckpointStoreTest.java
View File

@ -24,7 +24,6 @@ import org.apache.kafka.connect.util.Callback;
import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@ -38,8 +37,7 @@ public class CheckpointStoreTest {
@Test
public void testReadCheckpointsTopic() {
Set<String> consumerGroups = new HashSet<>();
consumerGroups.add("group1");
Set<String> consumerGroups = Set.of("group1");
MirrorCheckpointTaskConfig config = mock(MirrorCheckpointTaskConfig.class);
when(config.checkpointsTopic()).thenReturn("checkpoint.topic");
@ -70,8 +68,7 @@ public class CheckpointStoreTest {
@Test
public void testReadCheckpointsTopicError() {
Set<String> consumerGroups = new HashSet<>();
consumerGroups.add("group1");
Set<String> consumerGroups = Set.of("group1");
MirrorCheckpointTaskConfig config = mock(MirrorCheckpointTaskConfig.class);
when(config.checkpointsTopic()).thenReturn("checkpoint.topic");

5
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/MirrorCheckpointConnectorTest.java
View File

@ -26,7 +26,6 @@ import org.apache.kafka.connect.errors.RetriableException;
import org.junit.jupiter.api.Test;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@ -146,7 +145,7 @@ public class MirrorCheckpointConnectorTest {
MirrorCheckpointConnector connector = new MirrorCheckpointConnector(Set.of(), config);
connector = spy(connector);
Collection<GroupListing> groups = List.of(
List<GroupListing> groups = List.of(
new GroupListing("g1", Optional.of(GroupType.CLASSIC), "", Optional.empty()),
new GroupListing("g2", Optional.of(GroupType.CLASSIC), ConsumerProtocol.PROTOCOL_TYPE, Optional.empty()));
Map<TopicPartition, OffsetAndMetadata> offsets = new HashMap<>();
@ -176,7 +175,7 @@ public class MirrorCheckpointConnectorTest {
MirrorCheckpointConnector connector = new MirrorCheckpointConnector(Set.of(), config);
connector = spy(connector);
Collection<GroupListing> groups = List.of(
List<GroupListing> groups = List.of(
new GroupListing("g1", Optional.of(GroupType.CLASSIC), "", Optional.empty()),
new GroupListing("g2", Optional.of(GroupType.CLASSIC), ConsumerProtocol.PROTOCOL_TYPE, Optional.empty()),
new GroupListing("g3", Optional.of(GroupType.CLASSIC), ConsumerProtocol.PROTOCOL_TYPE, Optional.empty()),

6
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java
View File

@ -142,7 +142,7 @@ public class DedicatedMirrorIntegrationTest {
final String ba = b + "->" + a;
final String testTopicPrefix = "test-topic-";
Map<String, String> mmProps = new HashMap<String, String>() {{
Map<String, String> mmProps = new HashMap<>() {{
put("dedicated.mode.enable.internal.rest", "false");
put("listeners", "http://localhost:0");
// Refresh topics very frequently to quickly pick up on topics that are created
@ -204,7 +204,7 @@ public class DedicatedMirrorIntegrationTest {
final String ab = a + "->" + b;
final String testTopicPrefix = "test-topic-";
Map<String, String> mmProps = new HashMap<String, String>() {{
Map<String, String> mmProps = new HashMap<>() {{
put("dedicated.mode.enable.internal.rest", "false");
put("listeners", "http://localhost:0");
// Refresh topics very frequently to quickly pick up on topics that are created
@ -288,7 +288,7 @@ public class DedicatedMirrorIntegrationTest {
final String ba = b + "->" + a;
final String testTopicPrefix = "test-topic-";
Map<String, String> mmProps = new HashMap<String, String>() {{
Map<String, String> mmProps = new HashMap<>() {{
put("dedicated.mode.enable.internal.rest", "true");
put("listeners", "http://localhost:0");
// Refresh topics very frequently to quickly pick up on topics that are created

10
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/IdentityReplicationIntegrationTest.java
View File

@ -21,7 +21,7 @@ import org.apache.kafka.connect.mirror.IdentityReplicationPolicy;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import java.util.HashMap;
import java.util.Map;
/**
* Tests MM2 replication and failover logic for {@link IdentityReplicationPolicy}.
@ -36,10 +36,10 @@ public class IdentityReplicationIntegrationTest extends MirrorConnectorsIntegrat
@BeforeEach
public void startClusters() throws Exception {
replicateBackupToPrimary = false;
super.startClusters(new HashMap<String, String>() {{
put("replication.policy.class", IdentityReplicationPolicy.class.getName());
put("topics", "test-topic-.*");
}});
super.startClusters(Map.of(
"replication.policy.class", IdentityReplicationPolicy.class.getName(),
"topics", "test-topic-.*"
));
}
/*

4
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java
View File

@ -152,7 +152,7 @@ public class MirrorConnectorsIntegrationBaseTest {
@BeforeEach
public void startClusters() throws Exception {
startClusters(new HashMap<String, String>() {{
startClusters(new HashMap<>() {{
put("topics", "test-topic-.*, primary.test-topic-.*, backup.test-topic-.*");
}});
}
@ -491,7 +491,7 @@ public class MirrorConnectorsIntegrationBaseTest {
produceMessages(primaryProducer, "test-topic-1");
String backupTopic1 = remoteTopicName("test-topic-1", PRIMARY_CLUSTER_ALIAS);
String consumerGroupName = "consumer-group-testOneWayReplicationWithAutoOffsetSync";
Map<String, Object> consumerProps = new HashMap<String, Object>() {{
Map<String, Object> consumerProps = new HashMap<>() {{
put("group.id", consumerGroupName);
put("auto.offset.reset", "earliest");
}};

2
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationExactlyOnceTest.java
View File

@ -81,7 +81,7 @@ public class MirrorConnectorsIntegrationExactlyOnceTest extends MirrorConnectors
assertEquals(expectedRecordsTopic2, backup.kafka().consume(expectedRecordsTopic2, RECORD_TRANSFER_DURATION_MS, backupTopic2).count(),
"New topic was not re-replicated to backup cluster after altering offsets.");
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings("unchecked")
Class<? extends Connector>[] connectorsToReset = CONNECTOR_LIST.toArray(new Class[0]);
stopMirrorMakerConnectors(backup, connectorsToReset);
// Resetting the offsets for the heartbeat and checkpoint connectors doesn't have any effect

2
connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java
View File

@ -151,7 +151,7 @@ public class MirrorConnectorsWithCustomForwardingAdminIntegrationTest extends Mi
additionalBackupClusterClientsConfigs.putAll(superUserConfig());
backupWorkerProps.putAll(superUserConfig());
HashMap<String, String> additionalConfig = new HashMap<String, String>(superUserConfig()) {{
Map<String, String> additionalConfig = new HashMap<>(superUserConfig()) {{
put(FORWARDING_ADMIN_CLASS, FakeForwardingAdminWithLocalMetadata.class.getName());
}};

17
connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSinkTaskThreadedTest.java
View File

@ -719,19 +719,8 @@ public class WorkerSinkTaskThreadedTest {
private abstract static class TestSinkTask extends SinkTask {
}
private static class ExpectOffsetCommitCommand {
final long expectedMessages;
final RuntimeException error;
final Exception consumerCommitError;
final long consumerCommitDelayMs;
final boolean invokeCallback;
private ExpectOffsetCommitCommand(long expectedMessages, RuntimeException error, Exception consumerCommitError, long consumerCommitDelayMs, boolean invokeCallback) {
this.expectedMessages = expectedMessages;
this.error = error;
this.consumerCommitError = consumerCommitError;
this.consumerCommitDelayMs = consumerCommitDelayMs;
this.invokeCallback = invokeCallback;
}
private record ExpectOffsetCommitCommand(long expectedMessages, RuntimeException error,
Exception consumerCommitError, long consumerCommitDelayMs,
boolean invokeCallback) {
}
}

13
connect/transforms/src/test/java/org/apache/kafka/connect/transforms/predicates/HasHeaderKeyTest.java
View File

@ -86,18 +86,7 @@ public class HasHeaderKeyTest {
Arrays.stream(headers).map(TestHeader::new).collect(Collectors.toList()));
}
private static class TestHeader implements Header {
private final String key;
public TestHeader(String key) {
this.key = key;
}
@Override
public String key() {
return key;
}
private record TestHeader(String key) implements Header {
@Override
public Schema schema() {