X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=codec%2Fyang-data-codec-gson%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fcodec%2Fgson%2FStreamToNormalizedNodeTest.java;h=e491e5a1231a9529a205bcb5b0f54ca3c340898f;hb=f6553f9c9e4d35ed154c9dd736834ea3bf5ca0d5;hp=382a3f2e6b8da55ed78c5afe30da8a8437562f3d;hpb=93e320e81b03ea15789fa8814a9dbba5754d3b96;p=yangtools.git diff --git a/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java b/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java index 382a3f2e6b..e491e5a123 100644 --- a/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java +++ b/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java @@ -19,12 +19,11 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.LoggingNormalizedNodeStreamWriter; 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,26 +70,24 @@ public class StreamToNormalizedNodeTest extends AbstractComplexJsonTest { * This is the parsing part */ // This is where we will output the nodes - NormalizedNodeResult result = new NormalizedNodeResult(); + var result = new NormalizationResultHolder(); // StreamWriter which attaches NormalizedNode under parent - final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); + final var streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); // JSON -> StreamWriter parser - try (JsonParserStream handler = JsonParserStream.create(streamWriter, lhotkaCodecFactory)) { + try (var handler = JsonParserStream.create(streamWriter, lhotkaCodecFactory)) { handler.parse(new JsonReader(new StringReader(streamAsString))); } // Finally build the node - final NormalizedNode parsedData = result.getResult(); - LOG.debug("Parsed NormalizedNodes: {}", parsedData); + final var parsedData = result.getResult().data(); /* * This is the serialization part. */ // We want to write the first child out final DataContainerChild firstChild = (DataContainerChild) parsedData; - LOG.debug("Serializing first child: {}", firstChild); // String holder final StringWriter writer = new StringWriter();