Simplify LocalTransactionContext

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / LocalTransactionContext.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
index c494cf415a88566409e843cac01a0a0b26125f69..b201486fb2267c8bad28e8cd5d0ecbc9bf045bb4 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
@@ -16,6 +16,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Optional;
 import java.util.SortedSet;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Optional;
 import java.util.SortedSet;

+import java.util.function.Consumer;

 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
 import org.opendaylight.mdsal.common.api.ReadFailedException;


@@ -48,13 +49,12 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
 
     protected abstract DOMStoreReadTransaction getReadDelegate();
 
 
     protected abstract DOMStoreReadTransaction getReadDelegate();
 

-    @Override

     @SuppressWarnings("checkstyle:IllegalCatch")
     @SuppressWarnings("checkstyle:IllegalCatch")

-    public void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+    private void executeModification(Consumer<DOMStoreWriteTransaction> consumer) {

         incrementModificationCount();
         if (operationError == null) {
             try {
         incrementModificationCount();
         if (operationError == null) {
             try {

-                getWriteDelegate().delete(path);
+                consumer.accept(getWriteDelegate());

             } catch (Exception e) {
                 operationError = e;
             }
             } catch (Exception e) {
                 operationError = e;
             }


@@ -62,31 +62,20 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     }
 
     @Override
     }
 
     @Override

-    @SuppressWarnings("checkstyle:IllegalCatch")
+    public void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+        executeModification(transaction -> transaction.delete(path));
+    }
+
+    @Override

     public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
             final Boolean havePermit) {
     public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
             final Boolean havePermit) {

-        incrementModificationCount();
-        if (operationError == null) {
-            try {
-                getWriteDelegate().merge(path, data);
-            } catch (Exception e) {
-                operationError = e;
-            }
-        }
+        executeModification(transaction -> transaction.merge(path, data));

     }
 
     @Override
     }
 
     @Override

-    @SuppressWarnings("checkstyle:IllegalCatch")

     public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
             final Boolean havePermit) {
     public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
             final Boolean havePermit) {

-        incrementModificationCount();
-        if (operationError == null) {
-            try {
-                getWriteDelegate().write(path, data);
-            } catch (Exception e) {
-                operationError = e;
-            }
-        }
+        executeModification(transaction -> transaction.write(path, data));

     }
 
     @Override
     }
 
     @Override