Bump MRI upstreams

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

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/NormalizedNodeXmlBodyWriter.java
index da2b0212778dc9d2b25cde273eeda63b99f8a651..ef0bfd992ed314dae3174a38c5a6264babe20b26 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/NormalizedNodeXmlBodyWriter.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/NormalizedNodeXmlBodyWriter.java
@@ -99,16 +99,16 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter<Normalized
         } catch (final XMLStreamException | FactoryConfigurationError e) {
             throw new IllegalStateException(e);
         }
-        final NormalizedNode<?, ?> data = context.getData();
+        final NormalizedNode data = context.getData();
         final SchemaPath schemaPath = pathContext.getSchemaNode().getPath();
 
         writeNormalizedNode(xmlWriter, schemaPath, pathContext, data, context.getWriterParameters().getDepth(),
                 context.getWriterParameters().getFields());
     }
 
-    private static void writeNormalizedNode(final XMLStreamWriter xmlWriter,
-            final SchemaPath path, final InstanceIdentifierContext<?> pathContext, final NormalizedNode<?, ?> data,
-            final Integer depth, final List<Set<QName>> fields) throws IOException {
+    private static void writeNormalizedNode(final XMLStreamWriter xmlWriter, final SchemaPath path,
+            final InstanceIdentifierContext<?> pathContext, final NormalizedNode data, final Integer depth,
+            final List<Set<QName>> fields) throws IOException {
         final RestconfNormalizedNodeWriter nnWriter;
         final EffectiveModelContext schemaCtx = pathContext.getSchemaContext();
 
@@ -142,7 +142,9 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter<Normalized
             if (data instanceof MapEntryNode) {
                 // Restconf allows returning one list item. We need to wrap it
                 // in map node in order to serialize it properly
-                nnWriter.write(ImmutableNodes.mapNodeBuilder(data.getNodeType()).addChild((MapEntryNode) data).build());
+                nnWriter.write(ImmutableNodes.mapNodeBuilder(data.getIdentifier().getNodeType())
+                    .addChild((MapEntryNode) data)
+                    .build());
             } else {
                 nnWriter.write(data);
             }
@@ -161,12 +163,12 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter<Normalized
 
     private static void writeElements(final XMLStreamWriter xmlWriter, final RestconfNormalizedNodeWriter nnWriter,
             final ContainerNode data) throws IOException {
-        final QName name = data.getNodeType();
+        final QName name = data.getIdentifier().getNodeType();
         try {
             xmlWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX,
                     name.getLocalName(), name.getNamespace().toString());
             xmlWriter.writeDefaultNamespace(name.getNamespace().toString());
-            for (final NormalizedNode<?,?> child : data.getValue()) {
+            for (final NormalizedNode child : data.body()) {
                 nnWriter.write(child);
             }
             nnWriter.flush();