X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-codec-gson%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fcodec%2Fgson%2FTestingNormalizedNodeStructuresCreator.java;h=61e1c20ca8e8a9ef7709f27ab2b91d68fd58de71;hb=c4517068c0183a892703b26baf098c97bfb2a854;hp=294ac0232dc0d8ff51e095dc987000a694eec2d4;hpb=807ab0252e9d18f390484d030c9b18baf6d8cefe;p=yangtools.git diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java index 294ac0232d..61e1c20ca8 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java @@ -7,139 +7,138 @@ */ package org.opendaylight.yangtools.yang.data.codec.gson; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import java.util.HashMap; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import java.util.Arrays; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.common.Revision; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; 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.YangInstanceIdentifier.PathArgument; 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.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemLeafSetNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; -public class TestingNormalizedNodeStructuresCreator { +public final class TestingNormalizedNodeStructuresCreator { + private static final QNameModule COMPLEX_JSON = + QNameModule.create(XMLNamespace.of("ns:complex:json"), Revision.of("2014-08-11")); + private static final QNameModule COMPLEX_JSON_AUG = + QNameModule.create(XMLNamespace.of("ns:complex:json:augmentation"), Revision.of("2014-08-14")); - @SafeVarargs - static NormalizedNode cont1Node( - final DataContainerChild... children) { - DataContainerNodeAttrBuilder cont1 = Builders.containerBuilder(); - cont1.withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1"))); + private TestingNormalizedNodeStructuresCreator() { + throw new UnsupportedOperationException(); + } - cont1.withValue(Lists.newArrayList(children)); - return cont1.build(); + static ContainerNode cont1Node(final DataContainerChild... children) { + return Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "cont1"))) + .withValue(Arrays.asList(children)) + .build(); } - private static DataContainerChild lst12Node() { - CollectionNodeBuilder lst12Builder = Builders.unkeyedListBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lst12"))); - lst12Builder.withChild(lst12Entry1Node()); - return lst12Builder.build(); + static ContainerNode cont2Node() { + return Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "cont2"))) + .build(); } - private static UnkeyedListEntryNode lst12Entry1Node() { - DataContainerNodeAttrBuilder lst12Entry1Builder = Builders - .unkeyedListEntryBuilder(); - lst12Entry1Builder - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lst12"))); - lst12Entry1Builder.withChild(Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf121"))) - .withValue("lf121 value").build()); - return lst12Entry1Builder.build(); + private static UnkeyedListNode lst12Node() { + return Builders.unkeyedListBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lst12"))) + .withChild(lst12Entry1Node()) + .build(); } - private static DataContainerChild choc12Node() { - DataContainerNodeBuilder choc12Builder = Builders.choiceBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc12"))); + private static UnkeyedListEntryNode lst12Entry1Node() { + return Builders.unkeyedListEntryBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lst12"))) + .withChild(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf121"))) + .withValue("lf121 value").build()) + .build(); + } - choc12Builder.withChild(lf17Node()); - return choc12Builder.build(); + private static ChoiceNode choc12Node() { + return Builders.choiceBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "choc12"))) + .withChild(lf17Node()) + .build(); } protected static LeafNode lf17Node() { return Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf17"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf17"))) .withValue("lf17 value").build(); } - private static DataContainerChild externalAugmentC11AWithLf15_11AndLf15_12Node() { - DataContainerNodeBuilder augmentationBuilder = Builders - .augmentationBuilder(); - augmentationBuilder.withNodeIdentifier(new AugmentationIdentifier(Sets.newHashSet( - QName.create("ns:complex:json:augmentation", "2014-08-14", "lf15_11"), - QName.create("ns:complex:json:augmentation", "2014-08-14", "lf15_12")))); - augmentationBuilder.withChild(lf15_11NodeExternal()); - augmentationBuilder.withChild(lf15_12NodeExternal()); - return augmentationBuilder.build(); + private static AugmentationNode externalAugmentC11AWithLf15_11AndLf15_12Node() { + return Builders.augmentationBuilder() + .withNodeIdentifier(new AugmentationIdentifier(ImmutableSet.of( + QName.create(COMPLEX_JSON_AUG, "lf15_11"), + QName.create(COMPLEX_JSON_AUG, "lf15_12")))) + .withChild(lf15_11NodeExternal()) + .withChild(lf15_12NodeExternal()) + .build(); } private static LeafNode lf15_12NodeExternal() { - return Builders - .leafBuilder() - .withNodeIdentifier( - new NodeIdentifier(QName.create("ns:complex:json:augmentation", "2014-08-14", "lf15_12"))) - .withValue("lf15_12 value from augmentation").build(); + return Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON_AUG, "lf15_12"))) + .withValue("lf15_12 value from augmentation") + .build(); } private static LeafNode lf15_11NodeExternal() { - return Builders - .leafBuilder() - .withNodeIdentifier( - new NodeIdentifier(QName.create("ns:complex:json:augmentation", "2014-08-14", "lf15_11"))) - .withValue("lf15_11 value from augmentation").build(); + return Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON_AUG, "lf15_11"))) + .withValue("lf15_11 value from augmentation") + .build(); } - @SafeVarargs - private static DataContainerChild choc11Node( - final DataContainerChild... children) { - DataContainerNodeBuilder choc11Builder = Builders.choiceBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc11"))); - choc11Builder.withValue(Lists.newArrayList(children)); - // choc11Builder.addChild(lf13Node()); - // choc11Builder.addChild(augmentChoc11_c11A_lf1511AndLf1512Children()); - // choc11Builder.addChild(augmentChoc11_c11_lf1521Children()); - return choc11Builder.build(); + private static ChoiceNode choc11Node(final DataContainerChild... children) { + return Builders.choiceBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "choc11"))) + .withValue(Arrays.asList(children)) + // choc11Builder.addChild(lf13Node()); + // choc11Builder.addChild(augmentChoc11_c11A_lf1511AndLf1512Children()); + // choc11Builder.addChild(augmentChoc11_c11_lf1521Children()); + .build(); } private static LeafNode lf13Node() { return Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf13"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf13"))) .withValue("lf13 value").build(); } - private static DataContainerChild augmentC11AWithLf15_21Node() { + private static AugmentationNode augmentC11AWithLf15_21Node() { return Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Sets.newHashSet(QName.create("ns:complex:json", "2014-08-11", "lf15_21")))) + new AugmentationIdentifier(ImmutableSet.of(QName.create(COMPLEX_JSON, "lf15_21")))) .withChild(lf15_21Node()).build(); } private static LeafNode lf15_21Node() { return Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf15_21"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf15_21"))) .withValue("lf15_21 value").build(); } - private static DataContainerChild augmentC11AWithLf15_11AndLf15_12Node() { + private static AugmentationNode augmentC11AWithLf15_11AndLf15_12Node() { return Builders.augmentationBuilder() - .withNodeIdentifier(new AugmentationIdentifier(Sets.newHashSet( - QName.create("ns:complex:json", "2014-08-11", "lf15_11"), - QName.create("ns:complex:json", "2014-08-11", "lf15_12")))) + .withNodeIdentifier(new AugmentationIdentifier(ImmutableSet.of( + QName.create(COMPLEX_JSON, "lf15_11"), + QName.create(COMPLEX_JSON, "lf15_12")))) .withChild(lf15_11Node()) .withChild(lf15_12Node()) .build(); @@ -147,143 +146,140 @@ public class TestingNormalizedNodeStructuresCreator { private static LeafNode lf15_12Node() { return Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf15_12"))) - .withValue(QName.create("ns:complex:json", "2014-08-11", "lf11")).build(); + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf15_12"))) + .withValue(QName.create(COMPLEX_JSON, "ident")).build(); } private static LeafNode lf15_11Node() { return Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf15_11"))) - .withValue(Sets.newHashSet("one", "two")).build(); - } - - private static DataContainerChild lf12_1Node() { - DataContainerNodeBuilder augmentBuilder = Builders - .augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Sets.newHashSet( - QName.create("ns:complex:json", "2014-08-11", "lf12_1"), - QName.create("ns:complex:json", "2014-08-11", "lf12_2")))); - augmentBuilder.withChild(Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf12_1"))) - .withValue("lf12 value").build()); - return augmentBuilder.build(); - } - - private static DataContainerChild childLst11() { - - DataContainerNodeAttrBuilder lst11Entry1Builder = Builders - .mapEntryBuilder(); - - Map key = new HashMap<>(); - key.put(QName.create("ns:complex:json", "2014-08-11", "key111"), "key111 value"); - key.put(QName.create("ns:complex:json", "2014-08-11", "lf111"), "lf111 value"); - - lst11Entry1Builder.withNodeIdentifier(new NodeIdentifierWithPredicates(QName.create("ns:complex:json", - "2014-08-11", "lst11"), key)); - lst11Entry1Builder.withChild(Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "key111"))) - .withValue("key111 value").build()); - lst11Entry1Builder.withChild(Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf112"))) - .withValue(lf112Value()).build()); - lst11Entry1Builder.withChild(Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf113"))) - .withValue("lf113 value").build()); - lst11Entry1Builder.withChild(Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf111"))) - .withValue("lf111 value").build()); - return Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier( - QName.create("ns:complex:json", "2014-08-11", "lst11"))).withChild(lst11Entry1Builder.build()).build(); + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf15_11"))) + .withValue(ImmutableSet.of("one", "two")).build(); + } + + private static AugmentationNode lf12_1Node() { + return Builders.augmentationBuilder() + .withNodeIdentifier(new AugmentationIdentifier(ImmutableSet.of( + QName.create(COMPLEX_JSON, "lf12_1"), + QName.create(COMPLEX_JSON, "lf12_2")))) + .withChild(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf12_1"))) + .withValue("lf12 value").build()) + .build(); + } + + private static SystemMapNode childLst11() { + return Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lst11"))) + .withChild(Builders.mapEntryBuilder().withNodeIdentifier( + NodeIdentifierWithPredicates.of(QName.create(COMPLEX_JSON, "lst11"), ImmutableMap.of( + QName.create(COMPLEX_JSON, "key111"), "key111 value", + QName.create(COMPLEX_JSON, "lf111"), "lf111 value"))) + .withChild(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "key111"))) + .withValue("key111 value").build()) + .withChild(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf112"))) + .withValue(lf112Value()).build()) + .withChild(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf113"))) + .withValue("lf113 value").build()) + .withChild(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf111"))) + .withValue("lf111 value").build()) + .build()) + .build(); } private static Object lf112Value() { return YangInstanceIdentifier.create( - new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")), - new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11")), - new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo") + new NodeIdentifier(QName.create(COMPLEX_JSON, "cont1")), + new NodeIdentifier(QName.create(COMPLEX_JSON, "lflst11")), + new NodeWithValue<>(QName.create(COMPLEX_JSON, "lflst11"),"foo") ); } - private static DataContainerChild childLflst11() { - ListNodeBuilder> lflst11 = Builders.leafSetBuilder().withNodeIdentifier( - new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11"))); - lflst11.withChild(Builders - .leafSetEntryBuilder() - .withNodeIdentifier(new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), - "lflst11 value1")) - .withValue("lflst11 value1").build()); - lflst11.withChild(Builders - .leafSetEntryBuilder() - .withNodeIdentifier(new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), - "lflst11 value2")) - .withValue("lflst11 value2").build()); - return lflst11.build(); - } - - private static DataContainerChild childLflst11Multiline() { - ListNodeBuilder> lflst11 = Builders.leafSetBuilder().withNodeIdentifier( - new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11"))); - lflst11.withChild(Builders - .leafSetEntryBuilder() - .withNodeIdentifier(new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), - "lflst11 value1\nanother line 1")) - .withValue("lflst11 value1\nanother line 1").build()); - lflst11.withChild(Builders - .leafSetEntryBuilder() - .withNodeIdentifier(new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), - "lflst11 value2\r\nanother line 2")) - .withValue("lflst11 value2\r\nanother line 2").build()); - return lflst11.build(); - } - - public static NormalizedNode leafNodeInContainer() { - LeafNode lf11 = Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lf11"))) - .withValue(453).build(); - return cont1Node(lf11); - } - - public static NormalizedNode leafListNodeInContainer() { + private static SystemLeafSetNode childLflst11() { + return Builders.leafSetBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lflst11"))) + .withChild(Builders.leafSetEntryBuilder() + .withNodeIdentifier(new NodeWithValue<>(QName.create(COMPLEX_JSON, "lflst11"), "lflst11 value1")) + .withValue("lflst11 value1").build()) + .withChild(Builders.leafSetEntryBuilder() + .withNodeIdentifier(new NodeWithValue<>(QName.create(COMPLEX_JSON, "lflst11"), "lflst11 value2")) + .withValue("lflst11 value2").build()) + .build(); + } + + private static SystemLeafSetNode childLflst11Multiline() { + return Builders.leafSetBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lflst11"))) + .withChild(Builders.leafSetEntryBuilder() + .withNodeIdentifier(new NodeWithValue<>(QName.create(COMPLEX_JSON, "lflst11"), + "lflst11 value1\nanother line 1")) + .withValue("lflst11 value1\nanother line 1").build()) + .withChild(Builders.leafSetEntryBuilder() + .withNodeIdentifier(new NodeWithValue<>(QName.create(COMPLEX_JSON, "lflst11"), + "lflst11 value2\r\nanother line 2")) + .withValue("lflst11 value2\r\nanother line 2").build()) + .build(); + } + + public static ContainerNode leafNodeInContainer() { + return cont1Node(Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "lf11"))) + .withValue(453).build()); + } + + public static ContainerNode leafListNodeInContainer() { return cont1Node(childLflst11()); } - public static NormalizedNode leafListNodeInContainerMultiline() { + public static ContainerNode leafListNodeInContainerMultiline() { return cont1Node(childLflst11Multiline()); } - public static NormalizedNode keyedListNodeInContainer() { + public static ContainerNode keyedListNodeInContainer() { return cont1Node(childLst11()); } - public static NormalizedNode leafNodeViaAugmentationInContainer() { + public static ContainerNode leafNodeViaAugmentationInContainer() { return cont1Node(lf12_1Node()); } - public static NormalizedNode choiceNodeInContainer() { + public static ContainerNode choiceNodeInContainer() { return cont1Node(choc11Node(lf13Node())); } /** * choc11 contains lf13, lf15_11 and lf15_12 are added via external augmentation. */ - public static NormalizedNode caseNodeAugmentationInChoiceInContainer() { + public static ContainerNode caseNodeAugmentationInChoiceInContainer() { return cont1Node(choc11Node(augmentC11AWithLf15_11AndLf15_12Node(), lf13Node(), augmentC11AWithLf15_21Node())); } - public static NormalizedNode caseNodeExternalAugmentationInChoiceInContainer() { + public static ContainerNode caseNodeExternalAugmentationInChoiceInContainer() { return cont1Node(choc11Node(lf13Node(), augmentC11AWithLf15_11AndLf15_12Node(), externalAugmentC11AWithLf15_11AndLf15_12Node())); } - public static NormalizedNode choiceNodeAugmentationInContainer() { + public static ContainerNode choiceNodeAugmentationInContainer() { return cont1Node(choc12Node()); } - public static NormalizedNode unkeyedNodeInContainer() { + public static ContainerNode unkeyedNodeInContainer() { return cont1Node(lst12Node()); } - public static NormalizedNode topLevelContainer() { + public static ContainerNode topLevelContainer() { return cont1Node(); } + + public static ContainerNode emptyContainerInContainer() { + return cont1Node(Builders.augmentationBuilder() + .withNodeIdentifier(new AugmentationIdentifier(ImmutableSet.of(QName.create(COMPLEX_JSON, "cont11")))) + .withChild(Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(COMPLEX_JSON, "cont11"))) + .build()) + .build()); + } }