From a70cc70f49501749ca4f6139080b0899b6b6e6f8 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Fri, 26 Jun 2020 11:31:19 +0200
Subject: [PATCH] Simplify LocalTransactionContext

... by reverting to a variant of the previous executeModification()
implementation.

Change-Id: I9a0480868bce2682e4ecc0e635a4db9f897d8511
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 .../datastore/LocalTransactionContext.java    | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

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 c494cf415a..b201486fb2 100644
--- 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 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;
@@ -48,13 +49,12 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
 
     protected abstract DOMStoreReadTransaction getReadDelegate();
 
-    @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
-    public void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+    private void executeModification(Consumer<DOMStoreWriteTransaction> consumer) {
         incrementModificationCount();
         if (operationError == null) {
             try {
-                getWriteDelegate().delete(path);
+                consumer.accept(getWriteDelegate());
             } catch (Exception e) {
                 operationError = e;
             }
@@ -62,31 +62,20 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     }
 
     @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) {
-        incrementModificationCount();
-        if (operationError == null) {
-            try {
-                getWriteDelegate().merge(path, data);
-            } catch (Exception e) {
-                operationError = e;
-            }
-        }
+        executeModification(transaction -> transaction.merge(path, data));
     }
 
     @Override
-    @SuppressWarnings("checkstyle:IllegalCatch")
     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
-- 
2.36.6