Remove javax.annotation nullness annotations

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

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java
index 1c7429a45cf3893eaf60f21f2b21e9af90c63b0c..3158b4925b179b0ac12f7063a2756dab5b0bf929 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java
@@ -5,35 +5,27 @@
  * 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.netconf.topology.singleton.impl;
 
 import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
-import com.google.common.base.Verify;
-import java.util.Collections;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 import org.opendaylight.netconf.topology.singleton.impl.tx.ProxyReadTransaction;
 import org.opendaylight.netconf.topology.singleton.impl.tx.ProxyReadWriteTransaction;
-import org.opendaylight.netconf.topology.singleton.impl.tx.ProxyWriteTransaction;
-import org.opendaylight.netconf.topology.singleton.messages.transactions.NewReadTransactionReply;
 import org.opendaylight.netconf.topology.singleton.messages.transactions.NewReadTransactionRequest;
-import org.opendaylight.netconf.topology.singleton.messages.transactions.NewReadWriteTransactionReply;
 import org.opendaylight.netconf.topology.singleton.messages.transactions.NewReadWriteTransactionRequest;
-import org.opendaylight.netconf.topology.singleton.messages.transactions.NewWriteTransactionReply;
 import org.opendaylight.netconf.topology.singleton.messages.transactions.NewWriteTransactionRequest;
-import scala.concurrent.Await;
+import scala.concurrent.ExecutionContext;
 import scala.concurrent.Future;
 
 public class ProxyDOMDataBroker implements DOMDataBroker {
@@ -41,92 +33,52 @@ public class ProxyDOMDataBroker implements DOMDataBroker {
     private final Timeout askTimeout;
     private final RemoteDeviceId id;
     private final ActorRef masterNode;
-    private final ActorSystem actorSystem;
+    private final ExecutionContext executionContext;
 
     /**
      * Constructor for {@code ProxyDOMDataBroker}.
      *
-     * @param actorSystem system
      * @param id          id
      * @param masterNode  {@link org.opendaylight.netconf.topology.singleton.impl.actors.NetconfNodeActor} ref
+     * @param executionContext ExecutionContext
      * @param askTimeout  ask timeout
      */
-    public ProxyDOMDataBroker(final ActorSystem actorSystem, final RemoteDeviceId id,
-                              final ActorRef masterNode, final Timeout askTimeout) {
+    public ProxyDOMDataBroker(final RemoteDeviceId id, final ActorRef masterNode,
+            final ExecutionContext executionContext, final Timeout askTimeout) {
         this.id = id;
         this.masterNode = masterNode;
-        this.actorSystem = actorSystem;
+        this.executionContext = executionContext;
         this.askTimeout = askTimeout;
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
-    public DOMDataReadOnlyTransaction newReadOnlyTransaction() {
+    public DOMDataTreeReadTransaction newReadOnlyTransaction() {
         final Future<Object> txActorFuture = Patterns.ask(masterNode, new NewReadTransactionRequest(), askTimeout);
-        final Object msg;
-        try {
-            msg = Await.result(txActorFuture, askTimeout.duration());
-        } catch (Exception e) {
-            throw new IllegalStateException("Can't create ProxyReadTransaction", e);
-        }
-
-        if (msg instanceof Exception) {
-            throw new IllegalStateException("Can't create ProxyReadTransaction", (Exception) msg);
-        }
-
-        Verify.verify(msg instanceof NewReadTransactionReply);
-        final NewReadTransactionReply reply = (NewReadTransactionReply) msg;
-        return new ProxyReadTransaction(reply.getTxActor(), id, actorSystem, askTimeout);
+        return new ProxyReadTransaction(id, txActorFuture, executionContext, askTimeout);
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
-    public DOMDataReadWriteTransaction newReadWriteTransaction() {
+    public DOMDataTreeReadWriteTransaction newReadWriteTransaction() {
         final Future<Object> txActorFuture = Patterns.ask(masterNode, new NewReadWriteTransactionRequest(), askTimeout);
-        final Object msg;
-        try {
-            msg = Await.result(txActorFuture, askTimeout.duration());
-        } catch (Exception e) {
-            throw new IllegalStateException("Can't create ProxyReadWriteTransaction", e);
-        }
-
-        if (msg instanceof Exception) {
-            throw new IllegalStateException("Can't create ProxyReadWriteTransaction", (Exception) msg);
-        }
-
-        Verify.verify(msg instanceof NewReadWriteTransactionReply);
-        final NewReadWriteTransactionReply reply = (NewReadWriteTransactionReply) msg;
-        return new ProxyReadWriteTransaction(reply.getTxActor(), id, actorSystem, askTimeout);
+        return new ProxyReadWriteTransaction(id, txActorFuture, executionContext, askTimeout);
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
-    public DOMDataWriteTransaction newWriteOnlyTransaction() {
+    public DOMDataTreeWriteTransaction newWriteOnlyTransaction() {
         final Future<Object> txActorFuture = Patterns.ask(masterNode, new NewWriteTransactionRequest(), askTimeout);
-        final Object msg;
-        try {
-            msg = Await.result(txActorFuture, askTimeout.duration());
-        } catch (Exception e) {
-            throw new IllegalStateException("Can't create ProxyWriteTransaction", e);
-        }
-
-        if (msg instanceof Exception) {
-            throw new IllegalStateException("Can't create ProxyWriteTransaction", (Exception) msg);
-        }
-
-        Verify.verify(msg instanceof NewWriteTransactionReply);
-        final NewWriteTransactionReply reply = (NewWriteTransactionReply) msg;
-        return new ProxyWriteTransaction(reply.getTxActor(), id, actorSystem, askTimeout);
+        return new ProxyReadWriteTransaction(id, txActorFuture, executionContext, askTimeout);
     }
 
     @Override
-    public DOMTransactionChain createTransactionChain(final TransactionChainListener listener) {
+    public DOMTransactionChain createTransactionChain(final DOMTransactionChainListener listener) {
         throw new UnsupportedOperationException(id + ": Transaction chains not supported for netconf mount point");
     }
 
-    @Nonnull
     @Override
-    public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
-        return Collections.emptyMap();
+    public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
+        return ImmutableClassToInstanceMap.of();
     }
 }