Peel DataSchemaNode-only users of InstanceIdentifierContext

[netconf.git] / restconf / restconf-nb-bierman02 / src / test / java / org / opendaylight / controller / sal / restconf / impl / nn / to / xml / test / NnToXmlTest.java

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
index ac52922dc14242fdf8468580198b48fd294c78d1..dc56907b15b59212b367a0497c7f8f6d08944a24 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
@@ -304,10 +304,8 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
 
         contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue(object).build());
 
-        final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build());
-
-        return testNormalizedNodeContext;
+        return new NormalizedNodeContext(InstanceIdentifierContext.ofDataSchemaNode(schemaContext, contSchema),
+                contData.build());
     }
 
     private void nnToXml(final NormalizedNodeContext normalizedNodeContext, final String... xmlRepresentation)
@@ -343,7 +341,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue("true").build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build());
+                InstanceIdentifierContext.ofDataSchemaNode(schemaContext, contSchema), contData.build());
 
         return testNormalizedNodeContext;
     }
@@ -363,7 +361,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue("value").build());
 
         return new NormalizedNodeContext(
-                new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build());
+                InstanceIdentifierContext.ofDataSchemaNode(schemaContext, contSchema), contData.build());
     }
 
     private static NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) {
@@ -397,7 +395,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(cont1Data.build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build());
+                InstanceIdentifierContext.ofDataSchemaNode(schemaContext, contSchema), contData.build());
         return testNormalizedNodeContext;
     }