Skip to content

Commit f2fe35f

Browse files
Clean up CoordinatorTests (#134028)
Fixes IntelliJ suggestions in `action/CoordinatorTests` and `coordination/CoordinatorTests`
1 parent ac0d061 commit f2fe35f

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.elasticsearch.transport.TransportService;
4646
import org.elasticsearch.xcontent.ToXContent;
4747

48-
import java.io.IOException;
4948
import java.util.Collections;
5049
import java.util.HashSet;
5150
import java.util.Iterator;
@@ -928,7 +927,7 @@ public TransportVersion getMinimalSupportedVersion() {
928927
}
929928

930929
@Override
931-
public void writeTo(StreamOutput out) throws IOException {
930+
public void writeTo(StreamOutput out) {
932931
if (timeAdvancer != null) {
933932
timeAdvancer.advanceTime();
934933
}
@@ -1064,7 +1063,7 @@ public void testJoiningNodeReceivesFullState() {
10641063
cluster.stabilise();
10651064

10661065
cluster.addNodesAndStabilise(1);
1067-
final ClusterNode newNode = cluster.clusterNodes.get(cluster.clusterNodes.size() - 1);
1066+
final ClusterNode newNode = cluster.clusterNodes.getLast();
10681067
final PublishClusterStateStats newNodePublishStats = newNode.coordinator.stats().getPublishStats();
10691068
// initial cluster state send when joining
10701069
assertEquals(1L, newNodePublishStats.getFullClusterStateReceivedCount());
@@ -1289,9 +1288,8 @@ public void testClusterCannotFormWithFailingJoinValidation() throws Exception {
12891288
* @param failJoinOnAllNodes this controls whether to fail join on all nodes or only a majority subset. The atomic register CAS election
12901289
* strategy will succeed in electing a master if any node can vote (even the master candidate voting for
12911290
* itself).
1292-
* @throws Exception
12931291
*/
1294-
protected void clusterCannotFormWithFailingJoinValidation(boolean failJoinOnAllNodes) throws Exception {
1292+
protected void clusterCannotFormWithFailingJoinValidation(boolean failJoinOnAllNodes) {
12951293
try (Cluster cluster = new Cluster(randomIntBetween(1, 5))) {
12961294
List<ClusterNode> clusterNodesToFailJoin;
12971295
if (failJoinOnAllNodes) {
@@ -1593,7 +1591,7 @@ public TransportVersion getMinimalSupportedVersion() {
15931591
}
15941592

15951593
@Override
1596-
public void writeTo(StreamOutput out) throws IOException {
1594+
public void writeTo(StreamOutput out) {
15971595
throw new ElasticsearchException(EXCEPTION_MESSAGE);
15981596
}
15991597

@@ -1708,9 +1706,9 @@ public void match(LogEvent event) {
17081706
.toList();
17091707
assertThat(matchingNodes, hasSize(1));
17101708

1711-
assertTrue(message, Regex.simpleMatch(discoveryMessageFn.apply(matchingNodes.get(0).toString()), message));
1709+
assertTrue(message, Regex.simpleMatch(discoveryMessageFn.apply(matchingNodes.getFirst().toString()), message));
17121710

1713-
nodesLogged.add(matchingNodes.get(0).getLocalNode());
1711+
nodesLogged.add(matchingNodes.getFirst().getLocalNode());
17141712
}
17151713

17161714
@Override

x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/action/CoordinatorTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testCoordinateLookups() {
7575
assertThat(coordinator.queue.size(), equalTo(5));
7676
assertThat(coordinator.getRemoteRequestsCurrent(), equalTo(1));
7777
assertThat(lookupFunction.capturedRequests.size(), equalTo(1));
78-
assertThat(lookupFunction.capturedRequests.get(0).requests().size(), equalTo(5));
78+
assertThat(lookupFunction.capturedRequests.getFirst().requests().size(), equalTo(5));
7979

8080
// Nothing should happen now, because there is an outstanding request and max number of requests has been set to 1:
8181
coordinator.coordinateLookups();
@@ -93,7 +93,7 @@ public void testCoordinateLookups() {
9393
emptyResponse.decRef();
9494
final MultiSearchResponse res1 = new MultiSearchResponse(responseItems, 1L);
9595
try {
96-
lookupFunction.capturedConsumers.get(0).accept(res1, null);
96+
lookupFunction.capturedConsumers.getFirst().accept(res1, null);
9797
assertThat(coordinator.queue.size(), equalTo(0));
9898
assertThat(coordinator.getRemoteRequestsCurrent(), equalTo(1));
9999
assertThat(lookupFunction.capturedRequests.size(), equalTo(2));
@@ -149,10 +149,10 @@ public void testCoordinateLookupsMultiSearchError() {
149149
assertThat(coordinator.queue.size(), equalTo(0));
150150
assertThat(coordinator.getRemoteRequestsCurrent(), equalTo(1));
151151
assertThat(lookupFunction.capturedRequests.size(), equalTo(1));
152-
assertThat(lookupFunction.capturedRequests.get(0).requests().size(), equalTo(5));
152+
assertThat(lookupFunction.capturedRequests.getFirst().requests().size(), equalTo(5));
153153

154154
RuntimeException e = new RuntimeException();
155-
lookupFunction.capturedConsumers.get(0).accept(null, e);
155+
lookupFunction.capturedConsumers.getFirst().accept(null, e);
156156
assertThat(coordinator.queue.size(), equalTo(0));
157157
assertThat(coordinator.getRemoteRequestsCurrent(), equalTo(0));
158158
assertThat(lookupFunction.capturedRequests.size(), equalTo(1));
@@ -189,7 +189,7 @@ public void testCoordinateLookupsMultiSearchItemError() {
189189
assertThat(coordinator.queue.size(), equalTo(0));
190190
assertThat(coordinator.getRemoteRequestsCurrent(), equalTo(1));
191191
assertThat(lookupFunction.capturedRequests.size(), equalTo(1));
192-
assertThat(lookupFunction.capturedRequests.get(0).requests().size(), equalTo(5));
192+
assertThat(lookupFunction.capturedRequests.getFirst().requests().size(), equalTo(5));
193193

194194
RuntimeException e = new RuntimeException();
195195
// Replying a response and that should trigger another coordination round
@@ -199,7 +199,7 @@ public void testCoordinateLookupsMultiSearchItemError() {
199199
}
200200
var res = new MultiSearchResponse(responseItems, 1L);
201201
try {
202-
lookupFunction.capturedConsumers.get(0).accept(res, null);
202+
lookupFunction.capturedConsumers.getFirst().accept(res, null);
203203
assertThat(coordinator.queue.size(), equalTo(0));
204204
assertThat(coordinator.getRemoteRequestsCurrent(), equalTo(0));
205205
assertThat(lookupFunction.capturedRequests.size(), equalTo(1));
@@ -213,7 +213,7 @@ public void testCoordinateLookupsMultiSearchItemError() {
213213
}
214214
}
215215

216-
public void testNoBlockingWhenQueueing() throws Exception {
216+
public void testNoBlockingWhenQueueing() {
217217
MockLookupFunction lookupFunction = new MockLookupFunction();
218218
// Only one request allowed in flight. Queue size maxed at 1.
219219
Coordinator coordinator = new Coordinator(lookupFunction, 1, 1, 1);
@@ -256,11 +256,11 @@ public void testNoBlockingWhenQueueing() throws Exception {
256256
// Fulfill the captured consumer which will schedule the next item in the queue.
257257
var res = new MultiSearchResponse(new MultiSearchResponse.Item[] { new MultiSearchResponse.Item(emptySearchResponse(), null) }, 1L);
258258
try {
259-
lookupFunction.capturedConsumers.get(0).accept(res, null);
259+
lookupFunction.capturedConsumers.getFirst().accept(res, null);
260260
// Ensure queue was drained and that the item in it was scheduled
261261
assertThat(coordinator.queue.size(), equalTo(0));
262262
assertThat(lookupFunction.capturedRequests.size(), equalTo(2));
263-
assertThat(lookupFunction.capturedRequests.get(1).requests().get(0), sameInstance(searchRequest));
263+
assertThat(lookupFunction.capturedRequests.get(1).requests().getFirst(), sameInstance(searchRequest));
264264
} finally {
265265
res.decRef();
266266
}
@@ -308,8 +308,8 @@ public ThreadPool threadPool() {
308308
String index = indices.get(i);
309309
assertThat(requests.get(i).index(), equalTo(index));
310310
assertThat(requests.get(i).getMultiSearchRequest().requests().size(), equalTo(2));
311-
assertThat(requests.get(i).getMultiSearchRequest().requests().get(0).indices().length, equalTo(1));
312-
assertThat(requests.get(i).getMultiSearchRequest().requests().get(0).indices()[0], equalTo(index));
311+
assertThat(requests.get(i).getMultiSearchRequest().requests().getFirst().indices().length, equalTo(1));
312+
assertThat(requests.get(i).getMultiSearchRequest().requests().getFirst().indices()[0], equalTo(index));
313313
}
314314
}
315315

0 commit comments

Comments
 (0)