Bump MRI upstreams

[netconf.git] / restconf / restconf-nb-rfc8040 / src / test / java / org / opendaylight / restconf / nb / rfc8040 / utils / mapping / RestconfMappingNodeUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java
index 808e64991db9b73eb24fa21a22741bdbfb4d9716..56aa718dc2e412288258ce88e1793961245408a9 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java
@@ -32,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.mo
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
@@ -91,11 +90,11 @@ public class RestconfMappingNodeUtilTest {
         assertNotNull(normNode);
         final List<Object> listOfValues = new ArrayList<>();
 
-        for (final DataContainerChild<?, ?> child : normNode.getValue()) {
-            if (child.getNodeType().equals(Capabilities.QNAME)) {
-                for (final DataContainerChild<?, ?> dataContainerChild : ((ContainerNode) child).getValue()) {
-                    for (final Object entry : ((LeafSetNode<?>) dataContainerChild).getValue()) {
-                        listOfValues.add(((LeafSetEntryNode<?>) entry).getValue());
+        for (final DataContainerChild child : normNode.body()) {
+            if (child.getIdentifier().getNodeType().equals(Capabilities.QNAME)) {
+                for (final DataContainerChild dataContainerChild : ((ContainerNode) child).body()) {
+                    for (final Object entry : ((LeafSetNode<?>) dataContainerChild).body()) {
+                        listOfValues.add(((LeafSetEntryNode<?>) entry).body());
                     }
                 }
             }
@@ -151,11 +150,11 @@ public class RestconfMappingNodeUtilTest {
 
     private static void assertMappedData(final Map<QName, Object> map, final MapEntryNode mappedData) {
         assertNotNull(mappedData);
-        for (final DataContainerChild<?, ?> child : mappedData.getValue()) {
+        for (final DataContainerChild child : mappedData.body()) {
             if (child instanceof LeafNode) {
                 final LeafNode<?> leaf = (LeafNode<?>) child;
-                assertTrue(map.containsKey(leaf.getNodeType()));
-                assertEquals(map.get(leaf.getNodeType()), leaf.getValue());
+                assertTrue(map.containsKey(leaf.getIdentifier().getNodeType()));
+                assertEquals(map.get(leaf.getIdentifier().getNodeType()), leaf.body());
             }
         }
     }
@@ -168,11 +167,11 @@ public class RestconfMappingNodeUtilTest {
      */
     private static void verifyDeviations(final ContainerNode containerNode) {
         int deviationsFound = 0;
-        for (final DataContainerChild<?, ?> child : containerNode.getValue()) {
+        for (final DataContainerChild child : containerNode.body()) {
             if (child instanceof MapNode) {
-                for (final MapEntryNode mapEntryNode : ((MapNode) child).getValue()) {
-                    for (final DataContainerChild<?, ?> dataContainerChild : mapEntryNode.getValue()) {
-                        if (dataContainerChild.getNodeType()
+                for (final MapEntryNode mapEntryNode : ((MapNode) child).body()) {
+                    for (final DataContainerChild dataContainerChild : mapEntryNode.body()) {
+                        if (dataContainerChild.getIdentifier().getNodeType()
                                 .equals(IetfYangLibrary.SPECIFIC_MODULE_DEVIATION_LIST_QNAME)) {
                             deviationsFound++;
                         }
@@ -190,30 +189,28 @@ public class RestconfMappingNodeUtilTest {
      *             modules
      */
     private static void verifyLoadedModules(final ContainerNode containerNode) {
-
         final Map<String, String> loadedModules = new HashMap<>();
 
-        for (final DataContainerChild<? extends PathArgument, ?> child : containerNode.getValue()) {
+        for (final DataContainerChild child : containerNode.body()) {
             if (child instanceof LeafNode) {
-                assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.getNodeType());
+                assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.getIdentifier().getNodeType());
             }
             if (child instanceof MapNode) {
-                assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.getNodeType());
-                for (final MapEntryNode mapEntryNode : ((MapNode) child).getValue()) {
+                assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.getIdentifier().getNodeType());
+                for (final MapEntryNode mapEntryNode : ((MapNode) child).body()) {
                     String name = "";
                     String revision = "";
-                    for (final DataContainerChild<? extends PathArgument, ?> dataContainerChild : mapEntryNode
-                            .getValue()) {
-                        switch (dataContainerChild.getNodeType().getLocalName()) {
+                    for (final DataContainerChild dataContainerChild : mapEntryNode.body()) {
+                        switch (dataContainerChild.getIdentifier().getNodeType().getLocalName()) {
                             case IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF:
-                                name = String.valueOf(dataContainerChild.getValue());
+                                name = String.valueOf(dataContainerChild.body());
                                 break;
                             case IetfYangLibrary.SPECIFIC_MODULE_REVISION_LEAF:
-                                revision = String.valueOf(dataContainerChild.getValue());
+                                revision = String.valueOf(dataContainerChild.body());
                                 break;
                             default :
                                 LOG.info("Unknown local name '{}' of node.",
-                                        dataContainerChild.getNodeType().getLocalName());
+                                        dataContainerChild.getIdentifier().getNodeType().getLocalName());
                                 break;
                         }
                     }