X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2Factors%2Fdds%2FSimpleShardBackendResolver.java;h=e086f08630240d949375eac31a07bb7d2a0a762d;hb=4db06286a59f00d8cda6c952d5704e89dac9268c;hp=370484d9556f03d8eb677c20f321d9b5fdcb2458;hpb=e6922e3dc95c97418f7158350448fd6e9a74eb87;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/SimpleShardBackendResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/SimpleShardBackendResolver.java
index 370484d955..e086f08630 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/SimpleShardBackendResolver.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/SimpleShardBackendResolver.java
@@ -7,12 +7,14 @@
  */
 package org.opendaylight.controller.cluster.databroker.actors.dds;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import java.util.concurrent.CompletionStage;
 import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.controller.cluster.access.client.BackendInfoResolver;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,14 +34,14 @@ final class SimpleShardBackendResolver extends AbstractShardBackendResolver {
     private volatile ShardState state;
 
     // FIXME: we really need just ActorContext.findPrimaryShardAsync()
-    SimpleShardBackendResolver(final ClientIdentifier clientId, final ActorContext actorContext,
+    SimpleShardBackendResolver(final ClientIdentifier clientId, final ActorUtils actorUtils,
             final String shardName) {
-        super(clientId, actorContext);
-        this.shardName = Preconditions.checkNotNull(shardName);
+        super(clientId, actorUtils);
+        this.shardName = requireNonNull(shardName);
     }
 
     private CompletionStage<ShardBackendInfo> getBackendInfo(final long cookie) {
-        Preconditions.checkArgument(cookie == 0);
+        checkArgument(cookie == 0);
 
         final ShardState existing = state;
         if (existing != null) {
@@ -88,11 +90,16 @@ final class SimpleShardBackendResolver extends AbstractShardBackendResolver {
             synchronized (this) {
                 LOG.debug("Invalidating backend information {}", staleInfo);
                 flushCache(shardName);
-                LOG.trace("Invalidated cache %s", staleInfo);
+                LOG.trace("Invalidated cache {}", staleInfo);
                 state = null;
             }
         }
 
         return getBackendInfo(cookie);
     }
+
+    @Override
+    public String resolveCookieName(Long cookie) {
+        return shardName;
+    }
 }