Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / StructuralApplyModificationTest.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralApplyModificationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralApplyModificationTest.java
index 5e0389b5512cc19f938038913cfa96461cc42920..1adb18187a65a4b317ed26a79d22307364415288 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralApplyModificationTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralApplyModificationTest.java
@@ -32,7 +32,7 @@ public final class StructuralApplyModificationTest extends AbstractTestModelTest
     @Before
     public void setUp() {
         inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION);
-        inMemoryDataTree.setSchemaContext(SCHEMA_CONTEXT);
+        inMemoryDataTree.setEffectiveModelContext(SCHEMA_CONTEXT);
     }
 
     @Test
@@ -44,8 +44,8 @@ public final class StructuralApplyModificationTest extends AbstractTestModelTest
         addListEntryModification.write(YangInstanceIdentifier.create(rootContainerId),
             Builders.containerBuilder().withNodeIdentifier(rootContainerId).build());
 
-        final YangInstanceIdentifier.NodeIdentifierWithPredicates outerListEntryId =
-            new YangInstanceIdentifier.NodeIdentifierWithPredicates(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1);
+        final NodeIdentifierWithPredicates outerListEntryId = NodeIdentifierWithPredicates.of(
+            TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1);
 
         // Write list entry (MapEntryNode) without creating list parent (MapNode)
         final MapEntryNode outerListEntry = Builders.mapEntryBuilder().withNodeIdentifier(outerListEntryId).build();
@@ -129,7 +129,7 @@ public final class StructuralApplyModificationTest extends AbstractTestModelTest
 
     private void assertNodeExistence(final YangInstanceIdentifier outerListParentPath, final boolean shouldBePresent) {
         final DataTreeSnapshot snapshotAfterCommits = inMemoryDataTree.takeSnapshot();
-        final Optional<NormalizedNode<?, ?>> readNode = snapshotAfterCommits.readNode(outerListParentPath);
+        final Optional<NormalizedNode> readNode = snapshotAfterCommits.readNode(outerListParentPath);
         assertEquals(readNode.isPresent(), shouldBePresent);
     }
 
@@ -138,6 +138,6 @@ public final class StructuralApplyModificationTest extends AbstractTestModelTest
     }
 
     private static NodeIdentifierWithPredicates getNId(final QName qname, final QName key, final String val) {
-        return new NodeIdentifierWithPredicates(qname, key, val);
+        return NodeIdentifierWithPredicates.of(qname, key, val);
     }
 }