X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fnetwork%2FRequestProcessor.java;h=54a88c5afed759ca94c8cb1e593973ab71bdda52;hb=3cc9cc2152696a25177e965a40d63a5c0ab5f73f;hp=9ce82ed1717e4947e4be4b815e867fe05b74afc6;hpb=33367f76cbe86a300daa70f3c4df945951afd5d9;p=transportpce.git 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 9ce82ed17..54a88c5af 100644 --- 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,16 +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.eclipse.jdt.annotation.NonNull; -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.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; @@ -28,7 +28,7 @@ public class RequestProcessor { private final DataBroker dataBroker; private ReadWriteTransaction rwTx; - private ReadOnlyTransaction readTx; + private ReadTransaction readTx; private ReentrantReadWriteLock lock; @@ -61,13 +61,6 @@ public class RequestProcessor { rwTx.delete(store, path); } - public void put(LogicalDatastoreType store, - InstanceIdentifier path, T data, boolean createMissingParents) { - - acquireLock(); - LOG.debug("Number of put requests waiting in queue :{}", lock.getQueueLength()); - rwTx.put(store, path, data, createMissingParents); - } public void put(LogicalDatastoreType store, InstanceIdentifier path, T data) { @@ -78,14 +71,6 @@ public class RequestProcessor { } - public void merge(LogicalDatastoreType store, - InstanceIdentifier path, T data, boolean createMissingParents) { - - acquireLock(); - LOG.debug("Number of merge requests waiting in queue :{}", lock.getQueueLength()); - rwTx.merge(store, path, data, createMissingParents); - } - public void merge(LogicalDatastoreType store, InstanceIdentifier path, T data) {