Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-codec-gson / src / test / java / org / opendaylight / yangtools / yang / data / codec / gson / Bug4969Test.java

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
index f3b4e1f8329f3423247224e3ab1b9730307cd45e..686ee083a53d7aa361428dca8420d9b28dc980ab 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
@@ -15,12 +15,10 @@ import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URISyntaxException;
-import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -48,28 +46,28 @@ public class Bug4969Test {
         final JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
             JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(context));
         jsonParser.parse(new JsonReader(new StringReader(inputJson)));
-        final NormalizedNode<?, ?> transformedInput = result.getResult();
+        final NormalizedNode transformedInput = result.getResult();
 
         assertTrue(transformedInput instanceof ContainerNode);
         ContainerNode root = (ContainerNode) transformedInput;
-        final Optional<DataContainerChild<? extends PathArgument, ?>> ref1 = root.getChild(NodeIdentifier.create(
+        final DataContainerChild ref1 = root.childByArg(NodeIdentifier.create(
             QName.create("foo", "2016-01-22", "ref1")));
-        final Optional<DataContainerChild<? extends PathArgument, ?>> ref2 = root.getChild(NodeIdentifier.create(
+        final DataContainerChild ref2 = root.childByArg(NodeIdentifier.create(
             QName.create("foo", "2016-01-22", "ref2")));
-        final Optional<DataContainerChild<? extends PathArgument, ?>> ref3 = root.getChild(NodeIdentifier.create(
+        final DataContainerChild ref3 = root.childByArg(NodeIdentifier.create(
             QName.create("foo", "2016-01-22", "ref3")));
-        final Optional<DataContainerChild<? extends PathArgument, ?>> ref4 = root.getChild(NodeIdentifier.create(
+        final DataContainerChild ref4 = root.childByArg(NodeIdentifier.create(
             QName.create("foo", "2016-01-22", "ref4")));
 
-        assertTrue(ref1.isPresent());
-        assertTrue(ref2.isPresent());
-        assertTrue(ref3.isPresent());
-        assertTrue(ref4.isPresent());
+        assertNotNull(ref1);
+        assertNotNull(ref2);
+        assertNotNull(ref3);
+        assertNotNull(ref4);
 
-        final Object value1 = ref1.get().getValue();
-        final Object value2 = ref2.get().getValue();
-        final Object value3 = ref3.get().getValue();
-        final Object value4 = ref4.get().getValue();
+        final Object value1 = ref1.body();
+        final Object value2 = ref2.body();
+        final Object value3 = ref3.body();
+        final Object value4 = ref4.body();
 
         assertTrue(value1 instanceof Set);
         assertTrue(value2 instanceof Set);
@@ -108,7 +106,7 @@ public class Bug4969Test {
         final JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
             JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(context));
         jsonParser.parse(new JsonReader(new StringReader(inputJson)));
-        final NormalizedNode<?, ?> transformedInput = result.getResult();
+        final NormalizedNode transformedInput = result.getResult();
         assertNotNull(transformedInput);
     }
 }