Bump upstream dependencies to Potassium GA

[transportpce.git] / networkmodel / src / test / java / org / opendaylight / transportpce / networkmodel / util / test / JsonUtil.java

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java
index fdafae5db7499af913020de75ff8a6737ab3f5f2..3f54bd1fc548c11bed63ac9c87ed5d6fda759a96 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java
@@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
 import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream;
 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.EffectiveModelContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,14 +64,14 @@ public final class JsonUtil {
     }
 
     public DataObject getDataObjectFromJson(JsonReader reader, QName pathQname) {
-        NormalizedNodeResult result = new NormalizedNodeResult();
-        try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
+        NormalizationResultHolder resultHolder = new NormalizationResultHolder();
+        try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
                 JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
                         JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx));) {
             jsonParser.parse(reader);
             YangInstanceIdentifier yangId = YangInstanceIdentifier.of(pathQname);
             Entry<InstanceIdentifier<?>, DataObject> entry =
-                codecRegistry.fromNormalizedNode(yangId, result.getResult());
+                codecRegistry.fromNormalizedNode(yangId, resultHolder.getResult().data());
             return entry == null ? null : entry.getValue();
         } catch (IOException | IllegalArgumentException e) {
             LOG.error("Cannot deserialize JSON ", e);