Skip to content

Commit 6c2af5f

Browse files
wernerdvwernerdv
authored
MINOR: Small cleanups in server tests (#19395)
- Used List/Map/Set.of() for immutable collections - Reduced code duplication - Fixed IDEA code inspection warnings Reviewers: Mickael Maison <[email protected]>
1 parent e2d472d commit 6c2af5f

11 files changed

+170
-208
lines changed

‎server/src/test/java/org/apache/kafka/network/SocketServerConfigsTest.java

+16-23
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,48 @@
2222

2323
import org.junit.jupiter.api.Test;
2424

25-
import java.util.Arrays;
26-
import java.util.HashMap;
25+
import java.util.List;
2726
import java.util.Map;
2827

2928
import static org.junit.jupiter.api.Assertions.assertEquals;
3029

3130
public class SocketServerConfigsTest {
3231
@Test
3332
public void testDefaultNameToSecurityProto() {
34-
Map<ListenerName, SecurityProtocol> expected = new HashMap<>();
35-
expected.put(new ListenerName("PLAINTEXT"), SecurityProtocol.PLAINTEXT);
36-
expected.put(new ListenerName("SSL"), SecurityProtocol.SSL);
37-
expected.put(new ListenerName("SASL_PLAINTEXT"), SecurityProtocol.SASL_PLAINTEXT);
38-
expected.put(new ListenerName("SASL_SSL"), SecurityProtocol.SASL_SSL);
33+
Map<ListenerName, SecurityProtocol> expected = Map.of(
34+
new ListenerName("PLAINTEXT"), SecurityProtocol.PLAINTEXT,
35+
new ListenerName("SSL"), SecurityProtocol.SSL,
36+
new ListenerName("SASL_PLAINTEXT"), SecurityProtocol.SASL_PLAINTEXT,
37+
new ListenerName("SASL_SSL"), SecurityProtocol.SASL_SSL
38+
);
3939
assertEquals(expected, SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO);
4040
}
4141

4242
@Test
4343
public void testListenerListToEndPointsWithEmptyString() {
44-
assertEquals(Arrays.asList(),
44+
assertEquals(List.of(),
4545
SocketServerConfigs.listenerListToEndPoints("",
4646
SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO));
4747
}
4848

4949
@Test
5050
public void testListenerListToEndPointsWithBlankString() {
51-
assertEquals(Arrays.asList(),
51+
assertEquals(List.of(),
5252
SocketServerConfigs.listenerListToEndPoints(" ",
5353
SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO));
5454
}
5555

5656
@Test
5757
public void testListenerListToEndPointsWithOneEndpoint() {
58-
assertEquals(Arrays.asList(
59-
new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, "example.com", 8080)),
58+
assertEquals(List.of(new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, "example.com", 8080)),
6059
SocketServerConfigs.listenerListToEndPoints("PLAINTEXT://example.com:8080",
6160
SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO));
6261
}
6362

6463
// Regression test for KAFKA-3719
6564
@Test
6665
public void testListenerListToEndPointsWithUnderscores() {
67-
assertEquals(Arrays.asList(
66+
assertEquals(List.of(
6867
new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, "example.com", 8080),
6968
new Endpoint("SSL", SecurityProtocol.SSL, "local_host", 8081)),
7069
SocketServerConfigs.listenerListToEndPoints("PLAINTEXT://example.com:8080,SSL://local_host:8081",
@@ -73,35 +72,29 @@ public void testListenerListToEndPointsWithUnderscores() {
7372

7473
@Test
7574
public void testListenerListToEndPointsWithWildcard() {
76-
assertEquals(Arrays.asList(
77-
new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, null, 8080)),
75+
assertEquals(List.of(new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, null, 8080)),
7876
SocketServerConfigs.listenerListToEndPoints("PLAINTEXT://:8080",
7977
SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO));
8078
}
8179

8280
@Test
8381
public void testListenerListToEndPointsWithIpV6() {
84-
assertEquals(Arrays.asList(
85-
new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, "::1", 9092)),
82+
assertEquals(List.of(new Endpoint("PLAINTEXT", SecurityProtocol.PLAINTEXT, "::1", 9092)),
8683
SocketServerConfigs.listenerListToEndPoints("PLAINTEXT://[::1]:9092",
8784
SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO));
8885
}
8986

9087
@Test
9188
public void testAnotherListenerListToEndPointsWithIpV6() {
92-
assertEquals(Arrays.asList(
93-
new Endpoint("SASL_SSL", SecurityProtocol.SASL_SSL, "fe80::b1da:69ca:57f7:63d8%3", 9092)),
89+
assertEquals(List.of(new Endpoint("SASL_SSL", SecurityProtocol.SASL_SSL, "fe80::b1da:69ca:57f7:63d8%3", 9092)),
9490
SocketServerConfigs.listenerListToEndPoints("SASL_SSL://[fe80::b1da:69ca:57f7:63d8%3]:9092",
9591
SocketServerConfigs.DEFAULT_NAME_TO_SECURITY_PROTO));
9692
}
9793

9894
@Test
9995
public void testAnotherListenerListToEndPointsWithNonDefaultProtoMap() {
100-
Map<ListenerName, SecurityProtocol> map = new HashMap<>();
101-
map.put(new ListenerName("CONTROLLER"), SecurityProtocol.PLAINTEXT);
102-
assertEquals(Arrays.asList(
103-
new Endpoint("CONTROLLER", SecurityProtocol.PLAINTEXT, "example.com", 9093)),
96+
assertEquals(List.of(new Endpoint("CONTROLLER", SecurityProtocol.PLAINTEXT, "example.com", 9093)),
10497
SocketServerConfigs.listenerListToEndPoints("CONTROLLER://example.com:9093",
105-
map));
98+
Map.of(new ListenerName("CONTROLLER"), SecurityProtocol.PLAINTEXT)));
10699
}
107100
}

‎server/src/test/java/org/apache/kafka/server/AssignmentTest.java

+19-17
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@
2929

3030
import org.junit.jupiter.api.Test;
3131

32-
import java.util.Arrays;
32+
import java.util.List;
3333

3434
import static org.junit.jupiter.api.Assertions.assertEquals;
3535
import static org.junit.jupiter.api.Assertions.assertFalse;
3636
import static org.junit.jupiter.api.Assertions.assertTrue;
3737

3838
public class AssignmentTest {
39+
private static final Uuid TOPIC_ID = Uuid.fromString("rTudty6ITOCcO_ldVyzZYg");
40+
private static final Uuid DIRECTORY_ID = Uuid.fromString("rzRT8XZaSbKsP6j238zogg");
3941
private static final MetadataImage TEST_IMAGE;
4042

4143
static {
@@ -47,18 +49,18 @@ public class AssignmentTest {
4749
setFeatureLevel(MetadataVersion.IBP_3_8_IV0.featureLevel()));
4850
delta.replay(new TopicRecord().
4951
setName("foo").
50-
setTopicId(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg")));
52+
setTopicId(TOPIC_ID));
5153
delta.replay(new PartitionRecord().
5254
setPartitionId(0).
53-
setTopicId(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg")).
54-
setReplicas(Arrays.asList(0, 1, 2)).
55-
setIsr(Arrays.asList(0, 1, 2)).
55+
setTopicId(TOPIC_ID).
56+
setReplicas(List.of(0, 1, 2)).
57+
setIsr(List.of(0, 1, 2)).
5658
setLeader(1));
5759
delta.replay(new PartitionRecord().
5860
setPartitionId(1).
59-
setTopicId(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg")).
60-
setReplicas(Arrays.asList(1, 2, 3)).
61-
setIsr(Arrays.asList(1, 2, 3)).
61+
setTopicId(TOPIC_ID).
62+
setReplicas(List.of(1, 2, 3)).
63+
setIsr(List.of(1, 2, 3)).
6264
setLeader(1));
6365
TEST_IMAGE = delta.apply(MetadataProvenance.EMPTY);
6466
}
@@ -79,8 +81,8 @@ public String toString() {
7981
@Test
8082
public void testValidAssignment() {
8183
assertTrue(new Assignment(
82-
new TopicIdPartition(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg"), 0),
83-
Uuid.fromString("rzRT8XZaSbKsP6j238zogg"),
84+
new TopicIdPartition(TOPIC_ID, 0),
85+
DIRECTORY_ID,
8486
0,
8587
NoOpRunnable.INSTANCE).valid(0, TEST_IMAGE));
8688
}
@@ -89,25 +91,25 @@ public void testValidAssignment() {
8991
public void testAssignmentForNonExistentTopicIsNotValid() {
9092
assertFalse(new Assignment(
9193
new TopicIdPartition(Uuid.fromString("uuOi4qGPSsuM0QwnYINvOw"), 0),
92-
Uuid.fromString("rzRT8XZaSbKsP6j238zogg"),
94+
DIRECTORY_ID,
9395
0,
9496
NoOpRunnable.INSTANCE).valid(0, TEST_IMAGE));
9597
}
9698

9799
@Test
98100
public void testAssignmentForNonExistentPartitionIsNotValid() {
99101
assertFalse(new Assignment(
100-
new TopicIdPartition(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg"), 2),
101-
Uuid.fromString("rzRT8XZaSbKsP6j238zogg"),
102+
new TopicIdPartition(TOPIC_ID, 2),
103+
DIRECTORY_ID,
102104
0,
103105
NoOpRunnable.INSTANCE).valid(0, TEST_IMAGE));
104106
}
105107

106108
@Test
107109
public void testAssignmentReplicaNotOnBrokerIsNotValid() {
108110
assertFalse(new Assignment(
109-
new TopicIdPartition(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg"), 0),
110-
Uuid.fromString("rzRT8XZaSbKsP6j238zogg"),
111+
new TopicIdPartition(TOPIC_ID, 0),
112+
DIRECTORY_ID,
111113
0,
112114
NoOpRunnable.INSTANCE).valid(3, TEST_IMAGE));
113115
}
@@ -118,8 +120,8 @@ public void testAssignmentToString() {
118120
"directoryId=rzRT8XZaSbKsP6j238zogg, " +
119121
"submissionTimeNs=123, " +
120122
"successCallback=NoOpRunnable)",
121-
new Assignment(new TopicIdPartition(Uuid.fromString("rTudty6ITOCcO_ldVyzZYg"), 1),
122-
Uuid.fromString("rzRT8XZaSbKsP6j238zogg"),
123+
new Assignment(new TopicIdPartition(TOPIC_ID, 1),
124+
DIRECTORY_ID,
123125
123,
124126
NoOpRunnable.INSTANCE).toString());
125127
}

‎server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java

+30-41
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757

5858
import java.util.AbstractMap;
5959
import java.util.ArrayList;
60-
import java.util.Arrays;
6160
import java.util.HashMap;
6261
import java.util.HashSet;
6362
import java.util.LinkedHashMap;
@@ -110,35 +109,35 @@ public class AssignmentsManagerTest {
110109
delta.replay(new PartitionRecord().
111110
setPartitionId(0).
112111
setTopicId(TOPIC_1).
113-
setReplicas(Arrays.asList(0, 1, 2)).
114-
setIsr(Arrays.asList(0, 1, 2)).
112+
setReplicas(List.of(0, 1, 2)).
113+
setIsr(List.of(0, 1, 2)).
115114
setLeader(1));
116115
delta.replay(new PartitionRecord().
117116
setPartitionId(1).
118117
setTopicId(TOPIC_1).
119-
setReplicas(Arrays.asList(1, 2, 3)).
120-
setIsr(Arrays.asList(1, 2, 3)).
118+
setReplicas(List.of(1, 2, 3)).
119+
setIsr(List.of(1, 2, 3)).
121120
setLeader(1));
122121
delta.replay(new TopicRecord().
123122
setName("bar").
124123
setTopicId(TOPIC_2));
125124
delta.replay(new PartitionRecord().
126125
setPartitionId(0).
127126
setTopicId(TOPIC_2).
128-
setReplicas(Arrays.asList(0, 3, 2)).
129-
setIsr(Arrays.asList(0, 3, 2)).
127+
setReplicas(List.of(0, 3, 2)).
128+
setIsr(List.of(0, 3, 2)).
130129
setLeader(1));
131130
delta.replay(new PartitionRecord().
132131
setPartitionId(1).
133132
setTopicId(TOPIC_2).
134-
setReplicas(Arrays.asList(1, 2, 3)).
135-
setIsr(Arrays.asList(2)).
133+
setReplicas(List.of(1, 2, 3)).
134+
setIsr(List.of(2)).
136135
setLeader(2));
137136
delta.replay(new PartitionRecord().
138137
setPartitionId(2).
139138
setTopicId(TOPIC_2).
140-
setReplicas(Arrays.asList(3, 2, 1)).
141-
setIsr(Arrays.asList(3, 2, 1)).
139+
setReplicas(List.of(3, 2, 1)).
140+
setIsr(List.of(3, 2, 1)).
142141
setLeader(3));
143142
TEST_IMAGE = delta.apply(MetadataProvenance.EMPTY);
144143
}
@@ -199,7 +198,7 @@ static class TestEnv implements AutoCloseable {
199198
this.channelManager = new MockNodeToControllerChannelManager();
200199
this.assignmentsManager = new AssignmentsManager(
201200
backoff, Time.SYSTEM, channelManager, 1, () -> TEST_IMAGE,
202-
t -> t.toString(), metricsRegistry);
201+
Uuid::toString, metricsRegistry);
203202
this.successes = new HashMap<>();
204203
}
205204

@@ -225,11 +224,11 @@ void successfullyCompleteCallbackOfRequestAssigningTopic1ToDir1() throws Excepti
225224
assertEquals(TOPIC_1, topicData.topicId());
226225
assertEquals(0, topicData.partitions().get(0).partitionIndex());
227226
return mockClientResponse(new AssignReplicasToDirsResponseData().
228-
setDirectories(Arrays.asList(new AssignReplicasToDirsResponseData.DirectoryData().
227+
setDirectories(List.of(new AssignReplicasToDirsResponseData.DirectoryData().
229228
setId(DIR_1).
230-
setTopics(Arrays.asList(new AssignReplicasToDirsResponseData.TopicData().
229+
setTopics(List.of(new AssignReplicasToDirsResponseData.TopicData().
231230
setTopicId(TOPIC_1).
232-
setPartitions(Arrays.asList(new AssignReplicasToDirsResponseData.PartitionData().
231+
setPartitions(List.of(new AssignReplicasToDirsResponseData.PartitionData().
233232
setPartitionIndex(0).
234233
setErrorCode((short) 0))))))));
235234
});
@@ -273,8 +272,7 @@ static Optional<ClientResponse> mockClientResponse(AssignReplicasToDirsResponseD
273272

274273
@Test
275274
public void testStartAndShutdown() throws Exception {
276-
try (TestEnv testEnv = new TestEnv()) {
277-
}
275+
new TestEnv().close();
278276
}
279277

280278
@Test
@@ -303,14 +301,10 @@ public void testSuccessfulAssignment() throws Exception {
303301
public void testUnSuccessfulRequestCausesRetransmission(String failureType) throws Exception {
304302
try (TestEnv testEnv = new TestEnv()) {
305303
testEnv.onAssignment(new TopicIdPartition(TOPIC_1, 0), DIR_1);
306-
TestUtils.retryOnExceptionWithTimeout(60_000, () -> {
307-
assertEquals(1, testEnv.assignmentsManager.numPending());
308-
});
304+
TestUtils.retryOnExceptionWithTimeout(60_000, () -> assertEquals(1, testEnv.assignmentsManager.numPending()));
309305
if (failureType.equals("invalidRequest")) {
310-
testEnv.channelManager.completeCallback(req -> {
311-
return mockClientResponse(new AssignReplicasToDirsResponseData().
312-
setErrorCode(Errors.INVALID_REQUEST.code()));
313-
});
306+
testEnv.channelManager.completeCallback(req -> mockClientResponse(new AssignReplicasToDirsResponseData()
307+
.setErrorCode(Errors.INVALID_REQUEST.code())));
314308
} else if (failureType.equals("timeout")) {
315309
testEnv.channelManager.completeCallback(req -> Optional.empty());
316310
}
@@ -332,16 +326,12 @@ public void testUnSuccessfulRequestCausesRetransmission(String failureType) thro
332326
@ValueSource(strings = {"missingTopic", "missingPartition", "notReplica"})
333327
public void testMismatchedInputDoesNotTriggerCompletion(String mismatchType) throws Exception {
334328
try (TestEnv testEnv = new TestEnv()) {
335-
TopicIdPartition target;
336-
if (mismatchType.equals("missingTopic")) {
337-
target = new TopicIdPartition(TOPIC_3, 0);
338-
} else if (mismatchType.equals("missingPartition")) {
339-
target = new TopicIdPartition(TOPIC_1, 2);
340-
} else if (mismatchType.equals("notReplica")) {
341-
target = new TopicIdPartition(TOPIC_2, 0);
342-
} else {
343-
throw new RuntimeException("invalid mismatchType argument.");
344-
}
329+
TopicIdPartition target = switch (mismatchType) {
330+
case "missingTopic" -> new TopicIdPartition(TOPIC_3, 0);
331+
case "missingPartition" -> new TopicIdPartition(TOPIC_1, 2);
332+
case "notReplica" -> new TopicIdPartition(TOPIC_2, 0);
333+
default -> throw new RuntimeException("invalid mismatchType argument.");
334+
};
345335
testEnv.onAssignment(target, DIR_1);
346336
TestUtils.retryOnExceptionWithTimeout(60_000, () -> {
347337
assertEquals(0, testEnv.assignmentsManager.numPending());
@@ -386,9 +376,9 @@ public void testOneAssignmentFailsOneSucceeds(String failureType) throws Excepti
386376
}
387377
}
388378
return mockClientResponse(new AssignReplicasToDirsResponseData().
389-
setDirectories(Arrays.asList(new AssignReplicasToDirsResponseData.DirectoryData().
379+
setDirectories(List.of(new AssignReplicasToDirsResponseData.DirectoryData().
390380
setId(DIR_1).
391-
setTopics(Arrays.asList(new AssignReplicasToDirsResponseData.TopicData().
381+
setTopics(List.of(new AssignReplicasToDirsResponseData.TopicData().
392382
setTopicId(TOPIC_1).
393383
setPartitions(partitions))))));
394384
});
@@ -476,17 +466,16 @@ void testBuildRequestData() {
476466
assignments.put(new TopicIdPartition(TOPIC_1, 4), DIR_1);
477467
assignments.put(new TopicIdPartition(TOPIC_2, 5), DIR_2);
478468
Map<TopicIdPartition, Assignment> targetAssignments = new LinkedHashMap<>();
479-
assignments.entrySet().forEach(e -> targetAssignments.put(e.getKey(),
480-
new Assignment(e.getKey(), e.getValue(), 0, () -> { })));
469+
assignments.forEach((key, value) -> targetAssignments.put(key, new Assignment(key, value, 0, () -> { })));
481470
AssignReplicasToDirsRequestData built =
482471
AssignmentsManager.buildRequestData(8, 100L, targetAssignments);
483472
AssignReplicasToDirsRequestData expected = new AssignReplicasToDirsRequestData().
484473
setBrokerId(8).
485474
setBrokerEpoch(100L).
486-
setDirectories(Arrays.asList(
475+
setDirectories(List.of(
487476
new AssignReplicasToDirsRequestData.DirectoryData().
488477
setId(DIR_2).
489-
setTopics(Arrays.asList(
478+
setTopics(List.of(
490479
new AssignReplicasToDirsRequestData.TopicData().
491480
setTopicId(TOPIC_1).
492481
setPartitions(List.of(
@@ -510,7 +499,7 @@ void testBuildRequestData() {
510499
setTopics(List.of(
511500
new AssignReplicasToDirsRequestData.TopicData().
512501
setTopicId(TOPIC_1).
513-
setPartitions(Arrays.asList(
502+
setPartitions(List.of(
514503
new AssignReplicasToDirsRequestData.PartitionData().
515504
setPartitionIndex(1),
516505
new AssignReplicasToDirsRequestData.PartitionData().

0 commit comments

Comments
 (0)