X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=data%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2FAbstractNormalizableAnydata.java;h=efdad29f542317744a83e0b0e87de918f6c2dc66;hb=f6553f9c9e4d35ed154c9dd736834ea3bf5ca0d5;hp=9ff22eac7ef5485532c7426d43d8c6e881225dee;hpb=93e320e81b03ea15789fa8814a9dbba5754d3b96;p=yangtools.git

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java
index 9ff22eac7e..efdad29f54 100644
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java
@@ -11,6 +11,7 @@ import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import java.io.IOException;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.data.api.schema.AnydataNormalizationException;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizableAnydata;
@@ -29,15 +30,17 @@ public abstract class AbstractNormalizableAnydata implements NormalizableAnydata
     @Override
     public final ImmutableNormalizedAnydata normalizeTo(final EffectiveStatementInference inference)
             throws AnydataNormalizationException {
-        final NormalizedNodeMetadataResult result = new NormalizedNodeMetadataResult();
-        final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
+        final var holder = new NormalizationResultHolder();
+        final var streamWriter = ImmutableNormalizedNodeStreamWriter.from(holder);
         try {
             writeTo(streamWriter, inference);
         } catch (IOException e) {
             throw new AnydataNormalizationException("Failed to normalize anydata", e);
         }
 
-        return ImmutableMetadataNormalizedAnydata.ofOptional(inference, result.getResult(), result.getMetadata());
+        final var result = holder.getResult();
+        return ImmutableMetadataNormalizedAnydata.ofOptional(inference, result.data(),
+            Optional.ofNullable(result.metadata()));
     }
 
     @Override