fix import extra separations

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / device / DeviceTransaction.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java
index 3ee2964ce641e8398aaf9ca122bf5c138864402c..6fb91d21f4e7e3dec55bfd404c03c2119740d43e 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java
@@ -8,21 +8,19 @@
 
 package org.opendaylight.transportpce.common.device;
 
-import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nullable;
 import org.eclipse.jdt.annotation.NonNull;
-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.ReadWriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -64,6 +62,7 @@ public class DeviceTransaction {
         rwTx.put(store, path, data);
     }
 
+    @Deprecated
     public <T extends DataObject> void put(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
             boolean createMissingParents) {
         rwTx.put(store, path, data, createMissingParents);
@@ -73,6 +72,7 @@ public class DeviceTransaction {
         rwTx.merge(store, path, data);
     }
 
+    @Deprecated
     public <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
             boolean createMissingParents) {
         rwTx.merge(store, path, data, createMissingParents);
@@ -99,43 +99,13 @@ public class DeviceTransaction {
     }
 
     /**
-     * Submits data changed in transaction to device with defined timeout to submit. If time from timeout runs out then
-     * submit will be interrupted and device will be unlocked.
+     * Submits data changed in transaction to device with defined timeout to commit. If time from timeout runs out then
+     * the commit will be interrupted and the device will be unlocked.
      *
      * @param timeout a timeout
      * @param timeUnit a time unit
-     * @return ListenableFuture which indicates when is submit completed.
+     * @return FluentFuture which indicates when the commit is completed.
      */
-    @Deprecated
-    public ListenableFuture<Void> submit(long timeout, TimeUnit timeUnit) {
-        if (wasSubmittedOrCancelled.get()) {
-            String msg = "Transaction was already submitted or canceled!";
-            LOG.error(msg);
-            return Futures.immediateFailedFuture(new IllegalStateException(msg));
-        }
-
-        LOG.debug("Transaction submitted. Lock: {}", deviceLock);
-        wasSubmittedOrCancelled.set(true);
-        ListenableFuture<Void> future =
-                Futures.withTimeout(rwTx.submit(), timeout, timeUnit, scheduledExecutorService);
-
-        Futures.addCallback(future, new FutureCallback<Void>() {
-            @Override
-            public void onSuccess(@Nullable Void result) {
-                LOG.debug("Transaction with lock {} successfully submitted.", deviceLock);
-                afterClose();
-            }
-
-            @Override
-            public void onFailure(Throwable throwable) {
-                LOG.error("Device transaction submit failed or submit took longer than {} {}! Unlocking device.",
-                    timeout, timeUnit, throwable);
-                afterClose();
-            }
-        }, scheduledExecutorService);
-        return future;
-    }
-
     public FluentFuture<? extends @NonNull CommitInfo> commit(long timeout, TimeUnit timeUnit) {
         if (wasSubmittedOrCancelled.get()) {
             String msg = "Transaction was already submitted or canceled!";
@@ -150,8 +120,8 @@ public class DeviceTransaction {
 
         future.addCallback(new FutureCallback<CommitInfo>() {
             @Override
-            public void onSuccess(@Nullable CommitInfo result) {
-                LOG.debug("Transaction with lock {} successfully committed:", deviceLock, result);
+            public void onSuccess(CommitInfo result) {
+                LOG.debug("Transaction with lock {} successfully committed: {}", deviceLock, result);
                 afterClose();
             }