Add NormalizationResult

[yangtools.git] / data / yang-data-transform / src / main / java / org / opendaylight / yangtools / transform / NormalizedNodeTransformations.java

diff --git a/data/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java b/data/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
index 906ba72041328bd5ee93d48743a485817a266d44..22e093f18db159277bf8b7ace9a6f01dcaba63b3 100644 (file)
--- a/data/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
+++ b/data/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
@@ -15,10 +15,9 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
 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;
 
 @Beta
 public final class NormalizedNodeTransformations {
@@ -28,12 +27,12 @@ public final class NormalizedNodeTransformations {
 
     public static NormalizedNode transformQNames(final NormalizedNode original,
             final Function<QName, QName> mapping) {
-        NormalizedNodeResult result = new NormalizedNodeResult();
-        NormalizedNodeStreamWriter nodeWriter = ImmutableNormalizedNodeStreamWriter.from(result);
-        NormalizedNodeStreamWriter transformWriter = QNameTransformingStreamWriter.fromFunction(nodeWriter, mapping);
+        final var result = new NormalizationResultHolder();
+        var nodeWriter = ImmutableNormalizedNodeStreamWriter.from(result);
+        var transformWriter = QNameTransformingStreamWriter.fromFunction(nodeWriter, mapping);
         try {
             NormalizedNodeWriter.forStreamWriter(transformWriter).write(original);
-            return result.getResult();
+            return result.getResult().data();
         } catch (IOException e) {
             throw new IllegalArgumentException(e);
         }