Bump versions to 4.0.0-SNAPSHOT

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / sharding / ShardingServiceAddressResolver.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java
index b443a69e1f06de79aeeff862c8f86288dc85e88c..1ad5c389e233e1ff1c5ac90816a06ca68b3309c1 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java
@@ -5,11 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.sharding;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
 import akka.actor.Address;
-import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -19,6 +20,7 @@ import org.opendaylight.controller.cluster.access.concepts.MemberName;
 /**
  * Resolver for remote {@link ShardedDataTreeActor}'s.
  */
+@Deprecated(forRemoval = true)
 public class ShardingServiceAddressResolver {
 
     private final ConcurrentMap<MemberName, Address> memberNameToAddress = new ConcurrentHashMap<>();
@@ -60,11 +62,8 @@ public class ShardingServiceAddressResolver {
     }
 
     public String resolve(final MemberName memberName) {
-        Preconditions.checkNotNull(memberName);
-        final Address address = memberNameToAddress.get(memberName);
-        Preconditions.checkNotNull(address, "Requested member[%s] is not present in the resolver ",
-                memberName.toString());
-
+        final Address address = memberNameToAddress.get(requireNonNull(memberName));
+        checkNotNull(address, "Requested member[%s] is not present in the resolver", memberName);
         return getActorPathBuilder(address).toString();
     }
 }