Add getDataBroker to NetworkTransactionService

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / network / RequestProcessor.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java b/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java
index 807589fd0c9a27a894478e2502e78ab3b5a31c26..810902dd42dc775c2e27e8450dbe614aaf60e7c2 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java
@@ -7,13 +7,16 @@
  */
 package org.opendaylight.transportpce.common.network;
 
-import com.google.common.base.Optional;
+import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Optional;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
@@ -25,7 +28,7 @@ public class RequestProcessor {
 
     private final DataBroker dataBroker;
     private ReadWriteTransaction rwTx;
-    private ReadOnlyTransaction readTx;
+    private ReadTransaction readTx;
     private ReentrantReadWriteLock lock;
 
 
@@ -58,13 +61,6 @@ public class RequestProcessor {
         rwTx.delete(store, path);
     }
 
-    public <T extends DataObject> void put(LogicalDatastoreType store,
-        InstanceIdentifier<T> path, T data, boolean createMissingParents) {
-
-        acquireLock();
-        LOG.debug("Number of put requests waiting in queue :{}", lock.getQueueLength());
-        rwTx.put(store, path, data, createMissingParents);
-    }
 
     public <T extends DataObject> void put(LogicalDatastoreType store,
         InstanceIdentifier<T> path, T data) {
@@ -75,14 +71,6 @@ public class RequestProcessor {
     }
 
 
-    public <T extends DataObject> void merge(LogicalDatastoreType store,
-        InstanceIdentifier<T> path, T data, boolean createMissingParents) {
-
-        acquireLock();
-        LOG.debug("Number of merge requests waiting in queue :{}", lock.getQueueLength());
-        rwTx.merge(store, path, data, createMissingParents);
-    }
-
     public <T extends DataObject> void merge(LogicalDatastoreType store,
         InstanceIdentifier<T> path, T data) {
 
@@ -91,11 +79,10 @@ public class RequestProcessor {
         rwTx.merge(store, path, data);
     }
 
-    @Deprecated
-    public ListenableFuture<Void> submit() {
+    public FluentFuture<? extends @NonNull CommitInfo> commit() {
         acquireLock();
-        ListenableFuture<Void> future = null;
-        future = rwTx.submit();
+        FluentFuture<? extends @NonNull CommitInfo> future = null;
+        future = rwTx.commit();
         releaseLock();
         resetRwTx();
         return future;
@@ -143,4 +130,12 @@ public class RequestProcessor {
         rwTx = dataBroker.newReadWriteTransaction();
         return rwTx;
     }
+
+    /**
+     * Return the dataBroker related to RequestProcessor.
+     * @return the dataBroker
+     */
+    public DataBroker getDataBroker() {
+        return dataBroker;
+    }
 }