From 04f55157fe04d82c3b33d12d0e44f87517e415e8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 10 Feb 2016 12:37:38 +0100 Subject: [PATCH] Fix Eclipse errors with Java 8/Scala This adds workarounds for ambiguous method error reported by Eclipse. The issue is reported and analyzed at https://bugs.eclipse.org/bugs/show_bug.cgi?id=468276. This patch adds alternative use of methods which trigger the behavior. Change-Id: If463d4567e3555efff8e11b39e8708d0e51838c1 Signed-off-by: Robert Varga --- .../datastore/RemoteTransactionContextSupport.java | 2 +- .../controller/cluster/datastore/ShardManager.java | 10 +++++----- .../controller/cluster/datastore/ShardManagerTest.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java index 4302ed05d3..e160367a1e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java @@ -110,7 +110,7 @@ final class RemoteTransactionContextSupport { // For write-only Tx's we prepare the transaction modifications directly on the shard actor // to avoid the overhead of creating a separate transaction actor. transactionContextWrapper.executePriorTransactionOperations(createValidTransactionContext( - primaryShard, primaryShard.path().toString(), primaryShardInfo.getPrimaryShardVersion())); + primaryShard, String.valueOf(primaryShard.path()), primaryShardInfo.getPrimaryShardVersion())); } else { tryCreateTransaction(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java index 70bdb2050e..4b511fa376 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java @@ -750,7 +750,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } private void memberRemoved(ClusterEvent.MemberRemoved message) { - String memberName = message.member().roles().head(); + String memberName = message.member().roles().iterator().next(); LOG.debug("{}: Received MemberRemoved: memberName: {}, address: {}", persistenceId(), memberName, message.member().address()); @@ -763,7 +763,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } private void memberExited(ClusterEvent.MemberExited message) { - String memberName = message.member().roles().head(); + String memberName = message.member().roles().iterator().next(); LOG.debug("{}: Received MemberExited: memberName: {}, address: {}", persistenceId(), memberName, message.member().address()); @@ -776,7 +776,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } private void memberUp(ClusterEvent.MemberUp message) { - String memberName = message.member().roles().head(); + String memberName = message.member().roles().iterator().next(); LOG.debug("{}: Received MemberUp: memberName: {}, address: {}", persistenceId(), memberName, message.member().address()); @@ -799,7 +799,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } private void memberReachable(ClusterEvent.ReachableMember message) { - String memberName = message.member().roles().head(); + String memberName = message.member().roles().iterator().next(); LOG.debug("Received ReachableMember: memberName {}, address: {}", memberName, message.member().address()); addPeerAddress(memberName, message.member().address()); @@ -808,7 +808,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } private void memberUnreachable(ClusterEvent.UnreachableMember message) { - String memberName = message.member().roles().head(); + String memberName = message.member().roles().iterator().next(); LOG.debug("Received UnreachableMember: memberName {}, address: {}", memberName, message.member().address()); markMemberUnavailable(memberName); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java index 4e45dc4f21..c2af9f9f2d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java @@ -2001,22 +2001,22 @@ public class ShardManagerTest extends AbstractActorTest { if(message instanceof FindPrimary) { findPrimaryMessageReceived.countDown(); } else if(message instanceof ClusterEvent.MemberUp) { - String role = ((ClusterEvent.MemberUp)message).member().roles().head(); + String role = ((ClusterEvent.MemberUp)message).member().roles().iterator().next(); if(!getCluster().getCurrentMemberName().equals(role)) { memberUpReceived.countDown(); } } else if(message instanceof ClusterEvent.MemberRemoved) { - String role = ((ClusterEvent.MemberRemoved)message).member().roles().head(); + String role = ((ClusterEvent.MemberRemoved)message).member().roles().iterator().next(); if(!getCluster().getCurrentMemberName().equals(role)) { memberRemovedReceived.countDown(); } } else if(message instanceof ClusterEvent.UnreachableMember) { - String role = ((ClusterEvent.UnreachableMember)message).member().roles().head(); + String role = ((ClusterEvent.UnreachableMember)message).member().roles().iterator().next(); if(!getCluster().getCurrentMemberName().equals(role)) { memberUnreachableReceived.countDown(); } } else if(message instanceof ClusterEvent.ReachableMember) { - String role = ((ClusterEvent.ReachableMember)message).member().roles().head(); + String role = ((ClusterEvent.ReachableMember)message).member().roles().iterator().next(); if(!getCluster().getCurrentMemberName().equals(role)) { memberReachableReceived.countDown(); } -- 2.36.6