import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.CheckedFuture;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
NormalizedNode<?, ?> expectedNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
NormalizedNode<?, ?> expectedNode2 = ImmutableNodes.containerNode(CarsModel.CARS_QNAME);
- Optional<NormalizedNode<?, ?>> optional = NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.builder().build(),
- Lists.newArrayList(
+ Optional<NormalizedNode<?, ?>> optional = NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.EMPTY,
+ ImmutableList.of(
Optional.<NormalizedNode<?, ?>>of(getRootNode(expectedNode1, schemaContext)),
Optional.<NormalizedNode<?, ?>>of(getRootNode(expectedNode2, schemaContext))),
- schemaContext);
+ schemaContext, LogicalDatastoreType.CONFIGURATION);
NormalizedNode<?,?> normalizedNode = optional.get();
}
- public static NormalizedNode<?,?> getRootNode(NormalizedNode<?, ?> moduleNode, SchemaContext schemaContext) throws ReadFailedException, ExecutionException, InterruptedException {
- InMemoryDOMDataStore store = new InMemoryDOMDataStore("test", Executors.newSingleThreadExecutor());
- store.onGlobalContextUpdated(schemaContext);
+ public static NormalizedNode<?, ?> getRootNode(NormalizedNode<?, ?> moduleNode, SchemaContext schemaContext)
+ throws ReadFailedException, ExecutionException, InterruptedException {
+ try (InMemoryDOMDataStore store = new InMemoryDOMDataStore("test", Executors.newSingleThreadExecutor())) {
+ store.onGlobalContextUpdated(schemaContext);
- DOMStoreWriteTransaction writeTransaction = store.newWriteOnlyTransaction();
+ DOMStoreWriteTransaction writeTransaction = store.newWriteOnlyTransaction();
- writeTransaction.merge(YangInstanceIdentifier.builder().node(moduleNode.getNodeType()).build(), moduleNode);
+ writeTransaction.merge(YangInstanceIdentifier.of(moduleNode.getNodeType()), moduleNode);
- DOMStoreThreePhaseCommitCohort ready = writeTransaction.ready();
+ DOMStoreThreePhaseCommitCohort ready = writeTransaction.ready();
- ready.canCommit().get();
- ready.preCommit().get();
- ready.commit().get();
+ ready.canCommit().get();
+ ready.preCommit().get();
+ ready.commit().get();
- DOMStoreReadTransaction readTransaction = store.newReadOnlyTransaction();
+ DOMStoreReadTransaction readTransaction = store.newReadOnlyTransaction();
- CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read = readTransaction.read(YangInstanceIdentifier.builder().build());
+ CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read = readTransaction
+ .read(YangInstanceIdentifier.EMPTY);
- Optional<NormalizedNode<?, ?>> nodeOptional = read.checkedGet();
+ Optional<NormalizedNode<?, ?>> nodeOptional = read.checkedGet();
- return nodeOptional.get();
+ return nodeOptional.get();
+ }
}
public static NormalizedNode<?,?> findChildWithQName(Collection<NormalizedNode<?, ?>> collection, QName qName) {