X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FLocalTransactionContext.java;h=6b3006941817e05e4a7de6789e67871dda506846;hb=546cd1fd100dbaa36908b22c2f422320dbd8c4b2;hp=f4ade4ff2a63d449fd39c048304d8b16a4f1747f;hpb=731e7284cf0895fdb1b89427f91762e80e67c2ff;p=controller.git

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 f4ade4ff2a..6b30069418 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
@@ -7,20 +7,24 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
+import static java.util.Objects.requireNonNull;
+
 import akka.actor.ActorSelection;
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 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.controller.cluster.datastore.modification.AbstractModification;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransaction;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import scala.concurrent.Future;
 
 /**
@@ -29,7 +33,7 @@ import scala.concurrent.Future;
  *
  * @author Thomas Pantelis
  */
-abstract class LocalTransactionContext extends AbstractTransactionContext {
+abstract class LocalTransactionContext extends TransactionContext {
     private final DOMStoreTransaction txDelegate;
     private final LocalTransactionReadySupport readySupport;
     private Exception operationError;
@@ -37,21 +41,20 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     LocalTransactionContext(final DOMStoreTransaction txDelegate, final TransactionIdentifier identifier,
             final LocalTransactionReadySupport readySupport) {
         super(identifier);
-        this.txDelegate = Preconditions.checkNotNull(txDelegate);
+        this.txDelegate = requireNonNull(txDelegate);
         this.readySupport = readySupport;
     }
 
-    protected abstract DOMStoreWriteTransaction getWriteDelegate();
+    abstract DOMStoreWriteTransaction getWriteDelegate();
 
-    protected abstract DOMStoreReadTransaction getReadDelegate();
+    abstract DOMStoreReadTransaction getReadDelegate();
 
-    @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
-    public void executeModification(final AbstractModification modification, final Boolean havePermit) {
+    private void executeModification(final Consumer<DOMStoreWriteTransaction> consumer) {
         incrementModificationCount();
         if (operationError == null) {
             try {
-                modification.apply(getWriteDelegate());
+                consumer.accept(getWriteDelegate());
             } catch (Exception e) {
                 operationError = e;
             }
@@ -59,7 +62,22 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     }
 
     @Override
-    public <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
+    void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+        executeModification(transaction -> transaction.delete(path));
+    }
+
+    @Override
+    void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
+        executeModification(transaction -> transaction.merge(path, data));
+    }
+
+    @Override
+    void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
+        executeModification(transaction -> transaction.write(path, data));
+    }
+
+    @Override
+    <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
             final Boolean havePermit) {
         Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
             @Override
@@ -69,31 +87,32 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
 
             @Override
             public void onFailure(final Throwable failure) {
-                proxyFuture.setException(failure);
+                proxyFuture.setException(failure instanceof Exception
+                        ? ReadFailedException.MAPPER.apply((Exception) failure) : failure);
             }
         }, MoreExecutors.directExecutor());
     }
 
-    private LocalThreePhaseCommitCohort ready() {
-        logModificationCount();
-        return readySupport.onTransactionReady(getWriteDelegate(), operationError);
-    }
-
     @Override
-    public Future<ActorSelection> readyTransaction(final Boolean havePermit,
+    Future<ActorSelection> readyTransaction(final Boolean havePermit,
             final Optional<SortedSet<String>> participatingShardNames) {
         final LocalThreePhaseCommitCohort cohort = ready();
         return cohort.initiateCoordinatedCommit(participatingShardNames);
     }
 
     @Override
-    public Future<Object> directCommit(final Boolean havePermit) {
+    Future<Object> directCommit(final Boolean havePermit) {
         final LocalThreePhaseCommitCohort cohort = ready();
         return cohort.initiateDirectCommit();
     }
 
     @Override
-    public void closeTransaction() {
+    void closeTransaction() {
         txDelegate.close();
     }
+
+    private LocalThreePhaseCommitCohort ready() {
+        logModificationCount();
+        return readySupport.onTransactionReady(getWriteDelegate(), operationError);
+    }
 }