From dd58982b77695eb5a13af10a6e866c8fa8392995 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 30 May 2019 19:06:07 +0200 Subject: [PATCH] Cleanup testing AugmentationIdentifier instantiations Using ImmutableList.of() is slightly faster, use that. Change-Id: Ia45d18dc840e8985a1037e7235c01da5f873d870 Signed-off-by: Robert Varga --- .../yang/data/api/schema/NormalizedNodesTest.java | 3 ++- .../codec/gson/JsonStreamToNormalizedNodeTest.java | 6 +++--- .../gson/TestingNormalizedNodeStructuresCreator.java | 3 +-- .../yang/data/codec/xml/NormalizedNodesToXmlTest.java | 6 +++--- ...emalessXMLStreamNormalizedNodeStreamWriterTest.java | 6 +++--- .../yang/data/codec/xml/XmlToNormalizedNodesTest.java | 6 +++--- .../ImmutableNormalizedNodeStreamWriterTest.java | 6 +++--- .../yang/data/impl/schema/InstanceIdToNodesTest.java | 10 ++++------ .../data/impl/schema/NormalizedDataBuilderTest.java | 3 ++- 9 files changed, 24 insertions(+), 25 deletions(-) diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java index 77813f20e7..422fbacf88 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodesTest.java @@ -14,6 +14,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import com.google.common.collect.ImmutableSet; import java.util.Collections; import java.util.Optional; import org.junit.Test; @@ -105,7 +106,7 @@ public class NormalizedNodesTest { final AugmentationNode mockedAugmentationNode = mock(AugmentationNode.class); final QName listQName = QName.create("test-ns", "2016-09-16", "list-node"); - final AugmentationIdentifier augNodeId = new AugmentationIdentifier(Collections.singleton(listQName)); + final AugmentationIdentifier augNodeId = new AugmentationIdentifier(ImmutableSet.of(listQName)); doReturn(augNodeId).when(mockedAugmentationNode).getIdentifier(); final MapNode mockedMapNode = mock(MapNode.class); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java index c0f652f246..7e4e12d9b0 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java @@ -17,11 +17,11 @@ import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.choiceBu import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.containerBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.leafNode; +import com.google.common.collect.ImmutableSet; import com.google.gson.stream.JsonReader; import java.io.IOException; import java.io.StringReader; import java.net.URISyntaxException; -import java.util.Collections; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -235,8 +235,8 @@ public class JsonStreamToNormalizedNodeTest { final QName containerQName = QName.create(augmentChoice1QName, "case11-choice-case-container"); final QName leafQName = QName.create(augmentChoice1QName, "case11-choice-case-leaf"); - final AugmentationIdentifier aug1Id = new AugmentationIdentifier(Collections.singleton(augmentChoice1QName)); - final AugmentationIdentifier aug2Id = new AugmentationIdentifier(Collections.singleton(augmentChoice2QName)); + final AugmentationIdentifier aug1Id = new AugmentationIdentifier(ImmutableSet.of(augmentChoice1QName)); + final AugmentationIdentifier aug2Id = new AugmentationIdentifier(ImmutableSet.of(augmentChoice2QName)); final NodeIdentifier augmentChoice1Id = new NodeIdentifier(augmentChoice1QName); final NodeIdentifier augmentChoice2Id = new NodeIdentifier(augmentChoice2QName); final NodeIdentifier containerId = new NodeIdentifier(containerQName); 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 5876ec9f17..00fd448763 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 @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson; import com.google.common.collect.ImmutableSet; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import org.opendaylight.yangtools.yang.common.QName; @@ -128,7 +127,7 @@ public final class TestingNormalizedNodeStructuresCreator { private static DataContainerChild augmentC11AWithLf15_21Node() { return Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(QName.create("ns:complex:json", "2014-08-11", "lf15_21")))) + new AugmentationIdentifier(ImmutableSet.of(QName.create("ns:complex:json", "2014-08-11", "lf15_21")))) .withChild(lf15_21Node()).build(); } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java index b547359608..8f5f13ed93 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java @@ -10,12 +10,12 @@ 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; import java.net.URI; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.xml.stream.XMLOutputFactory; @@ -233,7 +233,7 @@ public class NormalizedNodesToXmlTest { .build(); AugmentationNode myDoublyKeyedListAugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(myDoublyKeyedList))) + new AugmentationIdentifier(ImmutableSet.of(myDoublyKeyedList))) .withChild(myDoublyKeyedListNode).build(); ContainerNode myContainer3Node = Builders.containerBuilder().withNodeIdentifier( @@ -241,7 +241,7 @@ public class NormalizedNodesToXmlTest { .withChild(myDoublyKeyedListAugNode).build(); AugmentationNode myContainer3AugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(myContainer3))) + new AugmentationIdentifier(ImmutableSet.of(myContainer3))) .withChild(myContainer3Node).build(); ContainerNode outerContainerNode = Builders.containerBuilder().withNodeIdentifier( diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java index bbb627905e..8391587e53 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java @@ -10,13 +10,13 @@ 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; import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -285,7 +285,7 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { .build(); AugmentationNode myDoublyKeyedListAugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(myDoublyKeyedList))) + new AugmentationIdentifier(ImmutableSet.of(myDoublyKeyedList))) .withChild(myDoublyKeyedListNode).build(); ContainerNode myContainer3Node = Builders.containerBuilder().withNodeIdentifier( @@ -293,7 +293,7 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { .withChild(myDoublyKeyedListAugNode).build(); AugmentationNode myContainer3AugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(myContainer3))) + new AugmentationIdentifier(ImmutableSet.of(myContainer3))) .withChild(myContainer3Node).build(); ContainerNode outerContainerNode = Builders.containerBuilder().withNodeIdentifier( diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java index 3e16fee00c..c233e00dfe 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java @@ -15,11 +15,11 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.xml.parsers.ParserConfigurationException; @@ -344,7 +344,7 @@ public class XmlToNormalizedNodesTest { .build(); AugmentationNode myDoublyKeyedListAugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(MY_DOUBLY_KEYED_LIST))) + new AugmentationIdentifier(ImmutableSet.of(MY_DOUBLY_KEYED_LIST))) .withChild(myDoublyKeyedListNode).build(); ContainerNode myContainer3Node = Builders.containerBuilder().withNodeIdentifier( @@ -352,7 +352,7 @@ public class XmlToNormalizedNodesTest { .withChild(myDoublyKeyedListAugNode).build(); AugmentationNode myContainer3AugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(MY_CONTAINER_3))) + new AugmentationIdentifier(ImmutableSet.of(MY_CONTAINER_3))) .withChild(myContainer3Node).build(); ContainerNode outerContainerNode = Builders.containerBuilder().withNodeIdentifier( diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriterTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriterTest.java index 5cbd4d1234..eee70541ea 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriterTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriterTest.java @@ -11,12 +11,12 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -241,7 +241,7 @@ public class ImmutableNormalizedNodeStreamWriterTest { .build(); AugmentationNode myDoublyKeyedListAugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(myDoublyKeyedList))) + new AugmentationIdentifier(ImmutableSet.of(myDoublyKeyedList))) .withChild(myDoublyKeyedListNode).build(); ContainerNode myContainer3Node = Builders.containerBuilder().withNodeIdentifier( @@ -249,7 +249,7 @@ public class ImmutableNormalizedNodeStreamWriterTest { .withChild(myDoublyKeyedListAugNode).build(); AugmentationNode myContainer3AugNode = Builders.augmentationBuilder().withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(myContainer3))) + new AugmentationIdentifier(ImmutableSet.of(myContainer3))) .withChild(myContainer3Node).build(); ContainerNode outerContainerNode = Builders.containerBuilder().withNodeIdentifier( diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java index 4b9373b9a5..8b1dfe41c3 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import static org.junit.Assert.assertEquals; -import java.util.Collections; +import com.google.common.collect.ImmutableSet; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -38,18 +38,16 @@ public class InstanceIdToNodesTest { private final NodeIdentifier outerContainer = new NodeIdentifier(QName.create(NS, REVISION, "outer-container")); private final NodeIdentifier augmentedLeaf = new NodeIdentifier(QName.create(NS, REVISION, "augmented-leaf")); private final AugmentationIdentifier augmentation = new AugmentationIdentifier( - Collections.singleton(augmentedLeaf.getNodeType())); + ImmutableSet.of(augmentedLeaf.getNodeType())); - private final NodeIdentifier outerList = new NodeIdentifier( - QName.create(NS, REVISION, "outer-list")); + private final NodeIdentifier outerList = new NodeIdentifier(QName.create(NS, REVISION, "outer-list")); private final NodeIdentifierWithPredicates outerListWithKey = NodeIdentifierWithPredicates.of( QName.create(NS, REVISION, "outer-list"), ID, 1); private final NodeIdentifier choice = new NodeIdentifier(QName.create(NS, REVISION, "outer-choice")); private final NodeIdentifier leafFromCase = new NodeIdentifier(QName.create(NS, REVISION, "one")); private final NodeIdentifier leafList = new NodeIdentifier(QName.create(NS, REVISION, "ordered-leaf-list")); - private final NodeWithValue leafListWithValue = new NodeWithValue<>( - leafList.getNodeType(), "abcd"); + private final NodeWithValue leafListWithValue = new NodeWithValue<>(leafList.getNodeType(), "abcd"); @BeforeClass public static void setUp() { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java index 9c975bf9f8..7e9a77a335 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import static com.google.common.base.Preconditions.checkState; +import com.google.common.collect.ImmutableSet; import java.io.File; import java.net.URI; import java.net.URISyntaxException; @@ -93,7 +94,7 @@ public class NormalizedDataBuilderTest { AugmentationNode augmentation = Builders .augmentationBuilder() .withNodeIdentifier( - new AugmentationIdentifier(Collections.singleton(getQName("augmentUint32")))) + new AugmentationIdentifier(ImmutableSet.of(getQName("augmentUint32")))) .withChild( Builders.leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32")) .withValue(11).build()).build(); -- 2.36.6