InstanceIdentifierContext does not take generics

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

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
index c9dd5c5ad6f551a578b7c78a5ccb292295d9612c..ab7bc38fac3c49af86ea07acb0393f88cbb21b37 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
@@ -21,15 +21,15 @@ import javax.ws.rs.core.MediaType;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.controller.sal.rest.impl.test.providers.AbstractBodyReaderTest;
+import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeXmlBodyWriter;
 import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
-import org.opendaylight.restconf.common.context.NormalizedNodeContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.SchemaAwareBuilders;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -94,12 +94,8 @@ public class NnToXmlWithDataFromSeveralModulesTest extends
     private static NormalizedNodeContext prepareNormalizedNodeContext() {
         final String rev = "2014-01-17";
 
-        final DataSchemaNode schemaContNode = schemaContext;
-
-        assertTrue(schemaContNode instanceof ContainerSchemaNode);
-
-        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataContSchemaContNode = Builders
-                .containerBuilder((ContainerSchemaNode) schemaContNode);
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataContSchemaContNode = SchemaAwareBuilders
+                .containerBuilder(schemaContext);
 
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> modul1 = buildContBuilderMod1(
                 "module:one", rev, "cont_m1", "contB_m1", "lf1_m1",
@@ -112,8 +108,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends
         dataContSchemaContNode.withChild(modul2.build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<>(null,
-                        schemaContNode, null, schemaContext),
+                new InstanceIdentifierContext(null, schemaContext, null, schemaContext),
                 dataContSchemaContNode.build());
 
         return testNormalizedNodeContext;
@@ -128,7 +123,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends
 
         final DataSchemaNode contSchemaNode = schemaContext
                 .getDataChildByName(contQname);
-        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataContainerNodeAttrBuilder = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataContainerNodeAttrBuilder = SchemaAwareBuilders
                 .containerBuilder((ContainerSchemaNode) contSchemaNode);
 
         Preconditions.checkState(contSchemaNode instanceof ContainerSchemaNode);
@@ -138,14 +133,14 @@ public class NnToXmlWithDataFromSeveralModulesTest extends
                         lf1Qname.getLocalName());
         final DataSchemaNode schemaLf1_m1 = Iterables.getFirst(instanceLf1_m1, null);
 
-        dataContainerNodeAttrBuilder.withChild(Builders
+        dataContainerNodeAttrBuilder.withChild(SchemaAwareBuilders
                 .leafBuilder((LeafSchemaNode) schemaLf1_m1)
                 .withValue(lf1Value).build());
 
         final DataSchemaNode contBSchemaNode = ((ContainerSchemaNode) contSchemaNode)
                 .getDataChildByName(contBQname);
 
-        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataContainerB = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataContainerB = SchemaAwareBuilders
                 .containerBuilder((ContainerSchemaNode) contBSchemaNode);
 
         return dataContainerNodeAttrBuilder.withChild(dataContainerB.build());