import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
this.txIdentifier = checkNotNull(readWriteTxId);
this.initialReadMap = Maps.newEnumMap(LogicalDatastoreType.class);
- final InMemoryDataTreeFactory treeFactory = InMemoryDataTreeFactory.getInstance();
+ final InMemoryDataTreeFactory treeFactory = new InMemoryDataTreeFactory();
final ImmutableMap.Builder<LogicalDatastoreType, DataTreeSnapshot> snapshotMapBuilder = ImmutableMap.builder();
final ImmutableMap.Builder<LogicalDatastoreType, Queue<Modification>> modificationHistoryMapBuilder
= ImmutableMap.builder();
for (final LogicalDatastoreType store : LogicalDatastoreType.values()) {
- final DataTree tree = treeFactory.create(treeTypeForStore(store));
+ final DataTree tree = treeFactory.create(treeConfigForStore(store));
tree.setSchemaContext(ctx);
snapshotMapBuilder.put(store, tree.takeSnapshot());
mod.write(path, result.get());
}
applyModificationHistoryToSnapshot(mod, currentHistory);
- readResult.set(mod.readNode(path));
+ readResult.set(Optional.fromJavaUtil(mod.readNode(path)));
}
@Override
private void initialRead(final YangInstanceIdentifier path) {
root = path;
- final InMemoryDataTreeFactory treeFactory = InMemoryDataTreeFactory.getInstance();
for (final LogicalDatastoreType store : LogicalDatastoreType.values()) {
initialReadMap.put(store, readTxDelegate.read(store, path));
}
}
- private TreeType treeTypeForStore(final LogicalDatastoreType store) {
- return store == LogicalDatastoreType.CONFIGURATION ? TreeType.CONFIGURATION : TreeType.OPERATIONAL;
+ private static DataTreeConfiguration treeConfigForStore(final LogicalDatastoreType store) {
+ return store == LogicalDatastoreType.CONFIGURATION ? DataTreeConfiguration.DEFAULT_CONFIGURATION
+ : DataTreeConfiguration.DEFAULT_OPERATIONAL;
}
- private void applyModificationHistoryToSnapshot(final DataTreeModification dataTreeModification,
+ private static void applyModificationHistoryToSnapshot(final DataTreeModification dataTreeModification,
final Queue<Modification> modificationHistory) {
while (!modificationHistory.isEmpty()) {
final Modification modification = modificationHistory.poll();