Bump MRI upstreams

[netconf.git] / restconf / restconf-nb-rfc8040 / src / test / java / org / opendaylight / restconf / nb / rfc8040 / jersey / providers / ParameterAwareNormalizedNodeWriterDepthTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java
index 91be11e2517d386dccae2bfca44151ee466fe08b..ba3a8aff393579b2bd436920fedf0e773d95a921 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java
@@ -64,13 +64,13 @@ public class ParameterAwareNormalizedNodeWriterDepthTest {
     private NodeIdentifier mapNodeIdentifier;
     private NodeIdentifierWithPredicates mapEntryNodeIdentifier;
     private NodeIdentifier leafSetNodeIdentifier;
-    private NodeWithValue<?> leafSetEntryNodeIdentifier;
+    private NodeWithValue<String> leafSetEntryNodeIdentifier;
     private NodeIdentifier keyLeafNodeIdentifier;
     private NodeIdentifier anotherLeafNodeIdentifier;
 
-    private Collection<DataContainerChild<?, ?>> containerNodeValue;
+    private Collection<DataContainerChild> containerNodeValue;
     private Collection<MapEntryNode> mapNodeValue;
-    private Collection<DataContainerChild<?, ?>> mapEntryNodeValue;
+    private Collection<DataContainerChild> mapEntryNodeValue;
     private Collection<LeafSetEntryNode<String>> leafSetNodeValue;
     private String leafSetEntryNodeValue;
     private String keyLeafNodeValue;
@@ -81,7 +81,6 @@ public class ParameterAwareNormalizedNodeWriterDepthTest {
         // identifiers
         containerNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "container"));
         when(containerNodeData.getIdentifier()).thenReturn(containerNodeIdentifier);
-        when(containerNodeData.getNodeType()).thenReturn(containerNodeIdentifier.getNodeType());
 
         mapNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "list"));
         when(mapNodeData.getIdentifier()).thenReturn(mapNodeIdentifier);
@@ -101,31 +100,31 @@ public class ParameterAwareNormalizedNodeWriterDepthTest {
         mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of(
                 QName.create("namespace", "list-entry"), mapEntryNodeKey, keyLeafNodeValue);
         when(mapEntryNodeData.getIdentifier()).thenReturn(mapEntryNodeIdentifier);
-        when(mapEntryNodeData.getChild(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData));
+        when(mapEntryNodeData.findChildByArg(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData));
 
-        when(keyLeafNodeData.getValue()).thenReturn(keyLeafNodeValue);
+        when(keyLeafNodeData.body()).thenReturn(keyLeafNodeValue);
         when(keyLeafNodeData.getIdentifier()).thenReturn(keyLeafNodeIdentifier);
 
         anotherLeafNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "another-field"));
         anotherLeafNodeValue = "another-value";
 
-        when(anotherLeafNodeData.getValue()).thenReturn(anotherLeafNodeValue);
+        when(anotherLeafNodeData.body()).thenReturn(anotherLeafNodeValue);
         when(anotherLeafNodeData.getIdentifier()).thenReturn(anotherLeafNodeIdentifier);
 
         // values
-        when(leafSetEntryNodeData.getValue()).thenReturn(leafSetEntryNodeValue);
+        when(leafSetEntryNodeData.body()).thenReturn(leafSetEntryNodeValue);
 
         leafSetNodeValue = Collections.singletonList(leafSetEntryNodeData);
-        when(leafSetNodeData.getValue()).thenReturn(leafSetNodeValue);
+        when(leafSetNodeData.body()).thenReturn(leafSetNodeValue);
 
         containerNodeValue = Collections.singleton(leafSetNodeData);
-        when(containerNodeData.getValue()).thenReturn(containerNodeValue);
+        when(containerNodeData.body()).thenReturn(containerNodeValue);
 
         mapEntryNodeValue = Sets.newHashSet(keyLeafNodeData, anotherLeafNodeData);
-        when(mapEntryNodeData.getValue()).thenReturn(mapEntryNodeValue);
+        when(mapEntryNodeData.body()).thenReturn(mapEntryNodeValue);
 
         mapNodeValue = Collections.singleton(mapEntryNodeData);
-        when(mapNodeData.getValue()).thenReturn(mapNodeValue);
+        when(mapNodeData.body()).thenReturn(mapNodeValue);
     }
 
     /**