X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDistributedDataStoreWithSegmentedJournalIntegrationTest.java;h=b5b3f92f59a8a82003605b0417f44cc1faecd170;hb=118cd0216b0c6b0ec1a01689ec2025a13e090861;hp=1e7da9c587e8630224a14b81db75bf4d3cfbd593;hpb=a180ad35e1006969a390739ef2f3694fd9fcad48;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java index 1e7da9c587..b5b3f92f59 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java @@ -44,8 +44,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; @RunWith(Parameterized.class) public class DistributedDataStoreWithSegmentedJournalIntegrationTest @@ -93,7 +94,7 @@ public class DistributedDataStoreWithSegmentedJournalIntegrationTest @Test public void testManyWritesDeletes() throws Exception { final IntegrationTestKit testKit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); - CollectionNodeBuilder carMapBuilder = ImmutableNodes.mapNodeBuilder(CAR_QNAME); + CollectionNodeBuilder carMapBuilder = ImmutableNodes.mapNodeBuilder(CAR_QNAME); try (AbstractDataStore dataStore = testKit.setupAbstractDataStore( testParameter, "testManyWritesDeletes", "module-shards-cars-member-1.conf", true, "cars")) { @@ -126,7 +127,7 @@ public class DistributedDataStoreWithSegmentedJournalIntegrationTest } } - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); @@ -160,7 +161,7 @@ public class DistributedDataStoreWithSegmentedJournalIntegrationTest DOMStoreTransactionChain txChain = dataStore.createTransactionChain(); MapNode cars = carMapBuilder.build(); - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("restored cars do not match snapshot", cars, optional.get());