Merge "Bug 9256: Add websocket server config knob for ip"

[netconf.git] / netconf / netconf-topology-singleton / src / main / java / org / opendaylight / netconf / topology / singleton / impl / actors / ReadTransactionActor.java

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActor.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActor.java
index b6bf651ea277518e80753b77f177922fd94d69c1..777140cd4fc2974fdc4e9f6aad71d09a62ad3b7c 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActor.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActor.java
@@ -8,30 +8,21 @@
 
 package org.opendaylight.netconf.topology.singleton.impl.actors;
 
-import akka.actor.ActorRef;
 import akka.actor.Props;
 import akka.actor.UntypedActor;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
-import org.opendaylight.netconf.topology.singleton.messages.NormalizedNodeMessage;
-import org.opendaylight.netconf.topology.singleton.messages.transactions.EmptyReadResponse;
-import org.opendaylight.netconf.topology.singleton.messages.transactions.ExistsRequest;
-import org.opendaylight.netconf.topology.singleton.messages.transactions.ReadRequest;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.netconf.topology.singleton.messages.transactions.ReadActorMessage;
 
 /**
  * ReadTransactionActor is an interface to device's {@link DOMDataReadOnlyTransaction} for cluster nodes.
  */
 public class ReadTransactionActor extends UntypedActor {
 
-    private final DOMDataReadOnlyTransaction tx;
+    private final ReadAdapter readAdapter;
+
+    private ReadTransactionActor(final DOMDataReadOnlyTransaction tx) {
+        readAdapter = new ReadAdapter(tx);
+    }
 
     /**
      * Creates new actor Props.
@@ -43,68 +34,13 @@ public class ReadTransactionActor extends UntypedActor {
         return Props.create(ReadTransactionActor.class, () -> new ReadTransactionActor(tx));
     }
 
-    private ReadTransactionActor(final DOMDataReadOnlyTransaction tx) {
-        this.tx = tx;
-    }
-
     @Override
     public void onReceive(final Object message) throws Throwable {
-        if (message instanceof ReadRequest) {
-
-            final ReadRequest readRequest = (ReadRequest) message;
-            final YangInstanceIdentifier path = readRequest.getPath();
-            final LogicalDatastoreType store = readRequest.getStore();
-            read(path, store, sender(), self());
-
-        } else if (message instanceof ExistsRequest) {
-            final ExistsRequest readRequest = (ExistsRequest) message;
-            final YangInstanceIdentifier path = readRequest.getPath();
-            final LogicalDatastoreType store = readRequest.getStore();
-            exists(path, store, sender(), self());
-
+        if (message instanceof ReadActorMessage) {
+            readAdapter.handle(message, sender(), self());
         } else {
             unhandled(message);
         }
     }
 
-    private void read(final YangInstanceIdentifier path, final LogicalDatastoreType store, final ActorRef sender,
-                      final ActorRef self) {
-        final CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read = tx.read(store, path);
-        Futures.addCallback(read, new FutureCallback<Optional<NormalizedNode<?, ?>>>() {
-
-            @Override
-            public void onSuccess(final Optional<NormalizedNode<?, ?>> result) {
-                if (!result.isPresent()) {
-                    sender.tell(new EmptyReadResponse(), self);
-                    return;
-                }
-                sender.tell(new NormalizedNodeMessage(path, result.get()), self);
-            }
-
-            @Override
-            public void onFailure(@Nonnull final Throwable throwable) {
-                sender.tell(throwable, self);
-            }
-        });
-    }
-
-    private void exists(final YangInstanceIdentifier path, final LogicalDatastoreType store, final ActorRef sender,
-                        final ActorRef self) {
-        final CheckedFuture<Boolean, ReadFailedException> readFuture = tx.exists(store, path);
-        Futures.addCallback(readFuture, new FutureCallback<Boolean>() {
-            @Override
-            public void onSuccess(final Boolean result) {
-                if (result == null) {
-                    sender.tell(false, self);
-                } else {
-                    sender.tell(result, self);
-                }
-            }
-
-            @Override
-            public void onFailure(@Nonnull final Throwable throwable) {
-                sender.tell(throwable, self);
-            }
-        });
-    }
 }