From 81da657ed5ffe48639fc4fe74afe0b2577381f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Thu, 6 Dec 2018 11:57:19 +0100 Subject: [PATCH] Fixing some Eclipse specific problems with type inference for functions --- .../BootstrapConfigurationTests.java | 5 ++++- .../CoordinationMetaDataTests.java | 14 +++++++++----- .../coordination/FollowersCheckerTests.java | 3 ++- .../coordination/LeaderCheckerTests.java | 3 ++- .../cluster/coordination/MessagesTests.java | 19 +++++++++++-------- .../discovery/PeerFinderMessagesTests.java | 5 +++-- 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfigurationTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfigurationTests.java index 7294a9c4773d7..1b537121c1591 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfigurationTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfigurationTests.java @@ -26,6 +26,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode.Role; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; import java.util.ArrayList; import java.util.List; @@ -40,7 +41,9 @@ public class BootstrapConfigurationTests extends ESTestCase { public void testEqualsHashcodeSerialization() { EqualsHashCodeTestUtils.checkEqualsAndHashCode(randomBootstrapConfiguration(), - bootstrapConfiguration -> copyWriteable(bootstrapConfiguration, writableRegistry(), BootstrapConfiguration::new), this::mutate); + (CopyFunction) bootstrapConfiguration -> copyWriteable(bootstrapConfiguration, writableRegistry(), + BootstrapConfiguration::new), + this::mutate); } public void testNodeDescriptionResolvedByName() { diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetaDataTests.java index b9a67d69665f7..39f9ed6fc11ec 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetaDataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetaDataTests.java @@ -18,8 +18,8 @@ */ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfiguration; import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfigExclusion; +import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfiguration; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.util.set.Sets; @@ -29,6 +29,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; import java.io.IOException; import java.util.Collections; @@ -85,8 +86,9 @@ public void testVotingConfiguration() { public void testVotingConfigurationSerializationEqualsHashCode() { VotingConfiguration initialConfig = randomVotingConfig(); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialConfig, - orig -> ESTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), VotingConfiguration::new), - cfg -> randomlyChangeVotingConfiguration(cfg)); + (CopyFunction) orig -> ESTestCase.copyWriteable(orig, + new NamedWriteableRegistry(Collections.emptyList()), VotingConfiguration::new), + cfg -> randomlyChangeVotingConfiguration(cfg)); } private static VotingConfiguration randomVotingConfig() { @@ -96,7 +98,8 @@ private static VotingConfiguration randomVotingConfig() { public void testVotingTombstoneSerializationEqualsHashCode() { VotingConfigExclusion tombstone = new VotingConfigExclusion(randomAlphaOfLength(10), randomAlphaOfLength(10)); EqualsHashCodeTestUtils.checkEqualsAndHashCode(tombstone, - orig -> ESTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), VotingConfigExclusion::new), + (CopyFunction) orig -> ESTestCase.copyWriteable(orig, + new NamedWriteableRegistry(Collections.emptyList()), VotingConfigExclusion::new), orig -> randomlyChangeVotingTombstone(orig)); } @@ -149,7 +152,8 @@ public void testCoordinationMetaDataSerializationEqualsHashCode() { CoordinationMetaData initialMetaData = new CoordinationMetaData(randomNonNegativeLong(), randomVotingConfig(), randomVotingConfig(), randomVotingTombstones()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialMetaData, - orig -> ESTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), CoordinationMetaData::new), + (CopyFunction) orig -> ESTestCase.copyWriteable(orig, + new NamedWriteableRegistry(Collections.emptyList()), CoordinationMetaData::new), meta -> { CoordinationMetaData.Builder builder = CoordinationMetaData.builder(meta); switch (randomInt(3)) { diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java index beda4ef1a8c4c..ae4201d800198 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java @@ -30,6 +30,7 @@ import org.elasticsearch.common.settings.Settings.Builder; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; import org.elasticsearch.test.transport.MockTransport; import org.elasticsearch.threadpool.ThreadPool.Names; import org.elasticsearch.transport.ConnectTransportException; @@ -378,7 +379,7 @@ public String toString() { public void testFollowerCheckRequestEqualsHashCodeSerialization() { EqualsHashCodeTestUtils.checkEqualsAndHashCode(new FollowerCheckRequest(randomNonNegativeLong(), new DiscoveryNode(randomAlphaOfLength(10), buildNewFakeTransportAddress(), Version.CURRENT)), - rq -> copyWriteable(rq, writableRegistry(), FollowerCheckRequest::new), + (CopyFunction) rq -> copyWriteable(rq, writableRegistry(), FollowerCheckRequest::new), rq -> { if (randomBoolean()) { return new FollowerCheckRequest(rq.getTerm(), diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java index f9132033e6112..71edba9666af9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java @@ -29,6 +29,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; import org.elasticsearch.test.transport.CapturingTransport; import org.elasticsearch.test.transport.MockTransport; import org.elasticsearch.threadpool.ThreadPool.Names; @@ -388,7 +389,7 @@ public void testLeaderCheckRequestEqualsHashcodeSerialization() { LeaderCheckRequest request = new LeaderCheckRequest( new DiscoveryNode(randomAlphaOfLength(10), buildNewFakeTransportAddress(), Version.CURRENT)); EqualsHashCodeTestUtils.checkEqualsAndHashCode(request, - rq -> copyWriteable(rq, writableRegistry(), LeaderCheckRequest::new), + (CopyFunction) rq -> copyWriteable(rq, writableRegistry(), LeaderCheckRequest::new), rq -> new LeaderCheckRequest(new DiscoveryNode(randomAlphaOfLength(10), buildNewFakeTransportAddress(), Version.CURRENT))); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java index d885f42e554f0..80899dd4429b9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; import java.util.Optional; @@ -38,7 +39,7 @@ public void testJoinEqualsHashCodeSerialization() { randomNonNegativeLong(), randomNonNegativeLong()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialJoin, - join -> copyWriteable(join, writableRegistry(), Join::new), + (CopyFunction) join -> copyWriteable(join, writableRegistry(), Join::new), join -> { switch (randomInt(4)) { case 0: @@ -80,7 +81,7 @@ public void testPublishRequestEqualsHashCode() { public void testPublishResponseEqualsHashCodeSerialization() { PublishResponse initialPublishResponse = new PublishResponse(randomNonNegativeLong(), randomNonNegativeLong()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPublishResponse, - publishResponse -> copyWriteable(publishResponse, writableRegistry(), PublishResponse::new), + (CopyFunction) publishResponse -> copyWriteable(publishResponse, writableRegistry(), PublishResponse::new), publishResponse -> { switch (randomInt(1)) { case 0: @@ -105,7 +106,8 @@ public void testPublishWithJoinResponseEqualsHashCodeSerialization() { PublishWithJoinResponse initialPublishWithJoinResponse = new PublishWithJoinResponse(initialPublishResponse, randomBoolean() ? Optional.empty() : Optional.of(initialJoin)); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPublishWithJoinResponse, - publishWithJoinResponse -> copyWriteable(publishWithJoinResponse, writableRegistry(), PublishWithJoinResponse::new), + (CopyFunction) publishWithJoinResponse -> copyWriteable(publishWithJoinResponse, + writableRegistry(), PublishWithJoinResponse::new), publishWithJoinResponse -> { switch (randomInt(1)) { case 0: @@ -127,7 +129,8 @@ public void testPublishWithJoinResponseEqualsHashCodeSerialization() { public void testStartJoinRequestEqualsHashCodeSerialization() { StartJoinRequest initialStartJoinRequest = new StartJoinRequest(createNode(randomAlphaOfLength(10)), randomNonNegativeLong()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialStartJoinRequest, - startJoinRequest -> copyWriteable(startJoinRequest, writableRegistry(), StartJoinRequest::new), + (CopyFunction) startJoinRequest -> copyWriteable(startJoinRequest, writableRegistry(), + StartJoinRequest::new), startJoinRequest -> { switch (randomInt(1)) { case 0: @@ -147,7 +150,7 @@ public void testApplyCommitEqualsHashCodeSerialization() { ApplyCommitRequest initialApplyCommit = new ApplyCommitRequest(createNode(randomAlphaOfLength(10)), randomNonNegativeLong(), randomNonNegativeLong()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialApplyCommit, - applyCommit -> copyWriteable(applyCommit, writableRegistry(), ApplyCommitRequest::new), + (CopyFunction) applyCommit -> copyWriteable(applyCommit, writableRegistry(), ApplyCommitRequest::new), applyCommit -> { switch (randomInt(2)) { case 0: @@ -173,7 +176,7 @@ public void testJoinRequestEqualsHashCodeSerialization() { JoinRequest initialJoinRequest = new JoinRequest(initialJoin.getSourceNode(), randomBoolean() ? Optional.empty() : Optional.of(initialJoin)); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialJoinRequest, - joinRequest -> copyWriteable(joinRequest, writableRegistry(), JoinRequest::new), + (CopyFunction) joinRequest -> copyWriteable(joinRequest, writableRegistry(), JoinRequest::new), joinRequest -> { if (randomBoolean() && joinRequest.getOptionalJoin().isPresent() == false) { return new JoinRequest(createNode(randomAlphaOfLength(20)), joinRequest.getOptionalJoin()); @@ -201,7 +204,7 @@ public ClusterState randomClusterState() { public void testPreVoteRequestEqualsHashCodeSerialization() { PreVoteRequest initialPreVoteRequest = new PreVoteRequest(createNode(randomAlphaOfLength(10)), randomNonNegativeLong()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPreVoteRequest, - preVoteRequest -> copyWriteable(preVoteRequest, writableRegistry(), PreVoteRequest::new), + (CopyFunction) preVoteRequest -> copyWriteable(preVoteRequest, writableRegistry(), PreVoteRequest::new), preVoteRequest -> { if (randomBoolean()) { return new PreVoteRequest(createNode(randomAlphaOfLength(10)), preVoteRequest.getCurrentTerm()); @@ -216,7 +219,7 @@ public void testPreVoteResponseEqualsHashCodeSerialization() { PreVoteResponse initialPreVoteResponse = new PreVoteResponse(currentTerm, randomLongBetween(1, currentTerm), randomNonNegativeLong()); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPreVoteResponse, - preVoteResponse -> copyWriteable(preVoteResponse, writableRegistry(), PreVoteResponse::new), + (CopyFunction) preVoteResponse -> copyWriteable(preVoteResponse, writableRegistry(), PreVoteResponse::new), preVoteResponse -> { switch (randomInt(2)) { case 0: diff --git a/server/src/test/java/org/elasticsearch/discovery/PeerFinderMessagesTests.java b/server/src/test/java/org/elasticsearch/discovery/PeerFinderMessagesTests.java index aabb77b67eef9..fb714e8ce6ecc 100644 --- a/server/src/test/java/org/elasticsearch/discovery/PeerFinderMessagesTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/PeerFinderMessagesTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; import java.util.ArrayList; import java.util.Arrays; @@ -45,7 +46,7 @@ public void testPeersRequestEqualsHashCodeSerialization() { Arrays.stream(generateRandomStringArray(10, 10, false)).map(this::createNode).collect(Collectors.toList())); EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPeersRequest, - publishRequest -> copyWriteable(publishRequest, writableRegistry(), PeersRequest::new), + (CopyFunction) publishRequest -> copyWriteable(publishRequest, writableRegistry(), PeersRequest::new), in -> { final List discoveryNodes = new ArrayList<>(in.getKnownPeers()); if (randomBoolean()) { @@ -69,7 +70,7 @@ public void testPeersResponseEqualsHashCodeSerialization() { } EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialPeersResponse, - publishResponse -> copyWriteable(publishResponse, writableRegistry(), PeersResponse::new), + (CopyFunction) publishResponse -> copyWriteable(publishResponse, writableRegistry(), PeersResponse::new), in -> { final long term = in.getTerm(); if (randomBoolean()) {