import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFalseFluentFuture;
+import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateNullFluentFuture;
+import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateTrueFluentFuture;
import com.google.common.base.Throwables;
+import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.ImmutableMap;
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FluentFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.SynchronousQueue;
import org.mockito.stubbing.Answer;
import org.opendaylight.controller.cluster.datastore.DistributedDataStore;
import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
-import org.opendaylight.controller.md.sal.common.api.data.DataStoreUnavailableException;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeCommitCohortRegistry;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
-import org.opendaylight.controller.sal.core.spi.data.DOMStore;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.DataStoreUnavailableException;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
+import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
+import org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper;
+import org.opendaylight.mdsal.dom.spi.store.DOMStore;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
+import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
*/
public class ConcurrentDOMDataBrokerTest {
- private final DOMDataWriteTransaction transaction = mock(DOMDataWriteTransaction.class);
+ private final DOMDataTreeWriteTransaction transaction = mock(DOMDataTreeWriteTransaction.class);
private final DOMStoreThreePhaseCommitCohort mockCohort1 = mock(DOMStoreThreePhaseCommitCohort.class);
private final DOMStoreThreePhaseCommitCohort mockCohort2 = mock(DOMStoreThreePhaseCommitCohort.class);
private final ThreadPoolExecutor futureExecutor =
public void setup() {
doReturn("tx").when(transaction).getIdentifier();
- DOMStore store = new InMemoryDOMDataStore("OPER",
- MoreExecutors.newDirectExecutorService());
+ DOMStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.newDirectExecutorService());
coordinator = new ConcurrentDOMDataBroker(ImmutableMap.of(LogicalDatastoreType.OPERATIONAL, store),
futureExecutor);
Answer<ListenableFuture<Boolean>> asyncCanCommit = invocation -> {
final SettableFuture<Boolean> future = SettableFuture.create();
if (doAsync) {
- new Thread() {
- @Override
- public void run() {
- Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue,
- 10, TimeUnit.SECONDS);
- future.set(true);
- }
- }.start();
+ new Thread(() -> {
+ Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue,
+ 10, TimeUnit.SECONDS);
+ future.set(Boolean.TRUE);
+ }).start();
} else {
- future.set(true);
+ future.set(Boolean.TRUE);
}
return future;
};
doAnswer(asyncCanCommit).when(mockCohort1).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).commit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).preCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).commit();
- doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).commit();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort2).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).preCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).commit();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
- transaction, Arrays.asList(mockCohort1, mockCohort2));
+ ListenableFuture<? extends CommitInfo> future =
+ coordinator.commit(transaction, Arrays.asList(mockCohort1, mockCohort2));
final CountDownLatch doneLatch = new CountDownLatch(1);
final AtomicReference<Throwable> caughtEx = new AtomicReference<>();
- Futures.addCallback(future, new FutureCallback<Void>() {
+ Futures.addCallback(future, new FutureCallback<CommitInfo>() {
@Override
- public void onSuccess(final Void result) {
+ public void onSuccess(final CommitInfo result) {
doneLatch.countDown();
}
caughtEx.set(failure);
doneLatch.countDown();
}
- });
+ }, MoreExecutors.directExecutor());
asyncCanCommitContinue.countDown();
- assertEquals("Submit complete", true, doneLatch.await(5, TimeUnit.SECONDS));
+ assertTrue("Submit complete", doneLatch.await(5, TimeUnit.SECONDS));
if (caughtEx.get() != null) {
- Throwables.propagate(caughtEx.get());
+ Throwables.throwIfUnchecked(caughtEx.get());
+ throw new RuntimeException(caughtEx.get());
}
assertEquals("Task count", doAsync ? 1 : 0, futureExecutor.getTaskCount());
@Test
public void testSubmitWithNegativeCanCommitResponse() throws Exception {
- doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).abort();
- doReturn(Futures.immediateFuture(false)).when(mockCohort2).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort();
+ doReturn(Futures.immediateFuture(Boolean.FALSE)).when(mockCohort2).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).abort();
DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class);
- doReturn(Futures.immediateFuture(false)).when(mockCohort3).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort();
+ doReturn(Futures.immediateFuture(Boolean.FALSE)).when(mockCohort3).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort3).abort();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
+ ListenableFuture<? extends CommitInfo> future = coordinator.commit(
transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3));
assertFailure(future, null, mockCohort1, mockCohort2, mockCohort3);
}
- private static void assertFailure(final CheckedFuture<Void, TransactionCommitFailedException> future,
- final Exception expCause, final DOMStoreThreePhaseCommitCohort... mockCohorts)
- throws Exception {
+ private static void assertFailure(final ListenableFuture<?> future, final Exception expCause,
+ final DOMStoreThreePhaseCommitCohort... mockCohorts) throws Exception {
try {
- future.checkedGet(5, TimeUnit.SECONDS);
+ future.get(5, TimeUnit.SECONDS);
fail("Expected TransactionCommitFailedException");
- } catch (TransactionCommitFailedException e) {
+ } catch (ExecutionException e) {
+ TransactionCommitFailedException tcf = TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER.apply(e);
if (expCause != null) {
- assertSame("Expected cause", expCause.getClass(), e.getCause().getClass());
+ assertSame("Expected cause", expCause.getClass(), tcf.getCause().getClass());
}
InOrder inOrder = inOrder((Object[])mockCohorts);
@Test
public void testSubmitWithCanCommitException() throws Exception {
- doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).abort();
IllegalStateException cause = new IllegalStateException("mock");
doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).abort();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
+ FluentFuture<? extends CommitInfo> future = coordinator.commit(
transaction, Arrays.asList(mockCohort1, mockCohort2));
assertFailure(future, cause, mockCohort1, mockCohort2);
@Test
public void testSubmitWithCanCommitDataStoreUnavailableException() throws Exception {
- doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).abort();
NoShardLeaderException rootCause = new NoShardLeaderException("mock");
DataStoreUnavailableException cause = new DataStoreUnavailableException(rootCause.getMessage(), rootCause);
doReturn(Futures.immediateFailedFuture(rootCause)).when(mockCohort2).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).abort();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
+ FluentFuture<? extends CommitInfo> future = coordinator.commit(
transaction, Arrays.asList(mockCohort1, mockCohort2));
assertFailure(future, cause, mockCohort1, mockCohort2);
@Test
public void testSubmitWithPreCommitException() throws Exception {
- doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).preCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).abort();
- doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort2).canCommit();
IllegalStateException cause = new IllegalStateException("mock");
doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).preCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).abort();
DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class);
- doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort3).canCommit();
doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2")))
.when(mockCohort3).preCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort3).abort();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
+ FluentFuture<? extends CommitInfo> future = coordinator.commit(
transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3));
assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3);
@Test
public void testSubmitWithCommitException() throws Exception {
- doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).commit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).preCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).commit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort1).abort();
- doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort2).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).preCommit();
IllegalStateException cause = new IllegalStateException("mock");
doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).commit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).abort();
DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class);
- doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort3).preCommit();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort3).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort3).preCommit();
doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2")))
.when(mockCohort3).commit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort3).abort();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
+ FluentFuture<? extends CommitInfo> future = coordinator.commit(
transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3));
assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3);
@Test
public void testSubmitWithAbortException() throws Exception {
- doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit();
+ doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit();
doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock abort error")))
.when(mockCohort1).abort();
IllegalStateException cause = new IllegalStateException("mock canCommit error");
doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort();
+ doReturn(immediateNullFluentFuture()).when(mockCohort2).abort();
- CheckedFuture<Void, TransactionCommitFailedException> future = coordinator.submit(
+ FluentFuture<? extends CommitInfo> future = coordinator.commit(
transaction, Arrays.asList(mockCohort1, mockCohort2));
assertFailure(future, cause, mockCohort1, mockCohort2);
try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of(
LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION,
configDomStore), futureExecutor)) {
- DOMDataReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction();
+ DOMDataTreeReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction();
dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class));
dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class));
try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of(
LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION,
configDomStore), futureExecutor)) {
- DOMDataWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction();
+ DOMDataTreeWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction();
dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class));
dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class));
try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of(
LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION,
configDomStore), futureExecutor)) {
- DOMDataReadOnlyTransaction dataTxn = dataBroker.newReadOnlyTransaction();
+ DOMDataTreeReadTransaction dataTxn = dataBroker.newReadOnlyTransaction();
dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY);
dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY);
doReturn(mockStoreReadWriteTransaction).when(operationalDomStore).newReadWriteTransaction();
doReturn(mockCohort).when(mockStoreReadWriteTransaction).ready();
- doReturn(Futures.immediateFuture(false)).when(mockCohort).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohort).abort();
+ doReturn(immediateFalseFluentFuture()).when(mockCohort).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohort).abort();
final CountDownLatch latch = new CountDownLatch(1);
final List<DOMStoreThreePhaseCommitCohort> commitCohorts = new ArrayList<>();
LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION,
configDomStore), futureExecutor) {
@Override
- public CheckedFuture<Void, TransactionCommitFailedException> submit(DOMDataWriteTransaction writeTx,
+ public FluentFuture<? extends CommitInfo> commit(DOMDataTreeWriteTransaction writeTx,
Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
commitCohorts.addAll(cohorts);
latch.countDown();
- return super.submit(writeTx, cohorts);
+ return super.commit(writeTx, cohorts);
}
}) {
- DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction();
+ DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction();
domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY);
- domDataReadWriteTransaction.submit();
+ domDataReadWriteTransaction.commit();
assertTrue(latch.await(10, TimeUnit.SECONDS));
doReturn(configTransaction).when(configDomStore).newReadWriteTransaction();
doReturn(mockCohortOperational).when(operationalTransaction).ready();
- doReturn(Futures.immediateFuture(false)).when(mockCohortOperational).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohortOperational).abort();
+ doReturn(immediateFalseFluentFuture()).when(mockCohortOperational).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohortOperational).abort();
doReturn(mockCohortConfig).when(configTransaction).ready();
- doReturn(Futures.immediateFuture(false)).when(mockCohortConfig).canCommit();
- doReturn(Futures.immediateFuture(null)).when(mockCohortConfig).abort();
+ doReturn(immediateFalseFluentFuture()).when(mockCohortConfig).canCommit();
+ doReturn(immediateNullFluentFuture()).when(mockCohortConfig).abort();
final CountDownLatch latch = new CountDownLatch(1);
final List<DOMStoreThreePhaseCommitCohort> commitCohorts = new ArrayList<>();
LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION,
configDomStore), futureExecutor) {
@Override
- public CheckedFuture<Void, TransactionCommitFailedException> submit(DOMDataWriteTransaction transaction,
+ @SuppressWarnings("checkstyle:hiddenField")
+ public FluentFuture<? extends CommitInfo> commit(DOMDataTreeWriteTransaction writeTx,
Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
commitCohorts.addAll(cohorts);
latch.countDown();
- return super.submit(transaction, cohorts);
+ return super.commit(writeTx, cohorts);
}
}) {
- DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction();
+ DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction();
domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY,
mock(NormalizedNode.class));
domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY,
mock(NormalizedNode.class));
- domDataReadWriteTransaction.submit();
+ domDataReadWriteTransaction.commit();
assertTrue(latch.await(10, TimeUnit.SECONDS));
LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore),
futureExecutor)) {
- dataBroker.createTransactionChain(mock(TransactionChainListener.class));
+ dataBroker.createTransactionChain(mock(DOMTransactionChainListener.class));
verify(domStore, times(2)).createTransactionChain();
}
doReturn(operationalTransaction).when(mockChain).newWriteOnlyTransaction();
DOMTransactionChain transactionChain = dataBroker.createTransactionChain(
- mock(TransactionChainListener.class));
+ mock(DOMTransactionChainListener.class));
- DOMDataWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction();
+ DOMDataTreeWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction();
verify(mockChain, never()).newWriteOnlyTransaction();
LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore),
futureExecutor)) {
- CheckedFuture<Void, TransactionCommitFailedException> submit1 =
- dataBroker.newWriteOnlyTransaction().submit();
+ FluentFuture<? extends CommitInfo> submit1 = dataBroker.newWriteOnlyTransaction().commit();
assertNotNull(submit1);
submit1.get();
- CheckedFuture<Void, TransactionCommitFailedException> submit2 =
- dataBroker.newReadWriteTransaction().submit();
+ FluentFuture<? extends CommitInfo> submit2 = dataBroker.newReadWriteTransaction().commit();
assertNotNull(submit2);
LogicalDatastoreType.OPERATIONAL, mockOperStore,
LogicalDatastoreType.CONFIGURATION, mockConfigStore), futureExecutor)) {
- Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> supportedExtensions =
- dataBroker.getSupportedExtensions();
- assertNotNull(supportedExtensions.get(DOMDataTreeChangeService.class));
+ ClassToInstanceMap<DOMDataBrokerExtension> supportedExtensions = dataBroker.getExtensions();
+ assertNotNull(supportedExtensions.getInstance(DOMDataTreeChangeService.class));
- DOMDataTreeCommitCohortRegistry cohortRegistry =
- (DOMDataTreeCommitCohortRegistry) supportedExtensions.get(DOMDataTreeCommitCohortRegistry.class);
+ DOMDataTreeCommitCohortRegistry cohortRegistry = supportedExtensions.getInstance(
+ DOMDataTreeCommitCohortRegistry.class);
assertNotNull(cohortRegistry);
DOMDataTreeCommitCohort mockCohort = mock(DOMDataTreeCommitCohort.class);
Code Review / controller.git / blobdiff