From bdaf6bbf2576f28e77c19251dc462c394303aced Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Wed, 20 Jul 2016 01:38:12 -0400 Subject: [PATCH] Fix compiler error due to removal of InMemoryDataTreeFactory.create Change-Id: I016c1beeb55a438ba56b8076c7e792c79ac51294 Signed-off-by: Tom Pantelis --- .../cluster/datastore/TransactionProxy.java | 4 +++- .../datastore/utils/NormalizedNodeAggregator.java | 15 ++++++++++----- .../utils/NormalizedNodeAggregatorTest.java | 3 ++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java index af4c899e56..191cb2ef1e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java @@ -130,7 +130,9 @@ public class TransactionProxy extends AbstractDOMStoreTransaction> apply(final List>> input) { try { - return NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.EMPTY, input, txContextFactory.getActorContext().getSchemaContext()); + return NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.EMPTY, input, + txContextFactory.getActorContext().getSchemaContext(), + txContextFactory.getActorContext().getDatastoreContext().getLogicalStoreType()); } catch (DataValidationFailedException e) { throw new IllegalArgumentException("Failed to aggregate", e); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java index 18604587f1..c0965675e0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java @@ -9,12 +9,14 @@ package org.opendaylight.controller.cluster.datastore.utils; import com.google.common.base.Optional; import java.util.List; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; 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.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; +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; @@ -24,11 +26,12 @@ public class NormalizedNodeAggregator { private final DataTree dataTree; private NormalizedNodeAggregator(final YangInstanceIdentifier rootIdentifier, final List>> nodes, - final SchemaContext schemaContext) { + final SchemaContext schemaContext, LogicalDatastoreType logicalDatastoreType) { this.rootIdentifier = rootIdentifier; this.nodes = nodes; - // FIXME: BUG-1014: pass down proper DataTree - this.dataTree = InMemoryDataTreeFactory.getInstance().create(); + this.dataTree = InMemoryDataTreeFactory.getInstance().create( + logicalDatastoreType == LogicalDatastoreType.CONFIGURATION ? TreeType.CONFIGURATION : + TreeType.OPERATIONAL); this.dataTree.setSchemaContext(schemaContext); } @@ -37,13 +40,15 @@ public class NormalizedNodeAggregator { * * @param nodes * @param schemaContext + * @param logicalDatastoreType * @return * @throws DataValidationFailedException */ public static Optional> aggregate(final YangInstanceIdentifier rootIdentifier, final List>> nodes, - final SchemaContext schemaContext) throws DataValidationFailedException { - return new NormalizedNodeAggregator(rootIdentifier, nodes, schemaContext).aggregate(); + final SchemaContext schemaContext, + LogicalDatastoreType logicalDatastoreType) throws DataValidationFailedException { + return new NormalizedNodeAggregator(rootIdentifier, nodes, schemaContext, logicalDatastoreType).aggregate(); } private Optional> aggregate() throws DataValidationFailedException { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java index 453262a8bd..c8d3dd5ea7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java @@ -20,6 +20,7 @@ import org.junit.Test; 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; @@ -45,7 +46,7 @@ public class NormalizedNodeAggregatorTest { ImmutableList.of( Optional.>of(getRootNode(expectedNode1, schemaContext)), Optional.>of(getRootNode(expectedNode2, schemaContext))), - schemaContext); + schemaContext, LogicalDatastoreType.CONFIGURATION); NormalizedNode normalizedNode = optional.get(); -- 2.36.6