*/
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 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.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 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 scala.concurrent.Future;
/**
LocalTransactionContext(final DOMStoreTransaction txDelegate, final TransactionIdentifier identifier,
final LocalTransactionReadySupport readySupport) {
super(identifier);
- this.txDelegate = Preconditions.checkNotNull(txDelegate);
+ this.txDelegate = requireNonNull(txDelegate);
this.readySupport = readySupport;
}
@Override
public void onFailure(final Throwable failure) {
- proxyFuture.setException(failure);
+ proxyFuture.setException(failure instanceof Exception
+ ? ReadFailedException.MAPPER.apply((Exception) failure) : failure);
}
}, MoreExecutors.directExecutor());
}
}
@Override
- public Future<ActorSelection> readyTransaction(final Boolean havePermit) {
+ public Future<ActorSelection> readyTransaction(final Boolean havePermit,
+ final Optional<SortedSet<String>> participatingShardNames) {
final LocalThreePhaseCommitCohort cohort = ready();
- return cohort.initiateCoordinatedCommit();
+ return cohort.initiateCoordinatedCommit(participatingShardNames);
}
@Override