Code Review / yangtools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove Augmentation{Identifier,Node}
[yangtools.git] / codec / yang-data-codec-xml / src / test / java / org / opendaylight / yangtools / yang / data / codec / xml / NormalizedNodesToXmlTest.java
diff --git a/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java b/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java
index 28b6182e85ca64e649b12bded1a86feec7d19f91..e08a039b6c764f3871a091d3b9a6325eb44d9cc7 100644 (file)
--- a/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java
+++ b/codec/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.codec.xml;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.ImmutableSet;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
@@ -43,11 +41,9 @@ import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
@@ -57,6 +53,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.SystemLeafSetNode;
 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.Builders;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.w3c.dom.Document;
@@ -172,84 +169,88 @@ public class NormalizedNodesToXmlTest {
 
     private NormalizedNode buildOuterContainerNode() {
         // my-container-1
-        MapNode myKeyedListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(myKeyedList))
-                .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        NodeIdentifierWithPredicates.of(myKeyedList, myKeyLeaf, "listkeyvalue1"))
-                        .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInList1))
-                                .withValue("listleafvalue1").build())
-                        .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInList2))
-                                .withValue("listleafvalue2").build()).build())
-                .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        NodeIdentifierWithPredicates.of(myKeyedList, myKeyLeaf, "listkeyvalue2"))
-                        .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInList1))
-                                .withValue("listleafvalue12").build())
-                        .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInList2))
-                                .withValue("listleafvalue22").build()).build()).build();
-
-        LeafNode<?> myLeaf1Node = Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeaf1))
-                .withValue("value1").build();
+        MapNode myKeyedListNode = Builders.mapBuilder()
+            .withNodeIdentifier(new NodeIdentifier(myKeyedList))
+            .withChild(Builders.mapEntryBuilder()
+                .withNodeIdentifier(NodeIdentifierWithPredicates.of(myKeyedList, myKeyLeaf, "listkeyvalue1"))
+                .withChild(ImmutableNodes.leafNode(myLeafInList1, "listleafvalue1"))
+                .withChild(ImmutableNodes.leafNode(myLeafInList2, "listleafvalue2"))
+                .build())
+            .withChild(Builders.mapEntryBuilder()
+                .withNodeIdentifier(NodeIdentifierWithPredicates.of(myKeyedList, myKeyLeaf, "listkeyvalue2"))
+                .withChild(ImmutableNodes.leafNode(myLeafInList1, "listleafvalue12"))
+                .withChild(ImmutableNodes.leafNode(myLeafInList2, "listleafvalue22"))
+                .build())
+            .build();
+
+        LeafNode<?> myLeaf1Node = ImmutableNodes.leafNode(myLeaf1, "value1");
 
         SystemLeafSetNode<?> myLeafListNode = Builders.leafSetBuilder()
-                .withNodeIdentifier(new NodeIdentifier(myLeafList))
-                .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(
-                        new NodeWithValue<>(myLeafList, "lflvalue1")).withValue("lflvalue1").build())
-                .withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(
-                        new NodeWithValue<>(myLeafList, "lflvalue2")).withValue("lflvalue2").build()).build();
-
-        ContainerNode myContainer1Node = Builders.containerBuilder().withNodeIdentifier(
-                new NodeIdentifier(myContainer1))
-                .withChild(myKeyedListNode)
-                .withChild(myLeaf1Node)
-                .withChild(myLeafListNode).build();
+            .withNodeIdentifier(new NodeIdentifier(myLeafList))
+            .withChild(Builders.leafSetEntryBuilder()
+                .withNodeIdentifier(new NodeWithValue<>(myLeafList, "lflvalue1"))
+                .withValue("lflvalue1")
+                .build())
+            .withChild(Builders.leafSetEntryBuilder()
+                .withNodeIdentifier(new NodeWithValue<>(myLeafList, "lflvalue2"))
+                .withValue("lflvalue2")
+                .build())
+            .build();
+
+        ContainerNode myContainer1Node = Builders.containerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(myContainer1))
+            .withChild(myKeyedListNode)
+            .withChild(myLeaf1Node)
+            .withChild(myLeafListNode)
+            .build();
 
         // my-container-2
-        ContainerNode innerContainerNode = Builders.containerBuilder().withNodeIdentifier(
-                new NodeIdentifier(innerContainer))
-                .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeaf2))
-                        .withValue("value2").build()).build();
+        ContainerNode innerContainerNode = Builders.containerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(innerContainer))
+            .withChild(ImmutableNodes.leafNode(myLeaf2, "value2"))
+            .build();
 
-        LeafNode<?> myLeaf3Node = Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeaf3))
-                .withValue("value3").build();
+        LeafNode<?> myLeaf3Node = ImmutableNodes.leafNode(myLeaf3, "value3");
 
-        ChoiceNode myChoiceNode = Builders.choiceBuilder().withNodeIdentifier(new NodeIdentifier(myChoice))
-                .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInCase2))
-                        .withValue("case2value").build()).build();
+        ChoiceNode myChoiceNode = Builders.choiceBuilder()
+            .withNodeIdentifier(new NodeIdentifier(myChoice))
+            .withChild(ImmutableNodes.leafNode(myLeafInCase2, "case2value"))
+            .build();
 
-        ContainerNode myContainer2Node = Builders.containerBuilder().withNodeIdentifier(
-                new NodeIdentifier(myContainer2))
-                .withChild(innerContainerNode)
-                .withChild(myLeaf3Node)
-                .withChild(myChoiceNode).build();
+        ContainerNode myContainer2Node = Builders.containerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(myContainer2))
+            .withChild(innerContainerNode)
+            .withChild(myLeaf3Node)
+            .withChild(myChoiceNode)
+            .build();
 
         // my-container-3
         Map<QName, Object> keys = new HashMap<>();
         keys.put(myFirstKeyLeaf, "listkeyvalue1");
         keys.put(mySecondKeyLeaf, "listkeyvalue2");
 
-        MapNode myDoublyKeyedListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(myDoublyKeyedList))
-                .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        NodeIdentifierWithPredicates.of(myDoublyKeyedList, keys))
-                        .withChild(Builders.leafBuilder().withNodeIdentifier(
-                                new NodeIdentifier(myLeafInList3)).withValue("listleafvalue1").build()).build())
-                .build();
-
-        AugmentationNode myDoublyKeyedListAugNode = Builders.augmentationBuilder().withNodeIdentifier(
-                new AugmentationIdentifier(ImmutableSet.of(myDoublyKeyedList)))
-                .withChild(myDoublyKeyedListNode).build();
-
-        ContainerNode myContainer3Node = Builders.containerBuilder().withNodeIdentifier(
-                new NodeIdentifier(myContainer3))
-                .withChild(myDoublyKeyedListAugNode).build();
-
-        AugmentationNode myContainer3AugNode = Builders.augmentationBuilder().withNodeIdentifier(
-                new AugmentationIdentifier(ImmutableSet.of(myContainer3)))
-                .withChild(myContainer3Node).build();
-
-        ContainerNode outerContainerNode = Builders.containerBuilder().withNodeIdentifier(
-                new NodeIdentifier(outerContainer))
-                .withChild(myContainer1Node)
-                .withChild(myContainer2Node)
-                .withChild(myContainer3AugNode).build();
+        MapNode myDoublyKeyedListNode = Builders.mapBuilder()
+            .withNodeIdentifier(new NodeIdentifier(myDoublyKeyedList))
+            .withChild(Builders.mapEntryBuilder()
+                .withNodeIdentifier(NodeIdentifierWithPredicates.of(myDoublyKeyedList, keys))
+                .withChild(Builders.leafBuilder()
+                    .withNodeIdentifier(new NodeIdentifier(myLeafInList3))
+                    .withValue("listleafvalue1")
+                    .build())
+                .build())
+            .build();
+
+        ContainerNode myContainer3Node = Builders.containerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(myContainer3))
+            .withChild(myDoublyKeyedListNode).build();
+
+
+        ContainerNode outerContainerNode = Builders.containerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(outerContainer))
+            .withChild(myContainer1Node)
+            .withChild(myContainer2Node)
+            .withChild(myContainer3Node)
+            .build();
 
         return outerContainerNode;
     }
OpenDaylight YANG Tools