X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FLocalTransactionContext.java;h=b201486fb2267c8bad28e8cd5d0ecbc9bf045bb4;hp=75cdd1b597c0bc29bf8ee8df4745b8a97902d147;hb=987e2e706d0b343304142626bc870f3e8c909b51;hpb=2becbbc76732b4845a660ea9e5352cd7087e0f73

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 75cdd1b597..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
@@ -7,16 +7,22 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
+import static java.util.Objects.requireNonNull;
+
 import akka.actor.ActorSelection;
-import com.google.common.base.Optional;
-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 org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
+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.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;
@@ -32,10 +38,10 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     private final LocalTransactionReadySupport readySupport;
     private Exception operationError;
 
-    LocalTransactionContext(DOMStoreTransaction txDelegate, TransactionIdentifier identifier,
-            LocalTransactionReadySupport readySupport) {
+    LocalTransactionContext(final DOMStoreTransaction txDelegate, final TransactionIdentifier identifier,
+            final LocalTransactionReadySupport readySupport) {
         super(identifier);
-        this.txDelegate = Preconditions.checkNotNull(txDelegate);
+        this.txDelegate = requireNonNull(txDelegate);
         this.readySupport = readySupport;
     }
 
@@ -43,71 +49,50 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
 
     protected abstract DOMStoreReadTransaction getReadDelegate();
 
-    @Override
-    public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    private void executeModification(Consumer<DOMStoreWriteTransaction> consumer) {
         incrementModificationCount();
-        if(operationError == null) {
+        if (operationError == null) {
             try {
-                getWriteDelegate().write(path, data);
+                consumer.accept(getWriteDelegate());
             } catch (Exception e) {
                 operationError = e;
             }
         }
-
     }
 
     @Override
-    public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
-        incrementModificationCount();
-        if(operationError == null) {
-            try {
-                getWriteDelegate().merge(path, data);
-            } catch (Exception e) {
-                operationError = e;
-            }
-        }
+    public void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+        executeModification(transaction -> transaction.delete(path));
     }
 
     @Override
-    public void deleteData(YangInstanceIdentifier path) {
-        incrementModificationCount();
-        if(operationError == null) {
-            try {
-                getWriteDelegate().delete(path);
-            } catch (Exception e) {
-                operationError = e;
-            }
-        }
+    public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
+            final Boolean havePermit) {
+        executeModification(transaction -> transaction.merge(path, data));
     }
 
     @Override
-    public void readData(YangInstanceIdentifier path, final SettableFuture<Optional<NormalizedNode<?, ?>>> proxyFuture) {
-        Futures.addCallback(getReadDelegate().read(path), new FutureCallback<Optional<NormalizedNode<?, ?>>>() {
-            @Override
-            public void onSuccess(final Optional<NormalizedNode<?, ?>> result) {
-                proxyFuture.set(result);
-            }
-
-            @Override
-            public void onFailure(final Throwable t) {
-                proxyFuture.setException(t);
-            }
-        });
+    public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
+            final Boolean havePermit) {
+        executeModification(transaction -> transaction.write(path, data));
     }
 
     @Override
-    public void dataExists(YangInstanceIdentifier path, final SettableFuture<Boolean> proxyFuture) {
-        Futures.addCallback(getReadDelegate().exists(path), new FutureCallback<Boolean>() {
+    public <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
+            final Boolean havePermit) {
+        Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
             @Override
-            public void onSuccess(final Boolean result) {
+            public void onSuccess(final T result) {
                 proxyFuture.set(result);
             }
 
             @Override
-            public void onFailure(final Throwable t) {
-                proxyFuture.setException(t);
+            public void onFailure(final Throwable failure) {
+                proxyFuture.setException(failure instanceof Exception
+                        ? ReadFailedException.MAPPER.apply((Exception) failure) : failure);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     private LocalThreePhaseCommitCohort ready() {
@@ -116,22 +101,18 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     }
 
     @Override
-    public Future<ActorSelection> readyTransaction() {
+    public Future<ActorSelection> readyTransaction(final Boolean havePermit,
+            final Optional<SortedSet<String>> participatingShardNames) {
         final LocalThreePhaseCommitCohort cohort = ready();
-        return cohort.initiateCoordinatedCommit();
+        return cohort.initiateCoordinatedCommit(participatingShardNames);
     }
 
     @Override
-    public Future<Object> directCommit() {
+    public Future<Object> directCommit(final Boolean havePermit) {
         final LocalThreePhaseCommitCohort cohort = ready();
         return cohort.initiateDirectCommit();
     }
 
-    @Override
-    public boolean supportsDirectCommit() {
-        return true;
-    }
-
     @Override
     public void closeTransaction() {
         txDelegate.close();