X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2Factors%2Fdds%2FDistributedDataStoreClientActor.java;h=69e0d5db502bd00382be8ff88ba2278e08a6d91d;hp=45875baa150682e01a7bc3bc6e5a6d6404c46ada;hb=5cb0787412ab63a3aa5dcc044511e1ce569662cf;hpb=a510fba141230ce9fe8301f9eb0198cc09df46ca

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DistributedDataStoreClientActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DistributedDataStoreClientActor.java
index 45875baa15..69e0d5db50 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DistributedDataStoreClientActor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DistributedDataStoreClientActor.java
@@ -7,41 +7,27 @@
  */
 package org.opendaylight.controller.cluster.databroker.actors.dds;
 
-import akka.actor.ActorRef;
 import akka.actor.Props;
-import akka.util.Timeout;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import org.opendaylight.controller.cluster.access.client.AbstractClientActor;
 import org.opendaylight.controller.cluster.access.client.ClientActorContext;
 import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.FrontendType;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
-import org.opendaylight.controller.cluster.common.actor.ExplicitAsk;
 import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
-import scala.Function1;
-import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
 
 /**
  * A {@link AbstractClientActor} which acts as the point of contact for DistributedDataStore.
  *
  * @author Robert Varga
  */
-public final class DistributedDataStoreClientActor extends AbstractClientActor {
-    private static final Function1<ActorRef, ?> GET_CLIENT_FACTORY = ExplicitAsk.toScala(t -> new GetClientRequest(t));
-
-    private final ActorContext actorContext;
-
+public final class DistributedDataStoreClientActor extends AbstractDataStoreClientActor {
     private DistributedDataStoreClientActor(final FrontendIdentifier frontendId, final ActorContext actorContext) {
-        super(frontendId);
-        this.actorContext = Preconditions.checkNotNull(actorContext);
+        super(frontendId, actorContext);
     }
 
     @Override
-    protected DistributedDataStoreClientBehavior initialBehavior(final ClientActorContext context) {
+    AbstractDataStoreClientBehavior initialBehavior(final ClientActorContext context, final ActorContext actorContext) {
         return new DistributedDataStoreClientBehavior(context, actorContext);
     }
 
@@ -52,15 +38,4 @@ public final class DistributedDataStoreClientActor extends AbstractClientActor {
         return Props.create(DistributedDataStoreClientActor.class,
             () -> new DistributedDataStoreClientActor(frontendId, ctx));
     }
-
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public static DistributedDataStoreClient getDistributedDataStoreClient(@Nonnull final ActorRef actor,
-            final long timeout, final TimeUnit unit) {
-        try {
-            return (DistributedDataStoreClient) Await.result(ExplicitAsk.ask(actor, GET_CLIENT_FACTORY,
-                Timeout.apply(timeout, unit)), Duration.Inf());
-        } catch (Exception e) {
-            throw Throwables.propagate(e);
-        }
-    }
 }