Bump upstreams

[netconf.git] / plugins / netconf-server-mdsal / src / main / java / org / opendaylight / netconf / server / mdsal / operations / CopyConfig.java

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.java
index c1aeaad34bc3e935791b99e5e052f0517ea66869..b56535e6d9a6297fa17b8ab79de5a7ed8c9d98a2 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.java
@@ -43,7 +43,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWrit
 import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -102,10 +102,10 @@ public final class CopyConfig extends AbstractEdit {
 
         // Then create nodes present in the <config> element:
         for (final XmlElement element : configElements) {
-            final NormalizedNodeResult resultHolder = new NormalizedNodeResult();
+            final NormalizationResultHolder resultHolder = new NormalizationResultHolder();
             parseIntoNormalizedNode(getSchemaNodeFromNamespace(element.getNamespace(), element), element,
                 ImmutableNormalizedNodeStreamWriter.from(resultHolder));
-            final NormalizedNode data = resultHolder.getResult();
+            final NormalizedNode data = resultHolder.getResult().data();
             final YangInstanceIdentifier path = YangInstanceIdentifier.create(data.getIdentifier());
             // Doing merge instead of put to support top-level list:
             rwTx.merge(LogicalDatastoreType.CONFIGURATION, path, data);