Skip to content

Commit f5fa1f4

Browse files
author
Christoph Büscher
authored
Help Eclipse with type inference for functions (#36301)
The Eclipse IDE java compiler seems to need some special hints about what types some functions used in the tests return. Correcting this for some test that were newly merged to master.
1 parent 97259f0 commit f5fa1f4

File tree

6 files changed

+31
-18
lines changed

6 files changed

+31
-18
lines changed

‎server/src/test/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfigurationTests.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.elasticsearch.cluster.node.DiscoveryNode.Role;
2727
import org.elasticsearch.test.ESTestCase;
2828
import org.elasticsearch.test.EqualsHashCodeTestUtils;
29+
import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction;
2930

3031
import java.util.ArrayList;
3132
import java.util.List;
@@ -40,7 +41,9 @@ public class BootstrapConfigurationTests extends ESTestCase {
4041

4142
public void testEqualsHashcodeSerialization() {
4243
EqualsHashCodeTestUtils.checkEqualsAndHashCode(randomBootstrapConfiguration(),
43-
bootstrapConfiguration -> copyWriteable(bootstrapConfiguration, writableRegistry(), BootstrapConfiguration::new), this::mutate);
44+
(CopyFunction<BootstrapConfiguration>) bootstrapConfiguration -> copyWriteable(bootstrapConfiguration, writableRegistry(),
45+
BootstrapConfiguration::new),
46+
this::mutate);
4447
}
4548

4649
public void testNodeDescriptionResolvedByName() {

‎server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetaDataTests.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
package org.elasticsearch.cluster.coordination;
2020

21-
import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfiguration;
2221
import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfigExclusion;
22+
import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfiguration;
2323
import org.elasticsearch.common.bytes.BytesReference;
2424
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
2525
import org.elasticsearch.common.util.set.Sets;
@@ -29,6 +29,7 @@
2929
import org.elasticsearch.common.xcontent.json.JsonXContent;
3030
import org.elasticsearch.test.ESTestCase;
3131
import org.elasticsearch.test.EqualsHashCodeTestUtils;
32+
import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction;
3233

3334
import java.io.IOException;
3435
import java.util.Collections;
@@ -85,8 +86,9 @@ public void testVotingConfiguration() {
8586
public void testVotingConfigurationSerializationEqualsHashCode() {
8687
VotingConfiguration initialConfig = randomVotingConfig();
8788
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialConfig,
88-
orig -> ESTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), VotingConfiguration::new),
89-
cfg -> randomlyChangeVotingConfiguration(cfg));
89+
(CopyFunction<VotingConfiguration>) orig -> ESTestCase.copyWriteable(orig,
90+
new NamedWriteableRegistry(Collections.emptyList()), VotingConfiguration::new),
91+
cfg -> randomlyChangeVotingConfiguration(cfg));
9092
}
9193

9294
private static VotingConfiguration randomVotingConfig() {
@@ -96,7 +98,8 @@ private static VotingConfiguration randomVotingConfig() {
9698
public void testVotingTombstoneSerializationEqualsHashCode() {
9799
VotingConfigExclusion tombstone = new VotingConfigExclusion(randomAlphaOfLength(10), randomAlphaOfLength(10));
98100
EqualsHashCodeTestUtils.checkEqualsAndHashCode(tombstone,
99-
orig -> ESTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), VotingConfigExclusion::new),
101+
(CopyFunction<VotingConfigExclusion>) orig -> ESTestCase.copyWriteable(orig,
102+
new NamedWriteableRegistry(Collections.emptyList()), VotingConfigExclusion::new),
100103
orig -> randomlyChangeVotingTombstone(orig));
101104
}
102105

@@ -149,7 +152,8 @@ public void testCoordinationMetaDataSerializationEqualsHashCode() {
149152
CoordinationMetaData initialMetaData = new CoordinationMetaData(randomNonNegativeLong(), randomVotingConfig(), randomVotingConfig(),
150153
randomVotingTombstones());
151154
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialMetaData,
152-
orig -> ESTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), CoordinationMetaData::new),
155+
(CopyFunction<CoordinationMetaData>) orig -> ESTestCase.copyWriteable(orig,
156+
new NamedWriteableRegistry(Collections.emptyList()), CoordinationMetaData::new),
153157
meta -> {
154158
CoordinationMetaData.Builder builder = CoordinationMetaData.builder(meta);
155159
switch (randomInt(3)) {

‎server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.elasticsearch.common.settings.Settings.Builder;
3131
import org.elasticsearch.test.ESTestCase;
3232
import org.elasticsearch.test.EqualsHashCodeTestUtils;
33+
import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction;
3334
import org.elasticsearch.test.transport.MockTransport;
3435
import org.elasticsearch.threadpool.ThreadPool.Names;
3536
import org.elasticsearch.transport.ConnectTransportException;
@@ -378,7 +379,7 @@ public String toString() {
378379
public void testFollowerCheckRequestEqualsHashCodeSerialization() {
379380
EqualsHashCodeTestUtils.checkEqualsAndHashCode(new FollowerCheckRequest(randomNonNegativeLong(),
380381
new DiscoveryNode(randomAlphaOfLength(10), buildNewFakeTransportAddress(), Version.CURRENT)),
381-
rq -> copyWriteable(rq, writableRegistry(), FollowerCheckRequest::new),
382+
(CopyFunction<FollowerCheckRequest>) rq -> copyWriteable(rq, writableRegistry(), FollowerCheckRequest::new),
382383
rq -> {
383384
if (randomBoolean()) {
384385
return new FollowerCheckRequest(rq.getTerm(),

‎server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.elasticsearch.common.settings.Settings;
3030
import org.elasticsearch.test.ESTestCase;
3131
import org.elasticsearch.test.EqualsHashCodeTestUtils;
32+
import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction;
3233
import org.elasticsearch.test.transport.CapturingTransport;
3334
import org.elasticsearch.test.transport.MockTransport;
3435
import org.elasticsearch.threadpool.ThreadPool.Names;
@@ -388,7 +389,7 @@ public void testLeaderCheckRequestEqualsHashcodeSerialization() {
388389
LeaderCheckRequest request = new LeaderCheckRequest(
389390
new DiscoveryNode(randomAlphaOfLength(10), buildNewFakeTransportAddress(), Version.CURRENT));
390391
EqualsHashCodeTestUtils.checkEqualsAndHashCode(request,
391-
rq -> copyWriteable(rq, writableRegistry(), LeaderCheckRequest::new),
392+
(CopyFunction<LeaderCheckRequest>) rq -> copyWriteable(rq, writableRegistry(), LeaderCheckRequest::new),
392393
rq -> new LeaderCheckRequest(new DiscoveryNode(randomAlphaOfLength(10), buildNewFakeTransportAddress(), Version.CURRENT)));
393394
}
394395
}

‎server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.elasticsearch.common.util.set.Sets;
2525
import org.elasticsearch.test.ESTestCase;
2626
import org.elasticsearch.test.EqualsHashCodeTestUtils;
27+
import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction;
2728

2829
import java.util.Optional;
2930

@@ -38,7 +39,7 @@ public void testJoinEqualsHashCodeSerialization() {
3839
randomNonNegativeLong(),
3940
randomNonNegativeLong());
4041
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialJoin,
41-
join -> copyWriteable(join, writableRegistry(), Join::new),
42+
(CopyFunction<Join>) join -> copyWriteable(join, writableRegistry(), Join::new),
4243
join -> {
4344
switch (randomInt(4)) {
4445
case 0:
@@ -80,7 +81,7 @@ public void testPublishRequestEqualsHashCode() {
8081
public void testPublishResponseEqualsHashCodeSerialization() {
8182
PublishResponse initialPublishResponse = new PublishResponse(randomNonNegativeLong(), randomNonNegativeLong());
8283
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPublishResponse,
83-
publishResponse -> copyWriteable(publishResponse, writableRegistry(), PublishResponse::new),
84+
(CopyFunction<PublishResponse>) publishResponse -> copyWriteable(publishResponse, writableRegistry(), PublishResponse::new),
8485
publishResponse -> {
8586
switch (randomInt(1)) {
8687
case 0:
@@ -105,7 +106,8 @@ public void testPublishWithJoinResponseEqualsHashCodeSerialization() {
105106
PublishWithJoinResponse initialPublishWithJoinResponse = new PublishWithJoinResponse(initialPublishResponse,
106107
randomBoolean() ? Optional.empty() : Optional.of(initialJoin));
107108
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPublishWithJoinResponse,
108-
publishWithJoinResponse -> copyWriteable(publishWithJoinResponse, writableRegistry(), PublishWithJoinResponse::new),
109+
(CopyFunction<PublishWithJoinResponse>) publishWithJoinResponse -> copyWriteable(publishWithJoinResponse,
110+
writableRegistry(), PublishWithJoinResponse::new),
109111
publishWithJoinResponse -> {
110112
switch (randomInt(1)) {
111113
case 0:
@@ -127,7 +129,8 @@ public void testPublishWithJoinResponseEqualsHashCodeSerialization() {
127129
public void testStartJoinRequestEqualsHashCodeSerialization() {
128130
StartJoinRequest initialStartJoinRequest = new StartJoinRequest(createNode(randomAlphaOfLength(10)), randomNonNegativeLong());
129131
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialStartJoinRequest,
130-
startJoinRequest -> copyWriteable(startJoinRequest, writableRegistry(), StartJoinRequest::new),
132+
(CopyFunction<StartJoinRequest>) startJoinRequest -> copyWriteable(startJoinRequest, writableRegistry(),
133+
StartJoinRequest::new),
131134
startJoinRequest -> {
132135
switch (randomInt(1)) {
133136
case 0:
@@ -147,7 +150,7 @@ public void testApplyCommitEqualsHashCodeSerialization() {
147150
ApplyCommitRequest initialApplyCommit = new ApplyCommitRequest(createNode(randomAlphaOfLength(10)), randomNonNegativeLong(),
148151
randomNonNegativeLong());
149152
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialApplyCommit,
150-
applyCommit -> copyWriteable(applyCommit, writableRegistry(), ApplyCommitRequest::new),
153+
(CopyFunction<ApplyCommitRequest>) applyCommit -> copyWriteable(applyCommit, writableRegistry(), ApplyCommitRequest::new),
151154
applyCommit -> {
152155
switch (randomInt(2)) {
153156
case 0:
@@ -173,7 +176,7 @@ public void testJoinRequestEqualsHashCodeSerialization() {
173176
JoinRequest initialJoinRequest = new JoinRequest(initialJoin.getSourceNode(),
174177
randomBoolean() ? Optional.empty() : Optional.of(initialJoin));
175178
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialJoinRequest,
176-
joinRequest -> copyWriteable(joinRequest, writableRegistry(), JoinRequest::new),
179+
(CopyFunction<JoinRequest>) joinRequest -> copyWriteable(joinRequest, writableRegistry(), JoinRequest::new),
177180
joinRequest -> {
178181
if (randomBoolean() && joinRequest.getOptionalJoin().isPresent() == false) {
179182
return new JoinRequest(createNode(randomAlphaOfLength(20)), joinRequest.getOptionalJoin());
@@ -201,7 +204,7 @@ public ClusterState randomClusterState() {
201204
public void testPreVoteRequestEqualsHashCodeSerialization() {
202205
PreVoteRequest initialPreVoteRequest = new PreVoteRequest(createNode(randomAlphaOfLength(10)), randomNonNegativeLong());
203206
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPreVoteRequest,
204-
preVoteRequest -> copyWriteable(preVoteRequest, writableRegistry(), PreVoteRequest::new),
207+
(CopyFunction<PreVoteRequest>) preVoteRequest -> copyWriteable(preVoteRequest, writableRegistry(), PreVoteRequest::new),
205208
preVoteRequest -> {
206209
if (randomBoolean()) {
207210
return new PreVoteRequest(createNode(randomAlphaOfLength(10)), preVoteRequest.getCurrentTerm());
@@ -216,7 +219,7 @@ public void testPreVoteResponseEqualsHashCodeSerialization() {
216219
PreVoteResponse initialPreVoteResponse
217220
= new PreVoteResponse(currentTerm, randomLongBetween(1, currentTerm), randomNonNegativeLong());
218221
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPreVoteResponse,
219-
preVoteResponse -> copyWriteable(preVoteResponse, writableRegistry(), PreVoteResponse::new),
222+
(CopyFunction<PreVoteResponse>) preVoteResponse -> copyWriteable(preVoteResponse, writableRegistry(), PreVoteResponse::new),
220223
preVoteResponse -> {
221224
switch (randomInt(2)) {
222225
case 0:

‎server/src/test/java/org/elasticsearch/discovery/PeerFinderMessagesTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.elasticsearch.cluster.node.DiscoveryNode;
2525
import org.elasticsearch.test.ESTestCase;
2626
import org.elasticsearch.test.EqualsHashCodeTestUtils;
27+
import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction;
2728

2829
import java.util.ArrayList;
2930
import java.util.Arrays;
@@ -45,7 +46,7 @@ public void testPeersRequestEqualsHashCodeSerialization() {
4546
Arrays.stream(generateRandomStringArray(10, 10, false)).map(this::createNode).collect(Collectors.toList()));
4647

4748
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPeersRequest,
48-
publishRequest -> copyWriteable(publishRequest, writableRegistry(), PeersRequest::new),
49+
(CopyFunction<PeersRequest>) publishRequest -> copyWriteable(publishRequest, writableRegistry(), PeersRequest::new),
4950
in -> {
5051
final List<DiscoveryNode> discoveryNodes = new ArrayList<>(in.getKnownPeers());
5152
if (randomBoolean()) {
@@ -69,7 +70,7 @@ public void testPeersResponseEqualsHashCodeSerialization() {
6970
}
7071

7172
EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPeersResponse,
72-
publishResponse -> copyWriteable(publishResponse, writableRegistry(), PeersResponse::new),
73+
(CopyFunction<PeersResponse>) publishResponse -> copyWriteable(publishResponse, writableRegistry(), PeersResponse::new),
7374
in -> {
7475
final long term = in.getTerm();
7576
if (randomBoolean()) {

0 commit comments

Comments
 (0)