From: Robert Varga Date: Tue, 14 Jan 2020 11:35:51 +0000 (+0100) Subject: Refactor yang-model-api child traversal return types X-Git-Tag: v5.0.0~227 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3331469543a13b705d3fb97f23da3cab23416512;hp=30fa9cf35b86299c1080f912a90a9fca791120b0;p=yangtools.git Refactor yang-model-api child traversal return types Rather than using List/Set we use Collection. We really want to say 'iterable', but Collection is close enough and it's slightly more useful. This allows us to use more efficient facades when coming from EffectiveStatement world, i.e. filters can use Collections2.filter() to evaluate substatements lazily. We also codify proper covariance, which strenghtens the read-only nature of the returned type. JIRA: YANGTOOLS-1068 Change-Id: I80be306916dff0575fb4b6824951827e540e482e Signed-off-by: Robert Varga --- diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java index fbb678c557..63940206de 100644 --- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java +++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.odlext.parser; import static java.util.Objects.requireNonNull; import java.util.Collection; -import java.util.List; import java.util.Objects; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; @@ -106,12 +105,12 @@ final class YangModeledAnyxmlEffectiveStatementImpl } @Override - public Collection getMustConstraints() { + public Collection getMustConstraints() { return delegateSchemaNode().getMustConstraints(); } @Override - public List getUnknownSchemaNodes() { + public Collection getUnknownSchemaNodes() { return delegateSchemaNode().getUnknownSchemaNodes(); } diff --git a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java b/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java index f0b309d822..8d17cbeff2 100644 --- a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java +++ b/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.net.URI; -import java.util.List; +import java.util.Collection; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -72,7 +72,7 @@ public class Bug3874ExtensionTest { assertTrue(myContainer2 instanceof ContainerSchemaNode); assertEquals(myContainer2, yangModeledAnyXml.getSchemaOfAnyXmlData()); - List unknownSchemaNodes = yangModeledAnyXml.getUnknownSchemaNodes(); + Collection unknownSchemaNodes = yangModeledAnyXml.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); UnknownSchemaNode next = unknownSchemaNodes.iterator().next(); diff --git a/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java b/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java index 9af969f7a1..d2b61e400a 100644 --- a/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java +++ b/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java @@ -63,7 +63,7 @@ public class NetconfTest { .buildEffective(); final Module module = context.findModule(NetconfConstants.RFC6241_MODULE).get(); - final Iterator it = module.getRpcs().iterator(); + final Iterator it = module.getRpcs().iterator(); assertExtension(false, it.next()); assertExtension(false, it.next()); assertExtension(true, it.next()); diff --git a/yang/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java b/yang/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java index 934e442b98..c730f1392d 100644 --- a/yang/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java +++ b/yang/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java @@ -16,8 +16,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.net.URI; -import java.util.List; -import java.util.Set; +import java.util.Collection; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -85,11 +84,11 @@ public class YangDataExtensionTest { .buildEffective(); assertNotNull(schemaContext); - final Set extensions = schemaContext.getExtensions(); + final Collection extensions = schemaContext.getExtensions(); assertEquals(1, extensions.size()); final Module foo = schemaContext.findModule(FOO_QNAMEMODULE).get(); - final List unknownSchemaNodes = foo.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = foo.getUnknownSchemaNodes(); assertEquals(2, unknownSchemaNodes.size()); YangDataSchemaNode myYangDataANode = null; @@ -118,7 +117,7 @@ public class YangDataExtensionTest { assertNotNull(schemaContext); final Module baz = schemaContext.findModule("baz", REVISION).get(); - final List unknownSchemaNodes = baz.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = baz.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); @@ -146,7 +145,7 @@ public class YangDataExtensionTest { assertNotNull(schemaContext); final Module foobar = schemaContext.findModule("foobar", REVISION).get(); - final List unknownSchemaNodes = foobar.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = foobar.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); @@ -177,10 +176,10 @@ public class YangDataExtensionTest { QName.create(bar.getQNameModule(), "cont")).get(); assertNotNull(cont); - final Set extensions = schemaContext.getExtensions(); + final Collection extensions = schemaContext.getExtensions(); assertEquals(1, extensions.size()); - final List unknownSchemaNodes = cont.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = cont.getUnknownSchemaNodes(); assertEquals(0, unknownSchemaNodes.size()); } diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java index 67c627c7d9..686e42e969 100644 --- a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java +++ b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java @@ -119,7 +119,7 @@ public abstract class AbstractMountPointContextFactory extends AbstractDynamicMo checkArgument(value instanceof String, "Unexpected module leaf value %s", value); return (String) value; }).orElseThrow(() -> new IllegalArgumentException("Mount module missing in " + entry)); - final Iterator it = schemaContext.findModules(moduleName).iterator(); + final Iterator it = schemaContext.findModules(moduleName).iterator(); checkArgument(it.hasNext(), "Failed to find a module named %s", moduleName); final QNameModule module = it.next().getQNameModule(); diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/xpath/PrefixConverters.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/xpath/PrefixConverters.java index 6f8d15001c..6ea82baf23 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/xpath/PrefixConverters.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/xpath/PrefixConverters.java @@ -51,7 +51,7 @@ public final class PrefixConverters { b.put(module.getPrefix(), module.getQNameModule()); for (ModuleImport i : module.getImports()) { - final Optional mod = ctx.findModule(i.getModuleName(), i.getRevision()); + final Optional mod = ctx.findModule(i.getModuleName(), i.getRevision()); checkArgument(mod.isPresent(), "Unsatisfied import of %s by module %s", i, module); b.put(i.getPrefix(), mod.get().getQNameModule()); diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/IdentityrefJSONCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/IdentityrefJSONCodec.java index 6042a46dd1..73f31de069 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/IdentityrefJSONCodec.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/IdentityrefJSONCodec.java @@ -42,7 +42,7 @@ final class IdentityrefJSONCodec implements JSONCodec { return parentModule; } - final Iterator modules = schemaContext.findModules(prefix).iterator(); + final Iterator modules = schemaContext.findModules(prefix).iterator(); checkArgument(modules.hasNext(), "Could not find module %s", prefix); return modules.next().getQNameModule(); }).getQName(); diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java index 4d54a8f55b..79b830ccad 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java @@ -36,13 +36,13 @@ abstract class JSONInstanceIdentifierCodec extends AbstractModuleStringInstanceI @Override protected final Module moduleForPrefix(final String prefix) { - final Iterator modules = context.findModules(prefix).iterator(); + final Iterator modules = context.findModules(prefix).iterator(); return modules.hasNext() ? modules.next() : null; } @Override protected final String prefixForNamespace(final URI namespace) { - final Iterator modules = context.findModules(namespace).iterator(); + final Iterator modules = context.findModules(namespace).iterator(); return modules.hasNext() ? modules.next().getName() : null; } diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 9b7c48fe61..ffbf84947a 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -372,7 +372,7 @@ public final class JsonParserStream implements Closeable, Flushable { moduleNamePart = childName.substring(0, lastIndexOfColon); nodeNamePart = childName.substring(lastIndexOfColon + 1); - final Iterator m = codecs.getSchemaContext().findModules(moduleNamePart).iterator(); + final Iterator m = codecs.getSchemaContext().findModules(moduleNamePart).iterator(); namespace = m.hasNext() ? m.next().getNamespace() : null; } else { nodeNamePart = childName; diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java index 87623bc996..35bd104d2b 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java @@ -45,7 +45,7 @@ final class IdentityrefXmlCodec implements XmlCodec { } final String prefixedNS = ctx.getNamespaceURI(prefix); - final Iterator modules = schemaContext.findModules(URI.create(prefixedNS)).iterator(); + final Iterator modules = schemaContext.findModules(URI.create(prefixedNS)).iterator(); checkArgument(modules.hasNext(), "Could not find module for namespace %s", prefixedNS); return modules.next().getQNameModule(); }).getQName(); diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java index 53952b1694..9c9dcf4221 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java @@ -652,7 +652,7 @@ public final class XmlParserStream implements Closeable, Flushable { private Optional resolveXmlNamespace(final String xmlNamespace) { return resolvedNamespaces.computeIfAbsent(xmlNamespace, nsUri -> { - final Iterator it = codecs.getSchemaContext().findModules(URI.create(nsUri)).iterator(); + final Iterator it = codecs.getSchemaContext().findModules(URI.create(nsUri)).iterator(); return it.hasNext() ? Optional.of(it.next().getQNameModule()) : Optional.empty(); }); } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java index dc3aa59543..ce18ef220f 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java @@ -44,13 +44,13 @@ final class XmlStringInstanceIdentifierCodec extends AbstractModuleStringInstanc @Override protected Module moduleForPrefix(final String prefix) { final String prefixedNS = getNamespaceContext().getNamespaceURI(prefix); - final Iterator modules = context.findModules(URI.create(prefixedNS)).iterator(); + final Iterator modules = context.findModules(URI.create(prefixedNS)).iterator(); return modules.hasNext() ? modules.next() : null; } @Override protected String prefixForNamespace(final URI namespace) { - final Iterator modules = context.findModules(namespace).iterator(); + final Iterator modules = context.findModules(namespace).iterator(); return modules.hasNext() ? modules.next().getName() : null; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java index 08fb284f6f..30739c0102 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.impl.leafref; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import java.util.Set; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -36,7 +35,7 @@ final class LeafRefContextTreeBuilder { final LeafRefContextBuilder rootBuilder = new LeafRefContextBuilder(schemaContext.getQName(), schemaContext.getPath(), schemaContext); - final Set modules = schemaContext.getModules(); + final Collection modules = schemaContext.getModules(); for (final Module module : modules) { for (final DataSchemaNode childNode : module.getChildNodes()) { final LeafRefContext childLeafRefContext = buildLeafRefContextReferencingTree(childNode, module); @@ -47,8 +46,7 @@ final class LeafRefContextTreeBuilder { } for (final Module module : modules) { - final Collection childNodes = module.getChildNodes(); - for (final DataSchemaNode childNode : childNodes) { + for (final DataSchemaNode childNode : module.getChildNodes()) { final LeafRefContext childLeafRefContext = buildLeafRefContextReferencedByTree(childNode, module); if (childLeafRefContext.hasReferencedChild() || childLeafRefContext.isReferenced()) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java index 7a514484e5..d19daa74b5 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java @@ -54,7 +54,7 @@ public final class SchemaUtils { * @return schema node with newest revision or absent if no schema node with matching qname is found */ public static Optional findFirstSchema(final QName qname, - final Iterable dataSchemaNode) { + final Iterable dataSchemaNode) { DataSchemaNode schema = null; if (dataSchemaNode != null && qname != null) { for (final DataSchemaNode dsn : dataSchemaNode) { @@ -110,7 +110,7 @@ public final class SchemaUtils { } public static DataSchemaNode findSchemaForChild(final DataNodeContainer schema, final QName qname, - final Iterable childNodes) { + final Iterable childNodes) { final Optional childSchema = findFirstSchema(qname, childNodes); checkState(childSchema.isPresent(), "Unknown child(ren) node(s) detected, identified by: %s, in: %s", qname, schema); @@ -175,7 +175,7 @@ public final class SchemaUtils { } private static Map mapChildElementsFromChoices(final DataNodeContainer schema, - final Iterable childNodes) { + final Iterable childNodes) { final Map mappedChoices = new LinkedHashMap<>(); for (final DataSchemaNode childSchema : childNodes) { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java index b5327e16f9..30adebb14e 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import java.util.Set; import org.apache.log4j.BasicConfigurator; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -103,8 +102,7 @@ public class DataTreeCandidateValidatorTest { public static void init() throws DataValidationFailedException { context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation"); - final Set modules = context.getModules(); - for (final Module module : modules) { + for (final Module module : context.getModules()) { if (module.getName().equals("leafref-validation")) { valModule = module; } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java index 7ea56da58d..4244aa389e 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.impl.leafref.context; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.Set; import org.apache.log4j.BasicConfigurator; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -82,8 +81,7 @@ public class DataTreeCandidateValidatorTest2 { public static void init() throws DataValidationFailedException { context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation"); - final Set modules = context.getModules(); - for (final Module module : modules) { + for (final Module module : context.getModules()) { if (module.getName().equals("leafref-validation2")) { mainModule = module; } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java index 0aa847c80c..6b8928df83 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.impl.leafref.context; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.Set; import org.apache.log4j.BasicConfigurator; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -85,8 +84,7 @@ public class DataTreeCandidateValidatorTest3 { public static void init() throws DataValidationFailedException { context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation"); - final Set modules = context.getModules(); - for (final Module module : modules) { + for (final Module module : context.getModules()) { if (module.getName().equals("leafref-validation3")) { mainModule = module; } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java index 7722201216..819d8df781 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Map; -import java.util.Set; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -35,8 +34,7 @@ public class LeafRefContextTest { public static void init() { context = YangParserTestUtils.parseYangResourceDirectory("/leafref-context-test/correct-modules"); - final Set modules = context.getModules(); - for (final Module module : modules) { + for (final Module module : context.getModules()) { if (module.getName().equals("leafref-test2")) { rootMod = module; } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java index 1ca9962e58..4539ecd8f5 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.List; -import java.util.Set; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; @@ -42,8 +41,7 @@ public class LeafRefContextTreeBuilderTest { public static void init() { context = YangParserTestUtils.parseYangResourceDirectory("/leafref-context-test/correct-modules"); - final Set modules = context.getModules(); - for (final Module module : modules) { + for (final Module module : context.getModules()) { if (module.getName().equals("leafref-test")) { tstMod = module; } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java index 588c81a5f8..79c0268167 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ActionDefinition; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; @@ -68,7 +67,7 @@ public final class ContainerSchemaNodes { } @Override - public Set getUses() { + public Collection getUses() { return ImmutableSet.of(); } @@ -108,7 +107,7 @@ public final class ContainerSchemaNodes { } @Override - public Collection getMustConstraints() { + public Collection getMustConstraints() { return ImmutableList.of(); } @@ -128,22 +127,22 @@ public final class ContainerSchemaNodes { } @Override - public Set getGroupings() { + public Collection getGroupings() { return rpcDefinition.getGroupings(); } @Override - public Set> getTypeDefinitions() { + public Collection> getTypeDefinitions() { return rpcDefinition.getTypeDefinitions(); } @Override - public Set getAvailableAugmentations() { + public Collection getAvailableAugmentations() { return ImmutableSet.of(); } @Override - public Collection getChildNodes() { + public Collection getChildNodes() { final ContainerSchemaNode input = rpcDefinition.getInput(); final ContainerSchemaNode output = rpcDefinition.getOutput(); if (input == null && output == null) { @@ -176,12 +175,12 @@ public final class ContainerSchemaNodes { } @Override - public Set getActions() { + public Collection getActions() { return ImmutableSet.of(); } @Override - public Set getNotifications() { + public Collection getNotifications() { return ImmutableSet.of(); } } @@ -189,7 +188,7 @@ public final class ContainerSchemaNodes { private static final class NotificationContainerSchemaNode extends AbstractContainerSchemaNode { private final NotificationDefinition notification; - private final ImmutableMap mapNodes; + private final ImmutableMap mapNodes; private NotificationContainerSchemaNode(final NotificationDefinition notification) { super(notification); @@ -198,27 +197,27 @@ public final class ContainerSchemaNodes { } @Override - public Set getNotifications() { + public Collection getNotifications() { return ImmutableSet.of(notification); } @Override - public Set getAvailableAugmentations() { + public Collection getAvailableAugmentations() { return notification.getAvailableAugmentations(); } @Override - public Set> getTypeDefinitions() { + public Collection> getTypeDefinitions() { return notification.getTypeDefinitions(); } @Override - public Collection getChildNodes() { + public Collection getChildNodes() { return notification.getChildNodes(); } @Override - public Set getGroupings() { + public Collection getGroupings() { return notification.getGroupings(); } @@ -235,7 +234,7 @@ public final class ContainerSchemaNodes { } @Override - public Set getActions() { + public Collection getActions() { return ImmutableSet.of(); } } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java index 9a22d7cdda..2b85ee83fa 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java @@ -44,7 +44,7 @@ public abstract class ModuleStringIdentityrefCodec extends AbstractModuleStringI @Override protected String prefixForNamespace(final URI namespace) { - final Iterator modules = context.findModules(namespace).iterator(); + final Iterator modules = context.findModules(namespace).iterator(); return modules.hasNext() ? modules.next().getName() : null; } } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java index f58816c212..24a5ec5d76 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ActionDefinition; @@ -61,12 +60,12 @@ public class OperationAsContainer extends ForwardingObject implements ContainerS } @Override - public final Set> getTypeDefinitions() { + public final Collection> getTypeDefinitions() { return delegate.getTypeDefinitions(); } @Override - public final Set getGroupings() { + public final Collection getGroupings() { return delegate.getGroupings(); } @@ -112,12 +111,12 @@ public class OperationAsContainer extends ForwardingObject implements ContainerS } @Override - public Set getUses() { + public Collection getUses() { return ImmutableSet.of(); } @Override - public final Set getAvailableAugmentations() { + public final Collection getAvailableAugmentations() { return ImmutableSet.of(); } @@ -127,7 +126,7 @@ public class OperationAsContainer extends ForwardingObject implements ContainerS } @Override - public final Collection getChildNodes() { + public final Collection getChildNodes() { final List ret = new ArrayList<>(); final ContainerSchemaNode input = getInput(); final ContainerSchemaNode output = getOutput(); @@ -158,7 +157,7 @@ public class OperationAsContainer extends ForwardingObject implements ContainerS } @Override - public final Set getActions() { + public final Collection getActions() { return ImmutableSet.of(); } @@ -169,7 +168,7 @@ public class OperationAsContainer extends ForwardingObject implements ContainerS } @Override - public final Set getNotifications() { + public final Collection getNotifications() { return ImmutableSet.of(); } @@ -180,7 +179,7 @@ public class OperationAsContainer extends ForwardingObject implements ContainerS } @Override - public final Collection getMustConstraints() { + public final Collection getMustConstraints() { return ImmutableSet.of(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java index 759a6becc1..420d99f3db 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.model.api; import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; @@ -25,7 +25,7 @@ public interface ActionNodeContainer { * * @return set of action nodes */ - @NonNull Set getActions(); + @NonNull Collection getActions(); /** * Find an action based on its QName. Default implementation searches the set returned by {@link #getActions()}. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java index e30273c775..dbf8e46f5d 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java @@ -7,7 +7,7 @@ */ package org.opendaylight.yangtools.yang.model.api; -import java.util.Set; +import java.util.Collection; /** * Interface for all nodes which are possible targets of augmentation. The @@ -20,5 +20,5 @@ public interface AugmentationTarget { * * @return set of augmentations targeting this element. */ - Set getAvailableAugmentations(); + Collection getAvailableAugmentations(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java index 0e472fec97..4e994cc64b 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java @@ -28,6 +28,7 @@ public interface ChoiceSchemaNode extends DataSchemaNode, AugmentationTarget, Ma * @return set of ChoiceCaseNode objects defined in this node which represents set of arguments of the YANG * case substatement of the choice statement. */ + // FIXME: 5.0.0: revert back to collection + lookup SortedMap getCases(); /** diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java index 845a3188dd..e1b6f3a097 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java @@ -16,7 +16,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; @@ -29,7 +28,7 @@ public interface DataNodeContainer { * * @return typedef statements in lexicographical order */ - Set> getTypeDefinitions(); + Collection> getTypeDefinitions(); /** * Returns set of all child nodes defined within this DataNodeContainer. Although the return type is a collection, @@ -42,14 +41,14 @@ public interface DataNodeContainer { * * @return child nodes in lexicographical order */ - Collection getChildNodes(); + Collection getChildNodes(); /** * Returns set of all groupings defined within this DataNodeContainer. * * @return grouping statements in lexicographical order */ - Set getGroupings(); + Collection getGroupings(); /** * Returns the child node corresponding to the specified name. @@ -115,7 +114,7 @@ public interface DataNodeContainer { * * @return Set of all uses nodes defined within this DataNodeContainer */ - Set getUses(); + Collection getUses(); /** * Returns a {@code data node} identified by a QName. This method is distinct from diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java index d77c03b547..a78eeafd80 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.model.api; import com.google.common.annotations.Beta; import java.util.Collection; -import java.util.Set; /** * Interface describing YANG 'deviate' statement. @@ -69,7 +68,7 @@ public interface DeviateDefinition { * * @return set of the deviated must statements */ - Set getDeviatedMusts(); + Collection getDeviatedMusts(); /** * Returns deviated type statement. @@ -83,7 +82,7 @@ public interface DeviateDefinition { * * @return collection of the deviated unique statements */ - Collection getDeviatedUniques(); + Collection getDeviatedUniques(); /** * Returns deviated units statement. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java index 408a1725f6..50e24dd819 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java @@ -7,7 +7,8 @@ */ package org.opendaylight.yangtools.yang.model.api; -import java.util.List; +import java.util.Collection; +import org.eclipse.jdt.annotation.NonNull; /** * Interface describing YANG 'deviation' statement. @@ -28,7 +29,7 @@ public interface Deviation extends DocumentedNode { /** * Returns deviate children. * - * @return List of all deviate statements defined in this deviation. + * @return Collection of all deviate statements defined in this deviation. */ - List getDeviates(); + @NonNull Collection getDeviates(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java index d6c387ae28..0d9b27f69e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.api; import com.google.common.collect.ImmutableList; -import java.util.List; +import java.util.Collection; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; @@ -31,11 +31,11 @@ public interface DocumentedNode { Optional getReference(); /** - * Returns unknown schema nodes which belongs to this instance. Default implementation returns an empty list. + * Returns unknown schema nodes which belongs to this instance. Default implementation returns an empty collection. * - * @return list of unknown schema nodes defined under this node. + * @return collection of unknown schema nodes defined under this node. */ - default @NonNull List getUnknownSchemaNodes() { + default @NonNull Collection getUnknownSchemaNodes() { return ImmutableList.of(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java index 42ae973508..686be4a9f8 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java @@ -7,7 +7,7 @@ */ package org.opendaylight.yangtools.yang.model.api; -import java.util.Set; +import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; /** @@ -30,12 +30,15 @@ public interface IdentitySchemaNode extends SchemaNode { * @return set of existing identities from which the new identity is derived or an empty Set if the identity is * a root identity. */ - @NonNull Set getBaseIdentities(); + @NonNull Collection getBaseIdentities(); /** * Get identities derived from this identity. * * @return collection of identities derived from this identity */ - @NonNull Set getDerivedIdentities(); + // FIXME: 5.0.0: this causes circular references in implementation objects under immutables+builder pattern, + // and really should be a SchemaContext-level utility (i.e. walk entire SchemaContext, cache the + // result) + @NonNull Collection getDerivedIdentities(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java index e4cb9ba96b..4457749f4f 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java @@ -41,5 +41,5 @@ public interface ListSchemaNode extends DataNodeContainer, AugmentationTarget, D * * @return Collection of unique constraints of this list schema node */ - @NonNull Collection getUniqueConstraints(); + @NonNull Collection getUniqueConstraints(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java index 0355ca5f37..8b4246125b 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java @@ -8,9 +8,8 @@ package org.opendaylight.yangtools.yang.model.api; import java.net.URI; -import java.util.List; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -106,9 +105,9 @@ public interface Module extends DataNodeContainer, DocumentedNode, Immutable, No * @return set of module imports which are specified in the module as the argument of YANG {@code import} * statements. */ - Set getImports(); + Collection getImports(); - Set getSubmodules(); + Collection getSubmodules(); /** * Returns {@link FeatureDefinition} instances which contain data from {@code feature} statements defined in the @@ -120,7 +119,7 @@ public interface Module extends DataNodeContainer, DocumentedNode, Immutable, No * @return feature statements in lexicographical order which are specified in the module as the argument of YANG * {@code feature} statements. */ - Set getFeatures(); + Collection getFeatures(); /** * Returns {@link AugmentationSchemaNode} instances which contain data from {@code augment} statements defined @@ -129,7 +128,7 @@ public interface Module extends DataNodeContainer, DocumentedNode, Immutable, No * @return set of the augmentation schema instances which are specified in the module as YANG {@code augment} * statement and are lexicographically ordered */ - Set getAugmentations(); + Collection getAugmentations(); /** * Returns {@link RpcDefinition} instances which contain data from {@code rpc} statements defined in the module. @@ -137,14 +136,14 @@ public interface Module extends DataNodeContainer, DocumentedNode, Immutable, No * @return set of the RPC definition instances which are specified in the module as YANG {@code rpc} statements and * are lexicographicaly ordered */ - Set getRpcs(); + Collection getRpcs(); /** * Returns {@link Deviation} instances which contain data from {@code deviation} statements defined in the module. * * @return set of the deviation instances */ - Set getDeviations(); + Collection getDeviations(); /** * Returns {@link IdentitySchemaNode} instances which contain data from {@code identity} statements defined in the @@ -153,7 +152,7 @@ public interface Module extends DataNodeContainer, DocumentedNode, Immutable, No * @return set of identity schema node instances which are specified in the module as YANG {@code identity} * statements and are lexicographically ordered */ - Set getIdentities(); + Collection getIdentities(); /** * Returns {@link ExtensionDefinition} instances which contain data from {@code extension} statements defined in @@ -162,5 +161,5 @@ public interface Module extends DataNodeContainer, DocumentedNode, Immutable, No * @return set of extension definition instances which are specified in the module as YANG {@code extension} * statements and are lexicographically ordered */ - List getExtensionSchemaNodes(); + Collection getExtensionSchemaNodes(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java index 609ff1f1f6..8ec0bd7cc9 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java @@ -21,5 +21,5 @@ public interface MustConstraintAware { * @return collection of MustDefinition (XPath) instances which represents the concrete data * constraints */ - Collection getMustConstraints(); + Collection getMustConstraints(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java index 7e905f5170..65e6c26402 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java @@ -11,6 +11,7 @@ import java.net.URI; import java.util.Optional; import org.opendaylight.yangtools.yang.common.Revision; +// FIXME: 5.0.0: this really is QNameModuleAware (or some such) public interface NamespaceRevisionAware { URI getNamespace(); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java index 8a0d099cd8..f77caf9af8 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java @@ -9,8 +9,8 @@ package org.opendaylight.yangtools.yang.model.api; import static java.util.Objects.requireNonNull; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; @@ -22,7 +22,7 @@ public interface NotificationNodeContainer { * * @return set of notification nodes */ - @NonNull Set getNotifications(); + @NonNull Collection getNotifications(); /** * Find a notification based on its QName. Default implementation searches the set returned by diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java index 4f285d85fe..1eabe85d4d 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java @@ -5,11 +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.model.api; import com.google.common.annotations.Beta; -import java.util.Set; +import java.util.Collection; /** * Common interface for an operation. @@ -21,14 +20,14 @@ public interface OperationDefinition extends SchemaNode { * * @return Set of type definitions declared under this operation. */ - Set> getTypeDefinitions(); + Collection> getTypeDefinitions(); /** * Returns the set of grouping statements declared under this operation. * * @return Set of grouping statements declared under this operation. */ - Set getGroupings(); + Collection getGroupings(); /** * Returns definition of input parameters for this operation. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java index 9ef5971f8f..b5535a1a4f 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java @@ -10,12 +10,11 @@ package org.opendaylight.yangtools.yang.model.api; import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; +import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import java.net.URI; import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.concepts.Immutable; @@ -47,7 +46,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * @return set of DataSchemaNode instances which represents * YANG data nodes at the module top level */ - Set getDataDefinitions(); + Collection getDataDefinitions(); /** * Returns modules which are part of the schema context. Returned set is required to have its iteration ordered @@ -56,7 +55,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * * @return set of the modules which belong to the schema context */ - Set getModules(); + Collection getModules(); /** * Returns rpc definition instances which are defined as the direct @@ -65,7 +64,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * @return set of RpcDefinition instances which represents * nodes defined via rpc YANG keyword */ - Set getOperations(); + Collection getOperations(); /** * Returns extension definition instances which are defined as the direct @@ -74,7 +73,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * @return set of ExtensionDefinition instances which * represents nodes defined via extension YANG keyword */ - Set getExtensions(); + Collection getExtensions(); /** * Returns the module matching specified {@link QNameModule}, if present. @@ -130,7 +129,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * @return module instance which has name and revision the same as are the values specified in parameters * name and revision. */ - default Optional findModule(final String name, final Optional revision) { + default Optional findModule(final String name, final Optional revision) { return findModules(name).stream().filter(module -> revision.equals(module.getRevision())).findAny(); } @@ -144,7 +143,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * @return module instance which has name and revision the same as are the values specified in parameters * name and revision. */ - default Optional findModule(final String name, final @Nullable Revision revision) { + default Optional findModule(final String name, final @Nullable Revision revision) { return findModule(name, Optional.ofNullable(revision)); } @@ -156,7 +155,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * and no revision. * @throws NullPointerException if name is null */ - default Optional findModule(final String name) { + default Optional findModule(final String name) { return findModule(name, Optional.empty()); } @@ -168,8 +167,8 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * string with the module name * @return set of module instances with specified name. */ - default Set findModules(final String name) { - return Sets.filter(getModules(), m -> name.equals(m.getName())); + default Collection findModules(final String name) { + return Collections2.filter(getModules(), m -> name.equals(m.getName())); } /** @@ -181,12 +180,12 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { * @return module instance which has namespace equal to the * namespace or null in other cases */ - default Set findModules(final URI namespace) { - return Sets.filter(getModules(), m -> namespace.equals(m.getNamespace())); + default Collection findModules(final URI namespace) { + return Collections2.filter(getModules(), m -> namespace.equals(m.getNamespace())); } @Override - default Set getActions() { + default Collection getActions() { return ImmutableSet.of(); } @@ -198,7 +197,8 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { @Override default Optional findNotification(final QName qname) { - final Optional> defs = findModule(qname.getModule()).map(Module::getNotifications); + final Optional> defs = findModule(qname.getModule()) + .map(Module::getNotifications); if (defs.isPresent()) { for (NotificationDefinition def : defs.get()) { if (qname.equals(def.getQName())) { @@ -220,7 +220,7 @@ public interface SchemaContext extends ContainerSchemaNode, Immutable { } @Override - default Collection getMustConstraints() { + default Collection getMustConstraints() { return ImmutableSet.of(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java index f2ce302722..edd4469700 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java @@ -34,6 +34,7 @@ public abstract class SchemaPath implements Immutable { /** * An absolute SchemaPath. */ + // FIXME: 5.0.0: expose as a top-level construct (and use in APIs) private static final class AbsoluteSchemaPath extends SchemaPath { private AbsoluteSchemaPath(final SchemaPath parent, final QName qname) { super(parent, qname); @@ -53,6 +54,7 @@ public abstract class SchemaPath implements Immutable { /** * A relative SchemaPath. */ + // FIXME: 5.0.0: expose as a top-level construct (and use in APIs) private static final class RelativeSchemaPath extends SchemaPath { private RelativeSchemaPath(final SchemaPath parent, final QName qname) { super(parent, qname); @@ -260,7 +262,7 @@ public abstract class SchemaPath implements Immutable { * path from the schema node towards the root. */ public Iterable getPathTowardsRoot() { - return () -> new UnmodifiableIterator() { + return () -> new UnmodifiableIterator<>() { private SchemaPath current = SchemaPath.this; @Override diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java index f8e163cbf1..72408f54f5 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java @@ -7,8 +7,8 @@ */ package org.opendaylight.yangtools.yang.model.api; +import java.util.Collection; import java.util.Map; -import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; @@ -21,6 +21,7 @@ public interface UsesNode extends WhenConditionAware, WithStatus, CopyableNode { * * @return schema path to 'grouping' on which this 'uses' statement points */ + // FIXME: 5.0.0: this is effective model, hence we should return GroupingDefinition @NonNull SchemaPath getGroupingPath(); /** @@ -28,12 +29,13 @@ public interface UsesNode extends WhenConditionAware, WithStatus, CopyableNode { * * @return Set of augment statements defined under this uses node */ - @NonNull Set getAugmentations(); + @NonNull Collection getAugmentations(); /** * Some of the properties of each node in the grouping can be refined with the "refine" statement. * * @return Map, where key is schema path of refined node and value is refined node */ + // FIXME: 5.0.0: this should probably be SchemaPath.RelativeSchemaPath (which needs to be exposed) @NonNull Map getRefines(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java index 89e8eb95dc..f24202ae3b 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java @@ -7,7 +7,7 @@ */ package org.opendaylight.yangtools.yang.model.api.type; -import java.util.List; +import java.util.Collection; import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -24,7 +24,7 @@ public interface BitsTypeDefinition extends TypeDefinition { * @return list of Bit type instastances with data about all * individual bits of bits YANG built-in type */ - @NonNull List getBits(); + @NonNull Collection getBits(); static int hashCode(final @NonNull BitsTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), @@ -48,6 +48,7 @@ public interface BitsTypeDefinition extends TypeDefinition { * Contains the methods for accessing the data about the individual bit of * bits YANG type. */ + // FIXME: 5.0.0: Bit should not be a SchemaNode interface Bit extends SchemaNode { /** * Returns the name of the concrete bit. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java index 643030f858..4fef76bf9d 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java @@ -24,7 +24,7 @@ public interface IdentityrefTypeDefinition extends TypeDefinition getIdentities(); + @NonNull Set getIdentities(); static int hashCode(final @NonNull IdentityrefTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java index 7cc317c9fe..59a4921a19 100644 --- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java +++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java @@ -28,7 +28,7 @@ abstract class AbstractYinExportTest { final void exportYinModules(final String yangDir, final String yinDir) throws IOException, SAXException, XMLStreamException { final SchemaContext schemaContext = YangParserTestUtils.parseYangResourceDirectory(yangDir); - final Collection modules = schemaContext.getModules(); + final Collection modules = schemaContext.getModules(); assertNotEquals(0, modules.size()); for (Module module : modules) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java index 035173508f..ddbb8fb97d 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java @@ -13,6 +13,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.SetMultimap; import java.net.URI; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashSet; @@ -90,7 +91,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { protected abstract Map getModuleMap(); @Override - public Set getDataDefinitions() { + public Collection getDataDefinitions() { final Set dataDefs = new HashSet<>(); for (Module m : getModules()) { dataDefs.addAll(m.getChildNodes()); @@ -99,7 +100,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getNotifications() { + public Collection getNotifications() { final Set notifications = new HashSet<>(); for (Module m : getModules()) { notifications.addAll(m.getNotifications()); @@ -108,7 +109,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getOperations() { + public Collection getOperations() { final Set rpcs = new HashSet<>(); for (Module m : getModules()) { rpcs.addAll(m.getRpcs()); @@ -117,7 +118,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getExtensions() { + public Collection getExtensions() { final Set extensions = new HashSet<>(); for (Module m : getModules()) { extensions.addAll(m.getExtensionSchemaNodes()); @@ -126,7 +127,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Optional findModule(final String name, final Optional revision) { + public Optional findModule(final String name, final Optional revision) { for (final Module module : getNameToModules().get(name)) { if (revision.equals(module.getRevision())) { return Optional.of(module); @@ -142,12 +143,12 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set findModules(final URI namespace) { + public Collection findModules(final URI namespace) { return getNamespaceToModules().get(namespace); } @Override - public Set findModules(final String name) { + public Collection findModules(final String name) { return getNameToModules().get(name); } @@ -184,7 +185,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public List getUnknownSchemaNodes() { + public Collection getUnknownSchemaNodes() { final List result = new ArrayList<>(); for (Module module : getModules()) { result.addAll(module.getUnknownSchemaNodes()); @@ -193,7 +194,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set> getTypeDefinitions() { + public Collection> getTypeDefinitions() { final Set> result = new LinkedHashSet<>(); for (Module module : getModules()) { result.addAll(module.getTypeDefinitions()); @@ -202,7 +203,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getChildNodes() { + public Collection getChildNodes() { final Set result = new LinkedHashSet<>(); for (Module module : getModules()) { result.addAll(module.getChildNodes()); @@ -211,7 +212,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getGroupings() { + public Collection getGroupings() { final Set result = new LinkedHashSet<>(); for (Module module : getModules()) { result.addAll(module.getGroupings()); @@ -232,7 +233,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getUses() { + public Collection getUses() { return Collections.emptySet(); } @@ -242,7 +243,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { } @Override - public Set getAvailableAugmentations() { + public Collection getAvailableAugmentations() { return Collections.emptySet(); } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java index af7762a997..6cc2097adf 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java @@ -11,9 +11,9 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -40,7 +40,7 @@ public final class EffectiveAugmentationSchema implements AugmentationSchemaNode private final ImmutableMap mappedChildSchemas; public EffectiveAugmentationSchema(final AugmentationSchemaNode augmentSchema, - final Set realChildSchemas) { + final Collection realChildSchemas) { this.delegate = requireNonNull(augmentSchema); this.realChildSchemas = ImmutableSet.copyOf(realChildSchemas); @@ -94,22 +94,22 @@ public final class EffectiveAugmentationSchema implements AugmentationSchemaNode } @Override - public List getUnknownSchemaNodes() { + public Collection getUnknownSchemaNodes() { return delegate.getUnknownSchemaNodes(); } @Override - public Set> getTypeDefinitions() { + public Collection> getTypeDefinitions() { return delegate.getTypeDefinitions(); } @Override - public Set getChildNodes() { + public Collection getChildNodes() { return realChildSchemas; } @Override - public Set getGroupings() { + public Collection getGroupings() { return delegate.getGroupings(); } @@ -119,7 +119,7 @@ public final class EffectiveAugmentationSchema implements AugmentationSchemaNode } @Override - public Set getUses() { + public Collection getUses() { return delegate.getUses(); } @@ -129,7 +129,7 @@ public final class EffectiveAugmentationSchema implements AugmentationSchemaNode } @Override - public Set getActions() { + public Collection getActions() { return delegate.getActions(); } @@ -139,7 +139,7 @@ public final class EffectiveAugmentationSchema implements AugmentationSchemaNode } @Override - public Set getNotifications() { + public Collection getNotifications() { return delegate.getNotifications(); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java index d749490fbf..2e387ad13b 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java @@ -116,13 +116,13 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { module -> checkModuleDependency(module, rootModules))); } - private static Multimap getStringModuleMap(final SchemaContext delegate) { + private static Multimap getStringModuleMap(final SchemaContext delegate) { return Multimaps.index(delegate.getModules(), Module::getName); } //dealing with imported module other than root and directly importing root - private static Collection getImportedModules(final Map allModules, - final Set baseModules, final TreeMultimap nameToModulesAll) { + private static Collection getImportedModules(final Map allModules, + final Collection baseModules, final TreeMultimap nameToModulesAll) { List relatedModules = new LinkedList<>(); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySort.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySort.java index 58b8ec2ebf..255875b9f4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySort.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySort.java @@ -62,19 +62,19 @@ public final class ModuleDependencySort { * @return Sorted list of Modules. Modules can be further processed in returned order. * @throws IllegalArgumentException when provided modules are not consistent. */ - public static List sort(final Collection modules) { + public static List sort(final Collection modules) { final List sorted = sortInternal(modules); // Cast to Module from Node and return return Lists.transform(sorted, input -> input == null ? null : ((ModuleNodeImpl) input).getReference()); } - private static List sortInternal(final Collection modules) { + private static List sortInternal(final Collection modules) { final Table, ModuleNodeImpl> moduleGraph = createModuleGraph(modules); return TopologicalSort.sort(new HashSet<>(moduleGraph.values())); } private static Table, ModuleNodeImpl> createModuleGraph( - final Collection builders) { + final Collection builders) { final Table, ModuleNodeImpl> moduleGraph = HashBasedTable.create(); processModules(moduleGraph, builders); @@ -87,7 +87,7 @@ public final class ModuleDependencySort { * Extract module:revision from modules. */ private static void processDependencies(final Table, ModuleNodeImpl> moduleGraph, - final Collection mmbs) { + final Collection mmbs) { final Map allNS = new HashMap<>(); // Create edges in graph @@ -137,7 +137,7 @@ public final class ModuleDependencySort { } } - private static Collection allImports(final Module mod) { + private static Collection allImports(final Module mod) { if (mod.getSubmodules().isEmpty()) { return mod.getImports(); } @@ -188,7 +188,7 @@ public final class ModuleDependencySort { * Extract dependencies from modules to fill dependency graph. */ private static void processModules(final Table, ModuleNodeImpl> moduleGraph, - final Iterable modules) { + final Iterable modules) { // Process nodes for (final Module momb : modules) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java index c7e7e2bf89..060fecff1f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java @@ -627,8 +627,7 @@ public final class SchemaContextUtil { return module; } - final Set imports = module.getImports(); - for (final ModuleImport mi : imports) { + for (final ModuleImport mi : module.getImports()) { if (prefix.equals(mi.getPrefix())) { return context.findModule(mi.getModuleName(), mi.getRevision()).orElse(null); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java index bfa70f76fe..4ea0e0bae6 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; @@ -108,27 +107,24 @@ public final class SchemaNodeUtils { return; } - final Iterable childNodes = dataNode.getChildNodes(); - if (childNodes != null) { - for (DataSchemaNode childNode : childNodes) { - if (childNode.isAugmenting()) { - continue; - } - aggregator.addChild(childNode); - if (childNode instanceof ContainerSchemaNode) { - final ContainerSchemaNode containerNode = (ContainerSchemaNode) childNode; - aggregator.addContainer(containerNode); - traverse(aggregator, containerNode); - } else if (childNode instanceof ListSchemaNode) { - final ListSchemaNode list = (ListSchemaNode) childNode; - aggregator.addList(list); - traverse(aggregator, list); - } else if (childNode instanceof ChoiceSchemaNode) { - final ChoiceSchemaNode choiceNode = (ChoiceSchemaNode) childNode; - aggregator.addChoice(choiceNode); - for (final CaseSchemaNode caseNode : choiceNode.getCases().values()) { - traverse(aggregator, caseNode); - } + for (DataSchemaNode childNode : dataNode.getChildNodes()) { + if (childNode.isAugmenting()) { + continue; + } + aggregator.addChild(childNode); + if (childNode instanceof ContainerSchemaNode) { + final ContainerSchemaNode containerNode = (ContainerSchemaNode) childNode; + aggregator.addContainer(containerNode); + traverse(aggregator, containerNode); + } else if (childNode instanceof ListSchemaNode) { + final ListSchemaNode list = (ListSchemaNode) childNode; + aggregator.addList(list); + traverse(aggregator, list); + } else if (childNode instanceof ChoiceSchemaNode) { + final ChoiceSchemaNode choiceNode = (ChoiceSchemaNode) childNode; + aggregator.addChoice(choiceNode); + for (final CaseSchemaNode caseNode : choiceNode.getCases().values()) { + traverse(aggregator, caseNode); } } } @@ -165,12 +161,9 @@ public final class SchemaNodeUtils { } private static void traverseGroupings(final DataNodeAggregator aggregator, final DataNodeContainer dataNode) { - final Set groupings = dataNode.getGroupings(); - if (groupings != null) { - for (GroupingDefinition grouping : groupings) { - aggregator.addGrouping(grouping); - traverse(aggregator, grouping); - } + for (GroupingDefinition grouping : dataNode.getGroupings()) { + aggregator.addGrouping(grouping); + traverse(aggregator, grouping); } } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContext.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContext.java index fe4e17c646..43804dee27 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContext.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContext.java @@ -20,6 +20,7 @@ import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; import java.net.URI; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; @@ -44,7 +45,7 @@ public class SimpleSchemaContext extends AbstractSchemaContext implements Annota private final ImmutableSet modules; private final ImmutableMap annotations; - protected SimpleSchemaContext(final Set modules) { + protected SimpleSchemaContext(final Collection modules) { /* * Instead of doing this on each invocation of getModules(), pre-compute it once and keep it around -- better * than the set we got in. @@ -85,7 +86,7 @@ public class SimpleSchemaContext extends AbstractSchemaContext implements Annota * Create a new instance from specified modules. Note that no module validation is done and hence the consistency * of the resulting SchemaContext is completely in hands of the caller. */ - public static SimpleSchemaContext forModules(final Set modules) { + public static SimpleSchemaContext forModules(final Collection modules) { return new SimpleSchemaContext(modules); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java index 043ebcd849..c882b12da4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; -import java.util.List; +import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -21,7 +21,7 @@ abstract class AbstractBaseType> extends AbstractTyp this(SchemaPath.ROOT.createChild(qname), ImmutableList.of()); } - AbstractBaseType(final SchemaPath path, final List unknownSchemaNodes) { + AbstractBaseType(final SchemaPath path, final Collection unknownSchemaNodes) { super(path, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java index 1425ed4319..2aa80afce3 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java @@ -28,7 +28,7 @@ abstract class AbstractDerivedType> extends Abstract AbstractDerivedType(final T baseType, final SchemaPath path, final Object defaultValue, final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { + final Collection unknownSchemNodes) { super(path, unknownSchemNodes); this.baseType = requireNonNull(baseType); this.status = requireNonNull(status); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java index 27cfaf785f..b8ee620e75 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java @@ -20,7 +20,7 @@ abstract class AbstractLengthRestrictedDerivedType unknownSchemaNodes) { + final String units, final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java index 3aaaea1a2f..6ea7d3a1ac 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java @@ -20,7 +20,8 @@ abstract class AbstractLengthRestrictedType unknownSchemaNodes, final @Nullable LengthConstraint lengthConstraint) { + final Collection unknownSchemaNodes, + final @Nullable LengthConstraint lengthConstraint) { super(baseType, path, unknownSchemaNodes); this.lengthConstraint = lengthConstraint; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java index 4d767e6473..71df284e74 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java @@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; -import java.util.List; +import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; @@ -53,8 +53,9 @@ abstract class AbstractRangeRestrictedBaseType unknownSchemaNodes, - final RangeConstraint rangeConstraint) { + AbstractRangeRestrictedBaseType(final SchemaPath path, + final Collection unknownSchemaNodes, + final RangeConstraint rangeConstraint) { super(path, unknownSchemaNodes); this.rangeConstraint = requireNonNull(rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java index 86674ebd00..fe8113c1df 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java @@ -21,7 +21,7 @@ abstract class AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final String units, final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java index dcd460951a..cc7c57aaf4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java @@ -21,7 +21,8 @@ abstract class AbstractRangeRestrictedType rangeConstraint; AbstractRangeRestrictedType(final T baseType, final SchemaPath path, - final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { + final Collection unknownSchemaNodes, + final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes); this.rangeConstraint = rangeConstraint; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java index 77262c2280..c0198f4206 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java @@ -21,7 +21,7 @@ abstract class AbstractRestrictedType> extends Abstr private final @NonNull T baseType; AbstractRestrictedType(final T baseType, final SchemaPath path, - final Collection unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(path, unknownSchemaNodes); this.baseType = requireNonNull(baseType); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java index fe0abdd72c..30afe90d35 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; @@ -23,7 +22,7 @@ abstract class AbstractTypeDefinition> implements Im private final @NonNull ImmutableList unknownSchemaNodes; private final @NonNull SchemaPath path; - AbstractTypeDefinition(final SchemaPath path, final Collection unknownSchemaNodes) { + AbstractTypeDefinition(final SchemaPath path, final Collection unknownSchemaNodes) { this.path = requireNonNull(path); this.unknownSchemaNodes = ImmutableList.copyOf(unknownSchemaNodes); } @@ -39,7 +38,7 @@ abstract class AbstractTypeDefinition> implements Im } @Override - public final List getUnknownSchemaNodes() { + public final Collection getUnknownSchemaNodes() { return unknownSchemaNodes; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java index eeba56f86f..e51da228f8 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -18,13 +17,14 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; final class BaseBitsType extends AbstractBaseType implements BitsTypeDefinition { private final @NonNull ImmutableList bits; - BaseBitsType(final SchemaPath path, final List unknownSchemaNodes, final Collection bits) { + BaseBitsType(final SchemaPath path, final Collection unknownSchemaNodes, + final Collection bits) { super(path, unknownSchemaNodes); this.bits = ImmutableList.copyOf(bits); } @Override - public List getBits() { + public Collection getBits() { return bits; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java index 9196c2f450..046f1fdc9b 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import java.math.BigDecimal; -import java.util.List; +import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -77,7 +77,7 @@ final class BaseDecimalType extends AbstractRangeRestrictedBaseType unknownSchemaNodes, + BaseDecimalType(final SchemaPath path, final Collection unknownSchemaNodes, final int fractionDigits, final RangeConstraint rangeConstraint) { super(path, unknownSchemaNodes, rangeConstraint); this.fractionDigits = fractionDigits; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java index b019bf1e8a..f1d98c08e4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; final class BaseEnumerationType extends AbstractBaseType implements EnumTypeDefinition { private final @NonNull ImmutableList values; - BaseEnumerationType(final SchemaPath path, final List unknownSchemaNodes, + BaseEnumerationType(final SchemaPath path, final Collection unknownSchemaNodes, final Collection values) { super(path, unknownSchemaNodes); this.values = ImmutableList.copyOf(values); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java index a7467275a2..7ef27d9057 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import static java.util.Objects.requireNonNull; -import java.util.List; +import java.util.Collection; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; @@ -19,16 +19,16 @@ import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; final class BaseIdentityrefType extends AbstractBaseType implements IdentityrefTypeDefinition { - private final @NonNull Set identities; + private final @NonNull Set identities; - BaseIdentityrefType(final SchemaPath path, final List unknownSchemaNodes, - final Set identities) { + BaseIdentityrefType(final SchemaPath path, final Collection unknownSchemaNodes, + final Set identities) { super(path, unknownSchemaNodes); this.identities = requireNonNull(identities); } @Override - public Set getIdentities() { + public Set getIdentities() { return identities; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java index b48ce547e7..a5785dffd3 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import static java.util.Objects.requireNonNull; -import java.util.List; +import java.util.Collection; import org.opendaylight.yangtools.yang.model.api.PathExpression; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -20,7 +20,7 @@ final class BaseLeafrefType extends AbstractBaseType impl private final boolean requireInstance; BaseLeafrefType(final SchemaPath path, final PathExpression pathStatement, final boolean requireInstance, - final List unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(path, unknownSchemaNodes); this.pathStatement = requireNonNull(pathStatement); this.requireInstance = requireInstance; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java index 9eb3ec017a..d1d0339afe 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; final class BaseUnionType extends AbstractBaseType implements UnionTypeDefinition { private final ImmutableList> types; - BaseUnionType(final SchemaPath path, final List unknownSchemaNodes, + BaseUnionType(final SchemaPath path, final Collection unknownSchemaNodes, final Collection> types) { super(path, unknownSchemaNodes); this.types = ImmutableList.copyOf(types); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java index 5bb12efb66..251bc8959e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java @@ -11,6 +11,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; +import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -68,7 +69,7 @@ final class BitImpl implements Bit, Immutable { } @Override - public List getUnknownSchemaNodes() { + public Collection getUnknownSchemaNodes() { return unknownNodes; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java index c16c021f32..178042eadc 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java @@ -17,7 +17,7 @@ final class DerivedBinaryType extends AbstractLengthRestrictedDerivedType unknownSchemNodes) { + final Collection unknownSchemNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java index 6207ae2d43..fbc6fd854c 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import java.util.List; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -17,12 +16,12 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; final class DerivedBitsType extends AbstractDerivedType implements BitsTypeDefinition { DerivedBitsType(final BitsTypeDefinition baseType, final SchemaPath path, final Object defaultValue, final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { + final Collection unknownSchemNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override - public List getBits() { + public Collection getBits() { return baseType().getBits(); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java index c018a7ad80..1a347611c6 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java @@ -15,8 +15,8 @@ import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; final class DerivedBooleanType extends AbstractDerivedType implements BooleanTypeDefinition { DerivedBooleanType(final BooleanTypeDefinition baseType, final SchemaPath path, final Object defaultValue, - final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java index 6f52d6108a..27981bb8b6 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java @@ -17,8 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; final class DerivedDecimalType extends AbstractRangeRestrictedDerivedType implements DecimalTypeDefinition { DerivedDecimalType(final DecimalTypeDefinition baseType, final SchemaPath path, final Object defaultValue, - final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java index 6100823de1..6f8e157dd4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition; final class DerivedEmptyType extends AbstractDerivedType implements EmptyTypeDefinition { DerivedEmptyType(final EmptyTypeDefinition baseType, final SchemaPath path, final Object defaultValue, final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { + final Collection unknownSchemNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java index d3cf3d0b6d..9a96e94e6a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; final class DerivedEnumerationType extends AbstractDerivedType implements EnumTypeDefinition { DerivedEnumerationType(final EnumTypeDefinition baseType, final SchemaPath path, final Object defaultValue, final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { + final Collection unknownSchemNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java index d1714d8298..c9505655bb 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java @@ -18,13 +18,13 @@ import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; final class DerivedIdentityrefType extends AbstractDerivedType implements IdentityrefTypeDefinition { DerivedIdentityrefType(final IdentityrefTypeDefinition baseType, final SchemaPath path, final Object defaultValue, - final String description, final String reference, final Status status, final String units, - final Collection unknownSchemaNodes) { + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override - public Set getIdentities() { + public Set getIdentities() { return baseType().getIdentities(); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java index 3922a7fe1a..cc2926aa57 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java @@ -19,7 +19,7 @@ final class DerivedInstanceIdentifierType extends AbstractDerivedType unknownSchemaNodes, + final String units, final Collection unknownSchemaNodes, final boolean requireInstance) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); this.requireInstance = requireInstance; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java index 6f798de41d..130150dcf7 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java @@ -17,7 +17,7 @@ final class DerivedInt16Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java index 978580d10e..2b597fc2c3 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java @@ -17,7 +17,7 @@ final class DerivedInt32Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java index 899a978af0..acd7ef00f2 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java @@ -17,7 +17,7 @@ final class DerivedInt64Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java index 8937ed0def..ba2d4d7b66 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java @@ -17,7 +17,7 @@ final class DerivedInt8Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java index 0a04811cd3..598a193047 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java @@ -18,7 +18,7 @@ final class DerivedLeafrefType extends AbstractDerivedType unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java index 165f2b8adf..fc8bd4096a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java @@ -19,7 +19,7 @@ final class DerivedStringType extends AbstractLengthRestrictedDerivedType unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java index 94ff32ed6b..444cd1fa73 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java @@ -19,7 +19,7 @@ final class DerivedUint16Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final String units, final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java index 6e695d7d1c..281f1c2765 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java @@ -19,7 +19,7 @@ final class DerivedUint32Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final String units, final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java index 83ea8f34ae..7dcccaf905 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java @@ -18,7 +18,7 @@ final class DerivedUint64Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final String units, final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java index d120b56fcd..e3d55e548f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java @@ -18,7 +18,7 @@ final class DerivedUint8Type extends AbstractRangeRestrictedDerivedType unknownSchemaNodes) { + final String units, final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java index a2c540f470..70944de595 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; final class DerivedUnionType extends AbstractDerivedType implements UnionTypeDefinition { DerivedUnionType(final UnionTypeDefinition baseType, final SchemaPath path, final Object defaultValue, final String description, final String reference, final Status status, final String units, - final Collection unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java index 5d21de188c..de3ff397ee 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java @@ -57,7 +57,7 @@ public final class EnumPairBuilder implements Builder, Mutable { return this; } - public EnumPairBuilder setUnknownSchemaNodes(final Collection unknownSchemaNodes) { + public EnumPairBuilder setUnknownSchemaNodes(final Collection unknownSchemaNodes) { this.unknownSchemaNodes = ImmutableList.copyOf(unknownSchemaNodes); return this; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java index fdf61dd77e..b74d75735e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java @@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import java.util.List; +import java.util.Collection; import java.util.Objects; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; @@ -39,7 +39,7 @@ final class EnumPairImpl implements EnumPair, Immutable { } @Override - public List getUnknownSchemaNodes() { + public Collection getUnknownSchemaNodes() { return unknownSchemaNodes; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java index ee94181869..004992a3cc 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; final class RestrictedBinaryType extends AbstractLengthRestrictedType implements BinaryTypeDefinition { RestrictedBinaryType(final BinaryTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, + final Collection unknownSchemaNodes, final @Nullable LengthConstraint lengthConstraint) { super(baseType, path, unknownSchemaNodes, lengthConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java index 7353d2c58e..b89fd2e580 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -19,13 +18,13 @@ final class RestrictedBitsType extends AbstractRestrictedType bits; RestrictedBitsType(final BitsTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, final Collection bits) { + final Collection unknownSchemaNodes, final Collection bits) { super(baseType, path, unknownSchemaNodes); this.bits = ImmutableList.copyOf(bits); } @Override - public List getBits() { + public Collection getBits() { return bits; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java index 91e2a978d0..186554a123 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java @@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; final class RestrictedBooleanType extends AbstractRestrictedType implements BooleanTypeDefinition { RestrictedBooleanType(final BooleanTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java index 9066aad7ad..94c0761395 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java @@ -18,8 +18,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedDecimalType extends AbstractRangeRestrictedType implements DecimalTypeDefinition { RestrictedDecimalType(final DecimalTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, - final @Nullable RangeConstraint rangeConstraint) { + final Collection unknownSchemaNodes, + final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java index fc36f91e72..840bbcb7e0 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java @@ -14,7 +14,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition; final class RestrictedEmptyType extends AbstractRestrictedType implements EmptyTypeDefinition { RestrictedEmptyType(final EmptyTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java index 5fbec43c20..1058cb9b9a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java @@ -19,7 +19,7 @@ final class RestrictedEnumerationType extends AbstractRestrictedType values; RestrictedEnumerationType(final EnumTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, final Collection values) { + final Collection unknownSchemaNodes, final Collection values) { super(baseType, path, unknownSchemaNodes); this.values = ImmutableList.copyOf(values); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java index fae4d208d1..7429c45eed 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java @@ -17,12 +17,12 @@ import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; final class RestrictedIdentityrefType extends AbstractRestrictedType implements IdentityrefTypeDefinition { RestrictedIdentityrefType(final IdentityrefTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, unknownSchemaNodes); } @Override - public Set getIdentities() { + public Set getIdentities() { return getBaseType().getIdentities(); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java index ed84cd99cf..a6f1fb5d8e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java @@ -17,7 +17,7 @@ final class RestrictedInstanceIdentifierType extends AbstractRestrictedType unknownSchemaNodes, final boolean requireInstance) { + final Collection unknownSchemaNodes, final boolean requireInstance) { super(baseType, path, unknownSchemaNodes); this.requireInstance = requireInstance; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java index 68ed9afb85..2311cdb8f2 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java @@ -17,8 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt16Type extends AbstractRangeRestrictedType implements Int16TypeDefinition { RestrictedInt16Type(final Int16TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, - final @Nullable RangeConstraint rangeConstraint) { + final Collection unknownSchemaNodes, + final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java index c27e2cd59d..a4ca9e9cff 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java @@ -17,8 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt32Type extends AbstractRangeRestrictedType implements Int32TypeDefinition { RestrictedInt32Type(final Int32TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, - final @Nullable RangeConstraint rangeConstraint) { + final Collection unknownSchemaNodes, + final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java index 128fd439ab..5774fdc2f7 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java @@ -17,7 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt64Type extends AbstractRangeRestrictedType implements Int64TypeDefinition { RestrictedInt64Type(final Int64TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { + final Collection unknownSchemaNodes, + final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java index dbc749e40b..6ebd7f56ba 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java @@ -17,7 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt8Type extends AbstractRangeRestrictedType implements Int8TypeDefinition { RestrictedInt8Type(final Int8TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { + final Collection unknownSchemaNodes, + final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java index a09143e4ab..3c37ca4ab9 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java @@ -19,7 +19,7 @@ final class RestrictedLeafrefType extends AbstractRestrictedType unknownSchemaNodes, final boolean requireInstance) { + final Collection unknownSchemaNodes, final boolean requireInstance) { super(baseType, path, unknownSchemaNodes); this.requireInstance = requireInstance; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java index 37b97570ef..2edee42d9d 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java @@ -23,9 +23,9 @@ final class RestrictedStringType extends AbstractLengthRestrictedType patternConstraints; RestrictedStringType(final StringTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, - final @Nullable LengthConstraint lengthConstraints, - final List patternConstraints) { + final Collection unknownSchemaNodes, + final @Nullable LengthConstraint lengthConstraints, + final List patternConstraints) { super(baseType, path, unknownSchemaNodes, lengthConstraints); this.patternConstraints = ImmutableList.copyOf(patternConstraints); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java index 9078f2c4fd..97b0b49d4f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition; final class RestrictedUint16Type extends AbstractRangeRestrictedType implements Uint16TypeDefinition { RestrictedUint16Type(final Uint16TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, + final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java index 40afffe0d8..be0b34eb38 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition; final class RestrictedUint32Type extends AbstractRangeRestrictedType implements Uint32TypeDefinition { RestrictedUint32Type(final Uint32TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, + final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java index 9265b4381b..0bec7890f8 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition; final class RestrictedUint64Type extends AbstractRangeRestrictedType implements Uint64TypeDefinition { RestrictedUint64Type(final Uint64TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, + final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java index 11e564b480..e7b251314e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; final class RestrictedUint8Type extends AbstractRangeRestrictedType implements Uint8TypeDefinition { RestrictedUint8Type(final Uint8TypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes, + final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { super(baseType, path, unknownSchemaNodes, rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java index e67dbe92ea..7a9b1e35ba 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; final class RestrictedUnionType extends AbstractRestrictedType implements UnionTypeDefinition { RestrictedUnionType(final UnionTypeDefinition baseType, final SchemaPath path, - final Collection unknownSchemaNodes) { + final Collection unknownSchemaNodes) { super(baseType, path, unknownSchemaNodes); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java index ef54193ed7..19071d0697 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; -import java.util.List; +import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.concepts.Builder; @@ -36,7 +36,7 @@ public abstract class TypeBuilder> implements Builde return path; } - final @NonNull List getUnknownSchemaNodes() { + final @NonNull Collection getUnknownSchemaNodes() { return unknownSchemaNodes.build(); } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java index 94501704b0..5856be60cc 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableSet; import java.net.URI; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -407,7 +408,8 @@ public class SchemaContextProxyTest { final Set childNodes = Collections.singleton(mockedContainer); doReturn(childNodes).when(moduleConfig).getChildNodes(); - final Set dataDefinitions = filteringSchemaContextProxy.getDataDefinitions(); + final Collection dataDefinitions = + filteringSchemaContextProxy.getDataDefinitions(); assertTrue(dataDefinitions.contains(mockedContainer)); } @@ -422,7 +424,7 @@ public class SchemaContextProxyTest { final Set notifications = Collections.singleton(mockedNotification); doReturn(notifications).when(moduleConfig).getNotifications(); - final Set schemaContextProxyNotifications = + final Collection schemaContextProxyNotifications = filteringSchemaContextProxy.getNotifications(); assertTrue(schemaContextProxyNotifications.contains(mockedNotification)); } @@ -438,7 +440,7 @@ public class SchemaContextProxyTest { final Set rpcs = Collections.singleton(mockedRpc); doReturn(rpcs).when(moduleConfig).getRpcs(); - final Set operations = filteringSchemaContextProxy.getOperations(); + final Collection operations = filteringSchemaContextProxy.getOperations(); assertTrue(operations.contains(mockedRpc)); } @@ -453,7 +455,8 @@ public class SchemaContextProxyTest { final List extensions = Collections.singletonList(mockedExtension); doReturn(extensions).when(moduleConfig).getExtensionSchemaNodes(); - final Set schemaContextProxyExtensions = filteringSchemaContextProxy.getExtensions(); + final Collection schemaContextProxyExtensions = + filteringSchemaContextProxy.getExtensions(); assertTrue(schemaContextProxyExtensions.contains(mockedExtension)); } @@ -468,7 +471,7 @@ public class SchemaContextProxyTest { final List unknownSchemaNodes = Collections.singletonList(mockedUnknownSchemaNode); doReturn(unknownSchemaNodes).when(moduleConfig).getUnknownSchemaNodes(); - final List schemaContextProxyUnknownSchemaNodes = + final Collection schemaContextProxyUnknownSchemaNodes = filteringSchemaContextProxy.getUnknownSchemaNodes(); assertTrue(schemaContextProxyUnknownSchemaNodes.contains(mockedUnknownSchemaNode)); } @@ -484,7 +487,7 @@ public class SchemaContextProxyTest { final Set> typeDefinitions = Collections.singleton(mockedTypeDefinition); doReturn(typeDefinitions).when(moduleConfig).getTypeDefinitions(); - final Set> schemaContextProxyTypeDefinitions = filteringSchemaContextProxy + final Collection> schemaContextProxyTypeDefinitions = filteringSchemaContextProxy .getTypeDefinitions(); assertTrue(schemaContextProxyTypeDefinitions.contains(mockedTypeDefinition)); } @@ -500,7 +503,8 @@ public class SchemaContextProxyTest { final Set childNodes = Collections.singleton(mockedContainer); doReturn(childNodes).when(moduleConfig).getChildNodes(); - final Set schemaContextProxyChildNodes = filteringSchemaContextProxy.getChildNodes(); + final Collection schemaContextProxyChildNodes = + filteringSchemaContextProxy.getChildNodes(); assertTrue(schemaContextProxyChildNodes.contains(mockedContainer)); } @@ -515,7 +519,8 @@ public class SchemaContextProxyTest { final Set groupings = Collections.singleton(mockedGrouping); doReturn(groupings).when(moduleConfig).getGroupings(); - final Set schemaContextProxyGroupings = filteringSchemaContextProxy.getGroupings(); + final Collection schemaContextProxyGroupings = + filteringSchemaContextProxy.getGroupings(); assertTrue(schemaContextProxyGroupings.contains(mockedGrouping)); } @@ -548,7 +553,7 @@ public class SchemaContextProxyTest { assertEquals(module, filteringSchemaContextProxy.findModule(module.getName(), module.getRevision()) .get()); - Set mod = filteringSchemaContextProxy.findModules(module.getNamespace()); + Collection mod = filteringSchemaContextProxy.findModules(module.getNamespace()); assertTrue(mod.contains(module)); assertEquals(module, filteringSchemaContextProxy.findModule(module.getNamespace(), module.getRevision().orElse(null)).get()); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java index 411ded51f6..34c9fddb64 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.net.URI; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Set; @@ -54,17 +55,19 @@ public class SimpleSchemaContextTest { } private static void assertGetModules(final List expected, final Module... modules) { - final Set actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)).getModules(); + final Set actual = SimpleSchemaContext.forModules(ImmutableList.copyOf(modules)).getModules(); assertArrayEquals(expected.toArray(), actual.toArray()); } private static void assertFindModules(final List expected, final String name, final Module... modules) { - final Set actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)).findModules(name); + final Collection actual = SimpleSchemaContext.forModules(ImmutableList.copyOf(modules)) + .findModules(name); assertArrayEquals(expected.toArray(), actual.toArray()); } private static void assertFindModules(final List expected, final URI uri, final Module... modules) { - final Set actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)).findModules(uri); + final Collection actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)) + .findModules(uri); assertArrayEquals(expected.toArray(), actual.toArray()); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java index 9f8573b92e..c13fc5bc65 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedDataNodeContainer.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt; import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Optional; @@ -62,12 +63,12 @@ public abstract class AbstractEffectiveDocumentedDataNodeContainer> getTypeDefinitions() { + public final Collection> getTypeDefinitions() { return typeDefinitions; } @Override - public final Set getChildNodes() { + public final Collection getChildNodes() { return publicChildNodes; } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedNode.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedNode.java index ae10073206..0d217c2488 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedNode.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDocumentedNode.java @@ -11,6 +11,7 @@ import com.google.common.collect.ImmutableList; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; @@ -57,7 +58,7 @@ public abstract class AbstractEffectiveDocumentedNode getUnknownSchemaNodes() { + public final Collection getUnknownSchemaNodes() { final ImmutableList existing = (ImmutableList) UNKNOWN_NODES.getAcquire(this); return existing != null ? existing : loadUnknownSchemaNodes(); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java index 055188be4e..654431ce7e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java @@ -15,6 +15,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.net.URI; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -198,57 +199,57 @@ public abstract class AbstractEffectiveModule getImports() { + public Collection getImports() { return imports; } @Override - public Set getFeatures() { + public Collection getFeatures() { return features; } @Override - public Set getNotifications() { + public Collection getNotifications() { return notifications; } @Override - public Set getAugmentations() { + public Collection getAugmentations() { return augmentations; } @Override - public Set getRpcs() { + public Collection getRpcs() { return rpcs; } @Override - public Set getDeviations() { + public Collection getDeviations() { return deviations; } @Override - public List getExtensionSchemaNodes() { + public Collection getExtensionSchemaNodes() { return extensionNodes; } @Override - public Set getIdentities() { + public Collection getIdentities() { return identities; } @Override - public final Set> getTypeDefinitions() { + public final Collection> getTypeDefinitions() { return typeDefinitions; } @Override - public final Set getChildNodes() { + public final Collection getChildNodes() { return publicChildNodes; } @Override - public final Set getGroupings() { + public final Collection getGroupings() { return groupings; } @@ -259,7 +260,7 @@ public abstract class AbstractEffectiveModule getUses() { + public Collection getUses() { return uses; } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveMustConstraintAwareDataSchemaNode.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveMustConstraintAwareDataSchemaNode.java index 12226f34b5..4a5e137e5c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveMustConstraintAwareDataSchemaNode.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveMustConstraintAwareDataSchemaNode.java @@ -11,6 +11,7 @@ import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableSet; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; +import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.MustConstraintAware; import org.opendaylight.yangtools.yang.model.api.MustDefinition; @@ -39,7 +40,7 @@ public abstract class AbstractEffectiveMustConstraintAwareDataSchemaNode getMustConstraints() { + public final Collection getMustConstraints() { return derivedSet(MUST_CONSTRAINTS, MustDefinition.class); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveOperationContainerSchemaNode.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveOperationContainerSchemaNode.java index ac6661cb7b..56e2e141bd 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveOperationContainerSchemaNode.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveOperationContainerSchemaNode.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt; import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.Objects; -import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ActionDefinition; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; @@ -26,12 +26,12 @@ public abstract class AbstractEffectiveOperationContainerSchemaNode getActions() { + public final Collection getActions() { return ImmutableSet.of(); } @Override - public final Set getNotifications() { + public final Collection getNotifications() { return ImmutableSet.of(); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveSimpleDataNodeContainer.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveSimpleDataNodeContainer.java index 8bf9b59fb5..a5fafd4976 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveSimpleDataNodeContainer.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveSimpleDataNodeContainer.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt; import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -92,7 +93,7 @@ public abstract class AbstractEffectiveSimpleDataNodeContainer getAvailableAugmentations() { + public Collection getAvailableAugmentations() { return augmentations; } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStatementMixins.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStatementMixins.java index b87da7e799..d4e6df5ce8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStatementMixins.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStatementMixins.java @@ -9,12 +9,8 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt; import com.google.common.annotations.Beta; import com.google.common.collect.Collections2; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import java.util.Collection; -import java.util.List; import java.util.Optional; -import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.yang.common.QName; @@ -58,19 +54,9 @@ public final class EffectiveStatementMixins { // Marker interface requiring all mixins to be derived from EffectiveStatement. private interface Mixin> extends EffectiveStatement { @SuppressWarnings("unchecked") - default Collection filterEffectiveStatements(final Class type) { + default Collection filterEffectiveStatements(final Class type) { // Yeah, this is not nice, but saves one transformation - return (Collection) Collections2.filter(effectiveSubstatements(), type::isInstance); - } - - // FIXME: YANGTOOLS-1068: eliminate this once we can return collections - default List filterEffectiveStatementsList(final Class type) { - return ImmutableList.copyOf(filterEffectiveStatements(type)); - } - - // FIXME: YANGTOOLS-1068: eliminate this once we can return collections - default Set filterEffectiveStatementsSet(final Class type) { - return ImmutableSet.copyOf(filterEffectiveStatements(type)); + return (Collection) Collections2.filter(effectiveSubstatements(), type::isInstance); } } @@ -83,8 +69,8 @@ public final class EffectiveStatementMixins { public interface AugmentationTargetMixin> extends Mixin, AugmentationTarget { @Override - default Set getAvailableAugmentations() { - return filterEffectiveStatementsSet(AugmentationSchemaNode.class); + default Collection getAvailableAugmentations() { + return filterEffectiveStatements(AugmentationSchemaNode.class); } } @@ -111,8 +97,8 @@ public final class EffectiveStatementMixins { public interface ActionNodeContainerMixin> extends Mixin, ActionNodeContainer { @Override - default Set getActions() { - return filterEffectiveStatementsSet(ActionDefinition.class); + default Collection getActions() { + return filterEffectiveStatements(ActionDefinition.class); } } @@ -125,8 +111,8 @@ public final class EffectiveStatementMixins { public interface NotificationNodeContainerMixin> extends Mixin, NotificationNodeContainer { @Override - default Set getNotifications() { - return filterEffectiveStatementsSet(NotificationDefinition.class); + default Collection getNotifications() { + return filterEffectiveStatements(NotificationDefinition.class); } } @@ -138,7 +124,7 @@ public final class EffectiveStatementMixins { */ public interface MustConstraintMixin> extends Mixin, MustConstraintAware { @Override - default Collection getMustConstraints() { + default Collection getMustConstraints() { return filterEffectiveStatements(MustDefinition.class); } } @@ -164,26 +150,25 @@ public final class EffectiveStatementMixins { */ public interface DataNodeContainerMixin> extends DataNodeContainer, Mixin { @Override - default Set> getTypeDefinitions() { + default Collection> getTypeDefinitions() { // TODO: the cast here is needed to work around Java 11 javac type inference issue - return (Set) effectiveSubstatements().stream().filter(TypedefEffectiveStatement.class::isInstance) - .map(stmt -> ((TypedefEffectiveStatement) stmt).getTypeDefinition()) - .collect(ImmutableSet.toImmutableSet()); + return Collections2.transform(filterEffectiveStatements(TypedefEffectiveStatement.class), + TypedefEffectiveStatement::getTypeDefinition); } @Override - default Collection getChildNodes() { + default Collection getChildNodes() { return filterEffectiveStatements(DataSchemaNode.class); } @Override - default Set getGroupings() { - return filterEffectiveStatementsSet(GroupingDefinition.class); + default Collection getGroupings() { + return filterEffectiveStatements(GroupingDefinition.class); } @Override - default Set getUses() { - return filterEffectiveStatementsSet(UsesNode.class); + default Collection getUses() { + return filterEffectiveStatements(UsesNode.class); } } @@ -244,8 +229,8 @@ public final class EffectiveStatementMixins { } @Override - default List getUnknownSchemaNodes() { - return filterEffectiveStatementsList(UnknownSchemaNode.class); + default Collection getUnknownSchemaNodes() { + return filterEffectiveStatements(UnknownSchemaNode.class); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java index cc92780e97..374ddf1dd7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; +import java.util.Collection; import java.util.LinkedHashSet; import java.util.Objects; import java.util.Optional; @@ -90,7 +91,7 @@ final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode } @Override - public Set getAvailableAugmentations() { + public Collection getAvailableAugmentations() { return augmentations; } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityEffectiveStatementImpl.java index fd555f8e5e..0da50e5ed7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityEffectiveStatementImpl.java @@ -11,6 +11,7 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -61,13 +62,13 @@ final class IdentityEffectiveStatementImpl extends AbstractEffectiveSchemaNode getBaseIdentities() { + public Collection getBaseIdentities() { checkState(sealed, "Attempt to get base identities from unsealed identity effective statement %s", getQName()); return baseIdentities; } @Override - public Set getDerivedIdentities() { + public Collection getDerivedIdentities() { return Collections.unmodifiableSet(derivedIdentities); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationEffectiveStatementImpl.java index f112eeefa9..b80fe4d5b7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationEffectiveStatementImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.notification; import com.google.common.collect.ImmutableSet; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; +import java.util.Collection; import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; @@ -88,12 +89,12 @@ final class NotificationEffectiveStatementImpl } @Override - public ImmutableSet getMustConstraints() { + public Collection getMustConstraints() { return derivedSet(MUST_CONSTRAINTS, MustDefinition.class); } @Override - public Set getAvailableAugmentations() { + public Collection getAvailableAugmentations() { return augmentations; } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java index c9ed32316d..3bb0b1f8b5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.uses; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -81,7 +82,7 @@ final class UsesEffectiveStatementImpl extends AbstractEffectiveDocumentedNode getAugmentations() { + public Collection getAugmentations() { return augmentations; } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java index 6c09db43cf..f42e5225c0 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -41,14 +42,14 @@ public class ActionStatementTest { assertContainsActions(schemaContext, "top-list", "top-list-action"); assertContainsActions(schemaContext, "top", "top-action"); - final Set groupings = schemaContext.getGroupings(); + final Collection groupings = schemaContext.getGroupings(); assertEquals(1, groupings.size()); assertContainsActions(groupings.iterator().next(), "grp-action"); - final Set modules = schemaContext.getModules(); + final Collection modules = schemaContext.getModules(); assertEquals(1, modules.size()); final Module foo = modules.iterator().next(); - final Set augmentations = foo.getAugmentations(); + final Collection augmentations = foo.getAugmentations(); assertEquals(1, augmentations.size()); assertContainsActions(augmentations.iterator().next(), "aug-action", "grp-action"); } @@ -63,7 +64,7 @@ public class ActionStatementTest { private static void assertContainsActions(final ActionNodeContainer actionContainer, final String... actionNames) { - final Set actions = actionContainer.getActions(); + final Collection actions = actionContainer.getActions(); assertEquals(actionNames.length, actions.size()); final Set actionQNames = new HashSet<>(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java index e8c22ab27a..30f4fd30b9 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java @@ -5,7 +5,6 @@ * 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.parser.stmt.rfc7950; import static org.junit.Assert.assertEquals; @@ -17,6 +16,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -40,7 +40,7 @@ public class Bug6869Test { ImmutableSet.of()); assertNotNull(schemaContext); - final Set identities = getIdentities(schemaContext); + final Collection identities = getIdentities(schemaContext); assertEquals(0, identities.size()); final SchemaNode findNode = findNode(schemaContext, ImmutableList.of("root", "grp-leaf")); @@ -55,7 +55,7 @@ public class Bug6869Test { createFeaturesSet("identity-feature", "mandatory-leaf", "tls", "ssh", "two", "three")); assertNotNull(schemaContext); - final Set identities = getIdentities(schemaContext); + final Collection identities = getIdentities(schemaContext); assertEquals(1, identities.size()); final SchemaNode findNode = findNode(schemaContext, ImmutableList.of("root", "grp-leaf")); @@ -64,8 +64,8 @@ public class Bug6869Test { assertTrue(grpLeaf.isMandatory()); } - private static Set getIdentities(final SchemaContext schemaContext) { - final Set modules = schemaContext.getModules(); + private static Collection getIdentities(final SchemaContext schemaContext) { + final Collection modules = schemaContext.getModules(); assertEquals(1, modules.size()); final Module module = modules.iterator().next(); return module.getIdentities(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java index 197e47ac2f..80bc332f05 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java @@ -5,7 +5,6 @@ * 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.parser.stmt.rfc7950; import static org.junit.Assert.assertEquals; @@ -14,7 +13,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.Collection; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -35,13 +33,13 @@ public class Bug6871Test { final Module foo = schemaContext.findModule("foo", Revision.of("2016-12-14")).get(); - final Set notifications = foo.getNotifications(); + final Collection notifications = foo.getNotifications(); assertEquals(1, notifications.size()); final NotificationDefinition myNotification = notifications.iterator().next(); - Collection mustConstraints = myNotification.getMustConstraints(); + Collection mustConstraints = myNotification.getMustConstraints(); assertEquals(2, mustConstraints.size()); - final Set rpcs = foo.getRpcs(); + final Collection rpcs = foo.getRpcs(); assertEquals(1, rpcs.size()); final RpcDefinition myRpc = rpcs.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java index 232f5065ff..4ef6d71d88 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import org.junit.Test; @@ -176,7 +177,7 @@ public class Bug6887Test { BitsTypeDefinition bitsType = (BitsTypeDefinition) myBitsLeaf.getType(); - List bits = bitsType.getBits(); + Collection bits = bitsType.getBits(); assertEquals(2, bits.size()); Bit bitB = createBit(createSchemaPath(true, bar.getQNameModule(), "my-bits-leaf", "my-derived-bits-type", "bit-b"), 2); @@ -317,7 +318,7 @@ public class Bug6887Test { return BitBuilder.create(path, position).build(); } - private static void assertContainsBits(final List bitList, final Bit... bits) { + private static void assertContainsBits(final Collection bitList, final Bit... bits) { for (final Bit bit : bits) { assertTrue(bitList.contains(bit)); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java index 8377d12fa3..584b1487ae 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -39,14 +40,14 @@ public class Bug6897Test { assertContainsNotifications(schemaContext, "top-list", "top-list-notification"); assertContainsNotifications(schemaContext, "top", "top-notification"); - final Set groupings = schemaContext.getGroupings(); + final Collection groupings = schemaContext.getGroupings(); assertEquals(1, groupings.size()); assertContainsNotifications(groupings.iterator().next(), "grp-notification"); - final Set modules = schemaContext.getModules(); + final Collection modules = schemaContext.getModules(); assertEquals(1, modules.size()); final Module foo = modules.iterator().next(); - final Set augmentations = foo.getAugmentations(); + final Collection augmentations = foo.getAugmentations(); assertEquals(1, augmentations.size()); assertContainsNotifications(augmentations.iterator().next(), "aug-notification", "grp-notification"); } @@ -61,7 +62,7 @@ public class Bug6897Test { private static void assertContainsNotifications(final NotificationNodeContainer notificationContainer, final String... notificationNames) { - final Set notifications = notificationContainer.getNotifications(); + final Collection notifications = notificationContainer.getNotifications(); assertEquals(notificationNames.length, notifications.size()); final Set notificationQNames = new HashSet<>(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java index 00a7651045..8bce589e22 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java @@ -5,7 +5,6 @@ * 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.parser.stmt.rfc7950; import static org.junit.Assert.assertEquals; @@ -13,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; @@ -30,10 +29,9 @@ public class IdentityStatementTest { assertNotNull(schemaContext); final Module foo = schemaContext.findModule("foo", Revision.of("2016-12-21")).get(); - final Set identities = foo.getIdentities(); - for (final IdentitySchemaNode identity : identities) { + for (final IdentitySchemaNode identity : foo.getIdentities()) { if ("derived-id".equals(identity.getQName().getLocalName())) { - final Set baseIdentities = identity.getBaseIdentities(); + final Collection baseIdentities = identity.getBaseIdentities(); assertEquals(3, baseIdentities.size()); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java index 8b8d2f04cf..434ae44b65 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java @@ -5,7 +5,6 @@ * 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.parser.stmt.rfc7950; import static org.junit.Assert.assertEquals; @@ -13,6 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.Collection; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -33,7 +33,7 @@ public class IdentityrefStatementTest { assertNotNull(schemaContext); final Module foo = schemaContext.findModule("foo", Revision.of("2017-01-11")).get(); - final Set identities = foo.getIdentities(); + final Collection identities = foo.getIdentities(); assertEquals(3, identities.size()); final LeafSchemaNode idrefLeaf = (LeafSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), @@ -41,7 +41,7 @@ public class IdentityrefStatementTest { assertNotNull(idrefLeaf); final IdentityrefTypeDefinition idrefType = (IdentityrefTypeDefinition) idrefLeaf.getType(); - final Set referencedIdentities = idrefType.getIdentities(); + final Set referencedIdentities = idrefType.getIdentities(); assertEquals(3, referencedIdentities.size()); assertEquals(identities, referencedIdentities); assertEquals("id-a", idrefType.getIdentities().iterator().next().getQName().getLocalName()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java index da05fe5b30..69daaf9702 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java @@ -5,7 +5,6 @@ * 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.parser.stmt.rfc7950; import static org.junit.Assert.assertEquals; @@ -13,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; @@ -33,7 +32,7 @@ public class LeafrefStatementTest { assertNotNull(schemaContext); final Module foo = schemaContext.findModule("foo", Revision.of("2016-12-20")).get(); - final Set> typeDefinitions = foo.getTypeDefinitions(); + final Collection> typeDefinitions = foo.getTypeDefinitions(); assertEquals(1, typeDefinitions.size()); final TypeDefinition typeDefinition = typeDefinitions.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java index b2f2f4556b..363bfe06e7 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Set; import java.util.SortedMap; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -60,7 +59,7 @@ public class AugmentTest { // foo.yang final Module module1 = TestUtils.findModule(context, "foo").get(); - Set augmentations = module1.getAugmentations(); + Collection augmentations = module1.getAugmentations(); assertEquals(1, augmentations.size()); final AugmentationSchemaNode augment = augmentations.iterator().next(); assertNotNull(augment); @@ -68,7 +67,7 @@ public class AugmentTest { SchemaPath expectedSchemaPath = SchemaPath.create(qnames, true); assertEquals(expectedSchemaPath, augment.getTargetPath()); - final Collection augmentChildren = augment.getChildNodes(); + final Collection augmentChildren = augment.getChildNodes(); assertEquals(4, augmentChildren.size()); for (final DataSchemaNode dsn : augmentChildren) { TestUtils.checkIsAugmenting(dsn, false); @@ -276,7 +275,7 @@ public class AugmentTest { assertEquals(qname, id.getQName()); qnames.add(qname); assertEquals(SchemaPath.create(qnames, true), id.getPath()); - final Collection idChildren = id.getChildNodes(); + final Collection idChildren = id.getChildNodes(); assertEquals(1, idChildren.size()); // case node1 @@ -284,7 +283,7 @@ public class AugmentTest { assertEquals(qname, node1.getQName()); qnames.set(4, qname); assertEquals(SchemaPath.create(qnames, true), node1.getPath()); - final Collection node1Children = node1.getChildNodes(); + final Collection node1Children = node1.getChildNodes(); assertTrue(node1Children.isEmpty()); // case node2 @@ -292,7 +291,7 @@ public class AugmentTest { assertEquals(qname, node2.getQName()); qnames.set(4, qname); assertEquals(SchemaPath.create(qnames, true), node2.getPath()); - final Collection node2Children = node2.getChildNodes(); + final Collection node2Children = node2.getChildNodes(); assertTrue(node2Children.isEmpty()); // case node3 @@ -300,7 +299,7 @@ public class AugmentTest { assertEquals(qname, node3.getQName()); qnames.set(4, qname); assertEquals(SchemaPath.create(qnames, true), node3.getPath()); - final Collection node3Children = node3.getChildNodes(); + final Collection node3Children = node3.getChildNodes(); assertEquals(1, node3Children.size()); // test cases @@ -332,7 +331,7 @@ public class AugmentTest { final URI NS_FOO = URI.create("urn:opendaylight:foo"); final Revision revision = Revision.of("2013-10-11"); final Module bar = TestUtils.findModule(context, "bar").get(); - final Set rpcs = bar.getRpcs(); + final Collection rpcs = bar.getRpcs(); assertEquals(2, rpcs.size()); RpcDefinition submit = null; @@ -386,21 +385,21 @@ public class AugmentTest { qnames[3] = QName.create(NS_FOO, revision, "attach"); assertEquals(qnames[3], attach.getQName()); assertEquals(SchemaPath.create(true, qnames), attach.getPath()); - final Collection attachChildren = attach.getChildNodes(); + final Collection attachChildren = attach.getChildNodes(); assertEquals(1, attachChildren.size()); // case create qnames[3] = QName.create(NS_FOO, revision, "create"); assertEquals(qnames[3], create.getQName()); assertEquals(SchemaPath.create(true, qnames), create.getPath()); - final Collection createChildren = create.getChildNodes(); + final Collection createChildren = create.getChildNodes(); assertEquals(1, createChildren.size()); // case attach qnames[3] = QName.create(NS_FOO, revision, "destroy"); assertEquals(qnames[3], destroy.getQName()); assertEquals(SchemaPath.create(true, qnames), destroy.getPath()); - final Collection destroyChildren = destroy.getChildNodes(); + final Collection destroyChildren = destroy.getChildNodes(); assertEquals(1, destroyChildren.size()); } @@ -419,7 +418,7 @@ public class AugmentTest { "nodes")); final ContainerSchemaNode node = (ContainerSchemaNode) nodes.getDataChildByName(QName.create( test.getQNameModule(), "node")); - final Set augments = node.getAvailableAugmentations(); + final Collection augments = node.getAvailableAugmentations(); assertEquals(1, augments.size()); assertEquals(1, node.getChildNodes().size()); final LeafSchemaNode id = (LeafSchemaNode) node.getDataChildByName(QName.create(test.getQNameModule(), "id")); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java index 1199ad3ddc..e79dce802c 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertTrue; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; @@ -39,9 +38,7 @@ public class AugmentToExtensionTest { final Module devicesModule = TestUtils.findModule(context, "augment-module").get(); final ContainerSchemaNode devicesContainer = (ContainerSchemaNode) devicesModule.getDataChildByName( QName.create(devicesModule.getQNameModule(), "my-container")); - final Set uses = devicesContainer.getUses(); - - for (final UsesNode usesNode : uses) { + for (final UsesNode usesNode : devicesContainer.getUses()) { assertTrue(usesNode.getAugmentations().isEmpty()); } } @@ -55,12 +52,9 @@ public class AugmentToExtensionTest { final ContainerSchemaNode devicesContainer = (ContainerSchemaNode) devicesModule.getDataChildByName(QName .create(devicesModule.getQNameModule(), "my-container")); - final Set uses = devicesContainer.getUses(); - boolean augmentationIsInContainer = false; - for (final UsesNode usesNode : uses) { - final Set augmentations = usesNode.getAugmentations(); - for (final AugmentationSchemaNode augmentationSchema : augmentations) { + for (final UsesNode usesNode : devicesContainer.getUses()) { + for (final AugmentationSchemaNode augmentationSchema : usesNode.getAugmentations()) { augmentationIsInContainer = true; } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java index 62d298a1ea..5a16af0d6e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.net.URI; -import java.util.List; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -35,9 +35,9 @@ public class Bug1412Test { final ContainerSchemaNode node = (ContainerSchemaNode) bug1412.getDataChildByName(QName.create( bug1412.getQNameModule(), "node")); - List unknownNodes = node.getUnknownSchemaNodes(); + Collection unknownNodes = node.getUnknownSchemaNodes(); assertEquals(1, unknownNodes.size()); - final UnknownSchemaNode action = unknownNodes.get(0); + final UnknownSchemaNode action = unknownNodes.iterator().next(); final QNameModule qm = QNameModule.create(URI.create("urn:test:bug1412"), Revision.of("2014-07-25")); QName expectedNodeType = QName.create("urn:test:bug1412:ext:definitions", "2014-07-25", "action"); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java index 584c4e461a..16acd3fe1d 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.List; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; import org.opendaylight.yangtools.yang.model.api.Module; @@ -31,10 +31,10 @@ public class Bug1413Test { TestUtils.loadModules(getClass().getResource("/bugs/bug1413").toURI()), "bug1413").get(); assertNotNull(bug1413); - List extensions = bug1413.getExtensionSchemaNodes(); + Collection extensions = bug1413.getExtensionSchemaNodes(); assertEquals(1, extensions.size()); - ExtensionDefinition info = extensions.get(0); + ExtensionDefinition info = extensions.iterator().next(); assertEquals("text", info.getArgument()); assertTrue(info.isYinElement()); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java index 0c5a40ed00..fc985465ce 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -13,7 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Collection; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -28,25 +26,23 @@ public class Bug3799Test { SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug3799"); assertNotNull(schema); - Set modules = schema.getModules(); + Collection modules = schema.getModules(); assertNotNull(modules); assertEquals(1, modules.size()); Module testModule = modules.iterator().next(); - Set subModules = testModule.getSubmodules(); + Collection subModules = testModule.getSubmodules(); assertNotNull(subModules); assertEquals(1, subModules.size()); Module testSubmodule = subModules.iterator().next(); - Set notifications = testSubmodule - .getNotifications(); + Collection notifications = testSubmodule.getNotifications(); assertNotNull(notifications); assertEquals(1, notifications.size()); - NotificationDefinition bazNotification = notifications.iterator() - .next(); - Collection childNodes = bazNotification.getChildNodes(); + NotificationDefinition bazNotification = notifications.iterator().next(); + Collection childNodes = bazNotification.getChildNodes(); assertNotNull(childNodes); assertEquals(1, childNodes.size()); @@ -57,5 +53,4 @@ public class Bug3799Test { String bar = leafBar.getQName().getLocalName(); assertEquals("bar", bar); } - } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java index 94cf0b3f0c..ce53b76036 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java @@ -11,7 +11,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.List; +import java.util.Collection; +import java.util.Iterator; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -35,14 +36,14 @@ public class Bug394Test { bug394.getQNameModule(), "logrecords")); assertNotNull(logrecords); - final List nodes = logrecords.getUnknownSchemaNodes(); + final Collection nodes = logrecords.getUnknownSchemaNodes(); assertEquals(2, nodes.size()); - final List extensions = bug394_ext.getExtensionSchemaNodes(); + final Collection extensions = bug394_ext.getExtensionSchemaNodes(); assertEquals(3, extensions.size()); - assertTrue(extensions.contains(nodes.get(0).getExtensionDefinition())); - assertTrue(extensions.contains(nodes.get(1).getExtensionDefinition())); + final Iterator it = nodes.iterator(); + assertTrue(extensions.contains(it.next().getExtensionDefinition())); + assertTrue(extensions.contains(it.next().getExtensionDefinition())); } - } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java index 5779e28a8b..73670f49cd 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.net.URI; -import java.util.List; +import java.util.Collection; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; @@ -26,20 +26,20 @@ public class Bug4456Test { SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug4456"); assertNotNull(schema); - Set modules = schema.findModules(URI.create("foo")); + Set modules = (Set) schema.findModules(URI.create("foo")); assertEquals(1, modules.size()); Module moduleFoo = modules.iterator().next(); - List extensionSchemaNodes = moduleFoo.getExtensionSchemaNodes(); + Collection extensionSchemaNodes = moduleFoo.getExtensionSchemaNodes(); assertEquals(5, extensionSchemaNodes.size()); for (ExtensionDefinition extensionDefinition : extensionSchemaNodes) { - List unknownSchemaNodes = extensionDefinition.getUnknownSchemaNodes(); + Collection unknownSchemaNodes = extensionDefinition.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); String unknownNodeExtensionDefName = unknownSchemaNode.getExtensionDefinition().getQName().getLocalName(); - List subUnknownSchemaNodes = unknownSchemaNode.getUnknownSchemaNodes(); + Collection subUnknownSchemaNodes = unknownSchemaNode.getUnknownSchemaNodes(); assertEquals(1, subUnknownSchemaNodes.size()); UnknownSchemaNode subUnknownSchemaNode = subUnknownSchemaNodes.iterator().next(); String subUnknownNodeExtensionDefName = subUnknownSchemaNode.getExtensionDefinition().getQName() diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java index 8ec6becc39..3ffafc133a 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java @@ -5,12 +5,12 @@ * 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.stmt; import com.google.common.collect.Range; import java.io.File; import java.net.URI; +import java.util.Collection; import java.util.List; import org.junit.Assert; import org.junit.Test; @@ -43,11 +43,11 @@ public class Bug4623Test { final TypeDefinition type = leaf.getType(); Assert.assertNotNull(type); - final List unknownSchemaNodes = type.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = type.getUnknownSchemaNodes(); Assert.assertNotNull(unknownSchemaNodes); Assert.assertFalse(unknownSchemaNodes.size() == 0); - final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0); + final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); Assert.assertEquals(unknownSchemaNode.getNodeParameter(), "unknown"); Assert.assertEquals(unknownSchemaNode.getNodeType().getModule().getNamespace().toString(), "urn:simple.extension.typedefs"); @@ -85,11 +85,11 @@ public class Bug4623Test { final TypeDefinition type = leaf.getType(); Assert.assertNotNull(type); - final List unknownSchemaNodes = type.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = type.getUnknownSchemaNodes(); Assert.assertNotNull(unknownSchemaNodes); Assert.assertFalse(unknownSchemaNodes.size() == 0); - final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0); + final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); Assert.assertEquals(unknownSchemaNode.getNodeParameter(), "unknown"); Assert.assertEquals(unknownSchemaNode.getNodeType().getModule().getNamespace().toString(), "urn:simple.extension.typedefs"); @@ -127,11 +127,11 @@ public class Bug4623Test { final TypeDefinition type = leaf.getType(); Assert.assertNotNull(type); - final List unknownSchemaNodes = type.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = type.getUnknownSchemaNodes(); Assert.assertNotNull(unknownSchemaNodes); Assert.assertFalse(unknownSchemaNodes.size() == 0); - final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0); + final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); Assert.assertEquals(unknownSchemaNode.getNodeParameter(), "unknown"); Assert.assertEquals(unknownSchemaNode.getNodeType().getModule().getNamespace().toString(), "urn:simple.extension.typedefs"); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java index 0c79a10969..170343e8bc 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Deviation; import org.opendaylight.yangtools.yang.model.api.Module; @@ -30,7 +30,7 @@ public class Bug4933Test { assertNotNull(context); final Module foo = context.findModules("foo").iterator().next(); - Set deviations = foo.getDeviations(); + Collection deviations = foo.getDeviations(); assertEquals(4, deviations.size()); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java index 2464c15643..449093c22d 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java @@ -28,7 +28,7 @@ public class Bug5518Test { final DataSchemaNode dataChildByName = context.getDataChildByName(QName.create("foo", "root")); assertTrue(dataChildByName instanceof ContainerSchemaNode); final ContainerSchemaNode root = (ContainerSchemaNode) dataChildByName; - final Collection mustConstraints = root.getMustConstraints(); + final Collection mustConstraints = root.getMustConstraints(); assertEquals(1, mustConstraints.size()); final MustDefinition must = mustConstraints.iterator().next(); assertEquals("not(deref(.)/../same-pass)", must.getXpath().getOriginalString()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java index f533b61f34..52d7c38941 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import java.util.Iterator; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; @@ -41,16 +40,12 @@ public class Bug5884Test { final ContainerSchemaNode testContainer = (ContainerSchemaNode) rootContainer.getDataChildByName( testContainerQname); final ChoiceSchemaNode dataChildByName = (ChoiceSchemaNode) testContainer.getDataChildByName(choice); - final Set augmentations = foo.getAugmentations(); - final Set availableAugmentations = dataChildByName.getAvailableAugmentations(); - final Iterator iterator = augmentations.iterator(); - final Iterator availableIterator = availableAugmentations.iterator(); - testIterator(iterator); - testIterator(availableIterator); + testIterator(foo.getAugmentations().iterator()); + testIterator(dataChildByName.getAvailableAugmentations().iterator()); } - private static void testIterator(final Iterator iterator) { + private static void testIterator(final Iterator iterator) { while (iterator.hasNext()) { AugmentationSchemaNode allAugments = iterator.next(); final DataSchemaNode currentChoice = allAugments.getChildNodes().iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java index 6e219a8c3e..60ae2771ba 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java @@ -14,9 +14,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import java.util.List; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -37,7 +36,7 @@ public class Bug5942Test { final DataSchemaNode root = schemaContext.getDataChildByName(QName.create("foo", "2016-06-02", "root")); assertTrue(root instanceof ContainerSchemaNode); - final Set uses = ((ContainerSchemaNode) root).getUses(); + final Collection uses = ((ContainerSchemaNode) root).getUses(); assertEquals(1, uses.size()); final UsesNode usesNode = uses.iterator().next(); @@ -50,7 +49,7 @@ public class Bug5942Test { assertThat(when, instanceOf(WithExpression.class)); assertEquals("0!=1", when.getOriginalString()); - final List unknownSchemaNodes = usesNode.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = usesNode.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); assertEquals("argument", unknownSchemaNode.getNodeParameter()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java index a062e3b20c..533fb5d6ce 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java @@ -14,6 +14,7 @@ import static org.junit.Assert.fail; import java.io.File; import java.util.Collection; +import org.eclipse.jdt.annotation.NonNull; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -44,18 +45,18 @@ public class Bug5946Test { .getResource("/bugs/bug5946/foo.yang").toURI())); assertNotNull(context); - Collection uniqueConstraints = getListConstraints(context, WITHOUT_UNIQUE); + Collection uniqueConstraints = getListConstraints(context, WITHOUT_UNIQUE); assertNotNull(uniqueConstraints); assertTrue(uniqueConstraints.isEmpty()); - Collection simpleUniqueConstraints = getListConstraints(context, SIMPLE_UNIQUE); + Collection simpleUniqueConstraints = getListConstraints(context, SIMPLE_UNIQUE); assertNotNull(simpleUniqueConstraints); assertEquals(1, simpleUniqueConstraints.size()); Collection simpleUniqueConstraintTag = simpleUniqueConstraints.iterator().next().getTag(); assertTrue(simpleUniqueConstraintTag.contains(L1_ID)); assertTrue(simpleUniqueConstraintTag.contains(C_L3_ID)); - Collection multipleUniqueConstraints = getListConstraints(context, MULTIPLE_UNIQUE); + Collection multipleUniqueConstraints = getListConstraints(context, MULTIPLE_UNIQUE); assertNotNull(multipleUniqueConstraints); assertEquals(3, multipleUniqueConstraints.size()); boolean l1l2 = false; @@ -86,7 +87,8 @@ public class Bug5946Test { } } - private static Collection getListConstraints(final SchemaContext context, final QName listQName) { + private static @NonNull Collection getListConstraints(final SchemaContext context, + final QName listQName) { DataSchemaNode dataChildByName = context.getDataChildByName(listQName); assertTrue(dataChildByName instanceof ListSchemaNode); return ((ListSchemaNode) dataChildByName).getUniqueConstraints(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java index c4185796eb..3d97f529bc 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -13,9 +12,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.Set; import java.util.regex.Pattern; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -74,7 +73,7 @@ public class Bug6180Test { final RevisionAwareXPath whenCondition = bar.getWhenCondition().get(); assertEquals("/foo != \"bar\"", whenCondition.getOriginalString()); - final Set> typeDefinitions = schemaContext.getTypeDefinitions(); + final Collection> typeDefinitions = schemaContext.getTypeDefinitions(); assertEquals(1, typeDefinitions.size()); final TypeDefinition type = typeDefinitions.iterator().next(); assertTrue(type instanceof StringTypeDefinition); @@ -92,7 +91,7 @@ public class Bug6180Test { final RevisionAwareXPath whenCondition = bar.getWhenCondition().get(); assertEquals("/foo != 'bar'", whenCondition.getOriginalString()); - final Set> typeDefinitions = schemaContext.getTypeDefinitions(); + final Collection> typeDefinitions = schemaContext.getTypeDefinitions(); assertEquals(1, typeDefinitions.size()); final TypeDefinition type = typeDefinitions.iterator().next(); assertTrue(type instanceof StringTypeDefinition); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java index df81429bf1..e10dcfc724 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -29,7 +29,7 @@ public class Bug6240Test { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6240/correct"); assertNotNull(context); - final Set modules = context.getModules(); + final Collection modules = context.getModules(); assertEquals(2, modules.size()); Module bar = null; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java index addab2d6b9..1227778412 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java @@ -72,8 +72,7 @@ public class Bug6316Test { final TypeDefinition> type = bitsLeaf.getType(); assertTrue(type instanceof BitsTypeDefinition); final BitsTypeDefinition myBits = (BitsTypeDefinition) type; - final List positions = myBits.getBits(); - for (final Bit bit : positions) { + for (final Bit bit : myBits.getBits()) { final String name = bit.getName(); switch (name) { case "zero": diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java index e9bce70f9d..9d961e0495 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -13,7 +12,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; @@ -28,15 +27,15 @@ public class Bug6410Test { public void testTypedefsInRpc() throws ReactorException { final SchemaContext schemaContext = StmtTestUtils.parseYangSources(sourceForResource("/bugs/bug6410/foo.yang")); - final Set modules = schemaContext.getModules(); + final Collection modules = schemaContext.getModules(); assertEquals(1, modules.size()); final Module module = modules.iterator().next(); - final Set rpcs = module.getRpcs(); + final Collection rpcs = module.getRpcs(); assertEquals(1, rpcs.size()); final RpcDefinition rpc = rpcs.iterator().next(); - final Set> typeDefs = rpc.getTypeDefinitions(); + final Collection> typeDefs = rpc.getTypeDefinitions(); assertEquals(2, typeDefs.size()); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java index eec7984dca..bbd43b5079 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; @@ -34,7 +34,7 @@ public class Bug6491Test { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6491/".concat(path)); assertNotNull(context); final Module module = context.findModule("bar", moduleRevision).get(); - final Set imports = module.getImports(); + final Collection imports = module.getImports(); assertNotNull(imports); assertEquals(1, imports.size()); assertEquals(importedRevision, imports.iterator().next().getRevision()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java index e041a04c73..56293beea0 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java @@ -5,15 +5,14 @@ * 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.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.Collection; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.junit.Test; @@ -32,11 +31,11 @@ public class Bug7037Test { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug7037"); assertNotNull(context); - final List unknownSchemaNodes = context.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = context.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); final UnknownSchemaNode first = unknownSchemaNodes.iterator().next(); - final List firstUnknownNodes = first.getUnknownSchemaNodes(); + final Collection firstUnknownNodes = first.getUnknownSchemaNodes(); assertEquals(1, firstUnknownNodes.size()); final UnknownSchemaNode barExtCont = firstUnknownNodes.iterator().next(); @@ -46,17 +45,17 @@ public class Bug7037Test { final DataSchemaNode root = context.getDataChildByName(foo("root")); assertTrue(root instanceof ContainerSchemaNode); - final List rootUnknownNodes = root.getUnknownSchemaNodes(); + final Collection rootUnknownNodes = root.getUnknownSchemaNodes(); assertEquals(2, rootUnknownNodes.size()); final Map rootUnknownNodeMap = rootUnknownNodes.stream() .collect(Collectors.toMap(u -> u.getNodeType(), u -> u)); final UnknownSchemaNode barExt = rootUnknownNodeMap.get(bar("bar-ext")); - final List barExtUnknownNodes = barExt.getUnknownSchemaNodes(); + final Collection barExtUnknownNodes = barExt.getUnknownSchemaNodes(); assertEquals(3, barExtUnknownNodes.size()); - final Iterator iterator = barExtUnknownNodes.iterator(); + final Iterator iterator = barExtUnknownNodes.iterator(); UnknownSchemaNode barExtCont2 = null; while (iterator.hasNext()) { final UnknownSchemaNode next = iterator.next(); @@ -69,7 +68,7 @@ public class Bug7037Test { assertEquals(foo("bar-ext-con-2"), barExtCont2.getQName()); final UnknownSchemaNode fooExt = rootUnknownNodeMap.get(foo("foo-ext")); - final List fooUnknownNodes = fooExt.getUnknownSchemaNodes(); + final Collection fooUnknownNodes = fooExt.getUnknownSchemaNodes(); assertEquals(1, fooUnknownNodes.size()); final UnknownSchemaNode fooExtCont = fooUnknownNodes.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java index e736b3f9b4..92c4970957 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java @@ -5,14 +5,12 @@ * 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.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.util.List; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; @@ -34,11 +32,11 @@ public class Bug7440Test { final Module foo = schemaContext.findModule("foo", revision).get(); final Module bar = schemaContext.findModule("bar", revision).get(); - final Set deviations = foo.getDeviations(); + final Collection deviations = foo.getDeviations(); assertEquals(1, deviations.size()); final Deviation deviation = deviations.iterator().next(); - final List deviates = deviation.getDeviates(); + final Collection deviates = deviation.getDeviates(); assertEquals(1, deviates.size()); final DeviateDefinition deviateReplace = deviates.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java index dbb6ad5d37..aa6200ff87 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.net.URI; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; @@ -27,7 +27,7 @@ public class Bug7480Test { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug7480/files", "/bugs/bug7480/lib"); assertNotNull(context); - final Set modules = context.getModules(); + final Collection modules = context.getModules(); assertEquals(8, modules.size()); assertNotNull(context.findModule(new URI("foo-imp"), Revision.of("2017-01-23"))); @@ -36,9 +36,9 @@ public class Bug7480Test { assertEquals(1, context.findModules(new URI("bar")).size()); assertEquals(1, context.findModules(new URI("baz")).size()); assertTrue(context.findModule(new URI("baz-imp"), Revision.of("2002-01-01")).isPresent()); - final Set foo = context.findModules(new URI("foo")); + final Collection foo = context.findModules(new URI("foo")); assertEquals(1, foo.size()); - final Set subFoos = foo.iterator().next().getSubmodules(); + final Collection subFoos = foo.iterator().next().getSubmodules(); assertEquals(1, subFoos.size()); final Module parentMod = context.findModule(new URI("parent-mod-ns"), Revision.of("2017-09-07")).get(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java index 8298bb7985..d25b02abbf 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.List; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -30,15 +30,15 @@ public class Bug7865Test { final DataSchemaNode root = context.getDataChildByName(foo("root")); assertTrue(root instanceof ContainerSchemaNode); - final List unknownSchemaNodes = root.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = root.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); final UnknownSchemaNode unknownNode = unknownSchemaNodes.iterator().next(); - final List subUnknownSchemaNodes = unknownNode.getUnknownSchemaNodes(); + final Collection subUnknownSchemaNodes = unknownNode.getUnknownSchemaNodes(); assertEquals(1, subUnknownSchemaNodes.size()); final UnknownSchemaNode subUnknownNode = subUnknownSchemaNodes.iterator().next(); - final List subSubUnknownSchemaNodes = subUnknownNode.getUnknownSchemaNodes(); + final Collection subSubUnknownSchemaNodes = subUnknownNode.getUnknownSchemaNodes(); assertEquals(1, subSubUnknownSchemaNodes.size()); final UnknownSchemaNode subSubUnknownNode = subSubUnknownSchemaNodes.iterator().next(); @@ -49,5 +49,4 @@ public class Bug7865Test { private static QName foo(final String localName) { return QName.create(NS, localName); } - } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java index c3dd3c270f..389ada9b36 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; @@ -26,9 +25,7 @@ public class Bug8597Test { assertNotNull(context); final Module foo = context.findModule("foo").get(); - final Set imports = foo.getImports(); - - for (final ModuleImport moduleImport : imports) { + for (final ModuleImport moduleImport : foo.getImports()) { switch (moduleImport.getModuleName()) { case "bar": assertEquals(Revision.ofNullable("1970-01-01"), moduleImport.getRevision()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java index 4031585760..70ee79318e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; @@ -25,17 +25,17 @@ public class Bug9005Test { final Module foo = context.findModule("foo", Revision.of("2017-07-07")).get(); - final Set imports = foo.getImports(); + final Collection imports = foo.getImports(); assertEquals(1, imports.size()); final ModuleImport imp1 = imports.iterator().next(); assertEquals("bar-2", imp1.getModuleName()); assertEquals("bar", imp1.getPrefix()); assertEquals(Revision.ofNullable("2000-01-02"), imp1.getRevision()); - final Set submodules = foo.getSubmodules(); + final Collection submodules = foo.getSubmodules(); assertEquals(1, submodules.size()); final Module submodule = submodules.iterator().next(); - final Set subImports = submodule.getImports(); + final Collection subImports = submodule.getImports(); assertEquals(1, subImports.size()); final ModuleImport subImp1 = subImports.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java index 1aff5ba01c..a1c5abb7f1 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java @@ -12,8 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.net.URI; -import java.util.List; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -44,9 +43,8 @@ public class ControllerStmtParserTest { private static void salDomBrokerImplModuleTest(final SchemaContext context) { final Module module = context.findModule("opendaylight-sal-dom-broker-impl", Revision.of("2013-10-28")).get(); - final Set augmentations = module.getAugmentations(); boolean checked = false; - for (final AugmentationSchemaNode augmentationSchema : augmentations) { + for (final AugmentationSchemaNode augmentationSchema : module.getAugmentations()) { final DataSchemaNode dataNode = augmentationSchema .getDataChildByName(QName.create(module.getQNameModule(), "dom-broker-impl")); if (dataNode instanceof CaseSchemaNode) { @@ -57,10 +55,10 @@ public class ControllerStmtParserTest { final ContainerSchemaNode containerNode = (ContainerSchemaNode) dataNode2; final DataSchemaNode leaf = containerNode .getDataChildByName(QName.create(module.getQNameModule(), "type")); - final List unknownSchemaNodes = leaf.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = leaf.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); - final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0); + final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); assertEquals("dom-async-data-broker", unknownSchemaNode.getQName().getLocalName()); assertEquals(unknownSchemaNode.getQName(), unknownSchemaNode.getPath().getLastComponent()); @@ -101,11 +99,11 @@ public class ControllerStmtParserTest { final ContainerSchemaNode containerNode = (ContainerSchemaNode) dataNode2; final DataSchemaNode leaf = containerNode.getDataChildByName(QName.create(module.getQNameModule(), "type")); - final List unknownSchemaNodes = leaf.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = leaf.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); - final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0); + final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); assertEquals(unknownSchemaNode.getQName(), unknownSchemaNode.getPath().getLastComponent()); assertEquals("dom-async-data-broker", unknownSchemaNode.getQName().getLocalName()); @@ -130,10 +128,10 @@ public class ControllerStmtParserTest { final DataSchemaNode type = schemaServiceContainer.getDataChildByName(QName.create(module.getQNameModule(), "type")); - final List typeUnknownSchemaNodes = type.getUnknownSchemaNodes(); + final Collection typeUnknownSchemaNodes = type.getUnknownSchemaNodes(); assertEquals(1, typeUnknownSchemaNodes.size()); - final UnknownSchemaNode typeUnknownSchemaNode = typeUnknownSchemaNodes.get(0); + final UnknownSchemaNode typeUnknownSchemaNode = typeUnknownSchemaNodes.iterator().next(); final QNameModule qNameModule = QNameModule.create( URI.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom"), Revision.of("2013-10-28")); final QName qName = QName.create(qNameModule, "schema-service"); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java index 03545c4275..684ba2627e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java @@ -194,7 +194,7 @@ public class DeclaredStatementsTest { final Module testModule = schemaContext.findModules("augment-declared-test").iterator().next(); assertNotNull(testModule); - final Set augmentationSchemas = testModule.getAugmentations(); + final Collection augmentationSchemas = testModule.getAugmentations(); assertNotNull(augmentationSchemas); assertEquals(1, augmentationSchemas.size()); @@ -245,7 +245,7 @@ public class DeclaredStatementsTest { final IncludeStatement includeStatement = moduleStatement.getIncludes().iterator().next(); assertEquals("child-module-declared-test", includeStatement.getModule()); - final Set submodules = testModule.getSubmodules(); + final Collection submodules = testModule.getSubmodules(); assertNotNull(submodules); assertEquals(1, submodules.size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java index 283b0156e8..6d953f1112 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java @@ -13,9 +13,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.util.List; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.DeviateDefinition; @@ -43,11 +42,11 @@ public class DeviationStmtTest { assertNotNull(schemaContext); Module testModule = schemaContext.findModule("foo", Revision.of("2016-06-23")).get(); - Set deviations = testModule.getDeviations(); + Collection deviations = testModule.getDeviations(); assertEquals(4, deviations.size()); for (Deviation deviation : deviations) { - final List deviates = deviation.getDeviates(); + final Collection deviates = deviation.getDeviates(); final String targetLocalName = deviation.getTargetPath().getLastComponent().getLocalName(); if ("test-leaf".equals(targetLocalName)) { assertEquals(Optional.of("test-leaf is not supported"), deviation.getDescription()); @@ -94,7 +93,7 @@ public class DeviationStmtTest { Deviation deviation7 = null; for (Deviation deviation : deviations) { - final List deviates = deviation.getDeviates(); + final Collection deviates = deviation.getDeviates(); final String targetLocalName = deviation.getTargetPath().getLastComponent().getLocalName(); if ("bar-container-1".equals(targetLocalName)) { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java index a0b208b367..3c8fb51816 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java @@ -16,7 +16,6 @@ import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; import java.util.Collection; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -95,12 +94,12 @@ public class EffectiveBuildTest { SchemaContext result = RFC7950Reactors.defaultReactor().newBuild().addSource(YANG_EXT).buildEffective(); assertNotNull(result); - Set groupings = result.getGroupings(); + Collection groupings = result.getGroupings(); assertEquals(1, groupings.size()); GroupingDefinition grp = groupings.iterator().next(); - Collection childNodes = grp.getChildNodes(); + Collection childNodes = grp.getChildNodes(); assertEquals(1, childNodes.size()); DataSchemaNode child = childNodes.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java index bf438554f6..25f2f0af34 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -16,7 +15,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour import com.google.common.collect.Iterables; import java.net.URISyntaxException; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -52,14 +51,11 @@ public class EffectiveIdentityTest { @Test public void identityTest() throws SourceException, ReactorException, URISyntaxException { - SchemaContext result = RFC7950Reactors.defaultReactor().newBuild() - .addSources(IDENTITY_TEST) - .buildEffective(); - + SchemaContext result = RFC7950Reactors.defaultReactor().newBuild().addSources(IDENTITY_TEST).buildEffective(); assertNotNull(result); Module module = result.findModule("identity-test").get(); - Set identities = module.getIdentities(); + Collection identities = module.getIdentities(); assertNotNull(identities); assertEquals(4, identities.size()); @@ -94,8 +90,7 @@ public class EffectiveIdentityTest { assertTrue(root.getBaseIdentities().isEmpty()); - Set rootDerivedIdentities = root - .getDerivedIdentities(); + Collection rootDerivedIdentities = root.getDerivedIdentities(); assertEquals(2, rootDerivedIdentities.size()); assertTrue(rootDerivedIdentities.contains(child1)); @@ -108,8 +103,7 @@ public class EffectiveIdentityTest { assertTrue(child2.getDerivedIdentities().isEmpty()); - Set child1DerivedIdentities = child1 - .getDerivedIdentities(); + Collection child1DerivedIdentities = child1.getDerivedIdentities(); assertEquals(1, child1DerivedIdentities.size()); assertTrue(child1DerivedIdentities.contains(child12)); assertFalse(child1DerivedIdentities.contains(child1)); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java index 1bb594e34a..d14641691e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -13,9 +12,8 @@ import static org.junit.Assert.assertNotNull; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.net.URI; -import java.util.List; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -78,11 +76,11 @@ public class EffectiveModuleTest { final ContainerSchemaNode contSchemaNode = (ContainerSchemaNode) rootModule.getDataChildByName(CONT); assertNotNull(contSchemaNode); - final Set augmentations = rootModule.getAugmentations(); + final Collection augmentations = rootModule.getAugmentations(); assertEquals(1, augmentations.size()); assertEquals(CONT_SCHEMA_PATH, augmentations.iterator().next().getTargetPath()); - final Set imports = rootModule.getImports(); + final Collection imports = rootModule.getImports(); assertEquals(1, imports.size()); final ModuleImport importStmt = imports.iterator().next(); assertNotNull(importStmt); @@ -90,19 +88,19 @@ public class EffectiveModuleTest { assertEquals(Optional.of(REVISION), importStmt.getRevision()); assertEquals("imp-pref", importStmt.getPrefix()); - final Set submodules = rootModule.getSubmodules(); + final Collection submodules = rootModule.getSubmodules(); assertEquals(1, submodules.size()); assertEquals("submod", submodules.iterator().next().getName()); - final Set notifications = rootModule.getNotifications(); + final Collection notifications = rootModule.getNotifications(); assertEquals(1, notifications.size()); assertEquals("notif1", notifications.iterator().next().getQName().getLocalName()); - final Set rpcs = rootModule.getRpcs(); + final Collection rpcs = rootModule.getRpcs(); assertEquals(1, rpcs.size()); assertEquals("rpc1", rpcs.iterator().next().getQName().getLocalName()); - final Set deviations = rootModule.getDeviations(); + final Collection deviations = rootModule.getDeviations(); assertEquals(1, deviations.size()); final Deviation deviationStmt = deviations.iterator().next(); assertNotNull(deviationStmt); @@ -113,11 +111,11 @@ public class EffectiveModuleTest { assertEquals(DeviateKind.ADD, deviationStmt.getDeviates().iterator().next().getDeviateType()); assertEquals(Optional.of("deviate reference"), deviationStmt.getReference()); - final Set identities = rootModule.getIdentities(); + final Collection identities = rootModule.getIdentities(); assertEquals(1, identities.size()); assertEquals("identity1", identities.iterator().next().getQName().getLocalName()); - final Set features = rootModule.getFeatures(); + final Collection features = rootModule.getFeatures(); assertEquals(1, features.size()); final FeatureDefinition featureStmt = features.iterator().next(); assertNotNull(featureStmt); @@ -127,7 +125,7 @@ public class EffectiveModuleTest { assertEquals(Optional.of("feature1 reference"), featureStmt.getReference()); assertEquals(Status.CURRENT, featureStmt.getStatus()); - final List extensionSchemaNodes = rootModule.getExtensionSchemaNodes(); + final Collection extensionSchemaNodes = rootModule.getExtensionSchemaNodes(); assertEquals(1, extensionSchemaNodes.size()); assertEquals("ext1", extensionSchemaNodes.iterator().next().getQName().getLocalName()); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java index 47d876a4fd..5659212a1f 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -16,7 +15,6 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour import java.net.URI; import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -50,7 +48,7 @@ public class EffectiveModulesAndSubmodulesTest { assertNotNull(result); - final Set modules = result.getModules(); + final Collection modules = result.getModules(); assertNotNull(modules); assertEquals(2, modules.size()); @@ -73,9 +71,8 @@ public class EffectiveModulesAndSubmodulesTest { assertNotNull(root); assertNotNull(imported); - final Collection rootChildNodes = root.getChildNodes(); - final Collection importedChildNodes = imported - .getChildNodes(); + final Collection rootChildNodes = root.getChildNodes(); + final Collection importedChildNodes = imported.getChildNodes(); assertNotNull(rootChildNodes); assertNotNull(importedChildNodes); @@ -83,8 +80,8 @@ public class EffectiveModulesAndSubmodulesTest { assertEquals(3, rootChildNodes.size()); assertEquals(1, importedChildNodes.size()); - final Set rootSubmodules = root.getSubmodules(); - final Set importedSubmodules = imported.getSubmodules(); + final Collection rootSubmodules = root.getSubmodules(); + final Collection importedSubmodules = imported.getSubmodules(); assertNotNull(rootSubmodules); assertNotNull(importedSubmodules); @@ -112,8 +109,8 @@ public class EffectiveModulesAndSubmodulesTest { assertEquals(ROOT, sub1.getQNameModule()); assertEquals(ROOT, sub2.getQNameModule()); - final Collection sub1ChildNodes = sub1.getChildNodes(); - final Collection sub2ChildNodes = sub2.getChildNodes(); + final Collection sub1ChildNodes = sub1.getChildNodes(); + final Collection sub2ChildNodes = sub2.getChildNodes(); assertNotNull(sub1ChildNodes); assertNotNull(sub2ChildNodes); @@ -121,8 +118,8 @@ public class EffectiveModulesAndSubmodulesTest { assertEquals(1, sub1ChildNodes.size()); assertEquals(1, sub2ChildNodes.size()); - final Set sub1Submodules = sub1.getSubmodules(); - final Set sub2Submodules = sub2.getSubmodules(); + final Collection sub1Submodules = sub1.getSubmodules(); + final Collection sub2Submodules = sub2.getSubmodules(); assertNotNull(sub1Submodules); assertNotNull(sub2Submodules); @@ -144,11 +141,11 @@ public class EffectiveModulesAndSubmodulesTest { assertEquals(ROOT, sub1Submodule.getQNameModule()); - final Collection sub1SubmoduleChildNodes = sub1Submodule.getChildNodes(); + final Collection sub1SubmoduleChildNodes = sub1Submodule.getChildNodes(); assertNotNull(sub1SubmoduleChildNodes); assertEquals(1, sub1SubmoduleChildNodes.size()); - final Set sub1SubmoduleSubmodules = sub1Submodule.getSubmodules(); + final Collection sub1SubmoduleSubmodules = sub1Submodule.getSubmodules(); assertNotNull(sub1SubmoduleSubmodules); assertEquals(0, sub1SubmoduleSubmodules.size()); @@ -166,7 +163,7 @@ public class EffectiveModulesAndSubmodulesTest { private static void findModulesSubTest(final SchemaContext result, final Module root, final Module imported) { final Module foundRoot = result.findModule("root-module").get(); - final Set foundRoots = result.findModules(URI.create("root-module")); + final Collection foundRoots = result.findModules(URI.create("root-module")); final Module foundRoot3 = result.findModule(URI.create("root-module")).get(); assertNotNull(foundRoot); @@ -182,7 +179,7 @@ public class EffectiveModulesAndSubmodulesTest { assertEquals(root, foundRoot3); final Module foundImported = result.findModule("imported-module").get(); - final Set foundImporteds = result.findModules(URI.create("imported-module")); + final Collection foundImporteds = result.findModules(URI.create("imported-module")); final Module foundImported3 = result.findModule(URI.create("imported-module")).get(); assertNotNull(foundImported); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java index 70fb76b8e8..f80e6dd7ff 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java @@ -19,7 +19,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; import java.util.Collection; -import java.util.List; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -56,22 +55,22 @@ public class EffectiveSchemaContextTest { .buildEffective(); assertNotNull(schemaContext); - final Set dataDefinitions = schemaContext.getDataDefinitions(); + final Collection dataDefinitions = schemaContext.getDataDefinitions(); assertEquals(3, dataDefinitions.size()); - final Collection childNodes = schemaContext.getChildNodes(); + final Collection childNodes = schemaContext.getChildNodes(); assertEquals(3, childNodes.size()); - final Set notifications = schemaContext.getNotifications(); + final Collection notifications = schemaContext.getNotifications(); assertEquals(3, notifications.size()); - final Set rpcs = schemaContext.getOperations(); + final Collection rpcs = schemaContext.getOperations(); assertEquals(3, rpcs.size()); - final Set extensions = schemaContext.getExtensions(); + final Collection extensions = schemaContext.getExtensions(); assertEquals(3, extensions.size()); - final List unknownSchemaNodes = schemaContext.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = schemaContext.getUnknownSchemaNodes(); assertEquals(3, unknownSchemaNodes.size()); assertNull(schemaContext.getDataChildByName(QName.create("foo-namespace", "2016-09-21", "foo-cont"))); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java index ee76fdc092..25550b9d01 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -16,6 +15,7 @@ import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import com.google.common.collect.Range; +import java.util.Iterator; import java.util.List; import java.util.Optional; import org.junit.AfterClass; @@ -99,9 +99,9 @@ public class EffectiveStatementTypeTest { currentLeaf = (LeafSchemaNode) types.getDataChildByName(QName.create(types.getQNameModule(), "leaf-bits")); assertNotNull(currentLeaf.getType()); - final List bitsEffIter = ((BitsTypeDefinition) currentLeaf.getType()).getBits(); - final Bit bitEff = bitsEffIter.get(0); - final Bit bitEffSecond = bitsEffIter.get(1); + final Iterator bitsEffIter = ((BitsTypeDefinition) currentLeaf.getType()).getBits().iterator(); + final Bit bitEff = bitsEffIter.next(); + final Bit bitEffSecond = bitsEffIter.next(); final BitsTypeDefinition bitsEff = ((BitsSpecificationEffectiveStatement) ((LeafEffectiveStatement) currentLeaf).effectiveSubstatements().iterator().next()) diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java index d611e0d8b5..01d5d77122 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -14,8 +13,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -40,7 +39,7 @@ public class EffectiveUsesRefineAndConstraintsTest { .buildEffective(); assertNotNull(result); - Set modules = result.getModules(); + Collection modules = result.getModules(); assertNotNull(modules); assertEquals(1, modules.size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java index 10d4527434..c0cf2aa7c1 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -13,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.util.List; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; @@ -37,8 +36,8 @@ public class ExtensionStmtTest { assertEquals(1, testModule.getExtensionSchemaNodes().size()); - final List extensions = testModule.getExtensionSchemaNodes(); - final ExtensionDefinition extension = extensions.get(0); + final Collection extensions = testModule.getExtensionSchemaNodes(); + final ExtensionDefinition extension = extensions.iterator().next(); assertEquals("opendaylight", extension.getQName().getLocalName()); assertEquals("name", extension.getArgument()); assertTrue(extension.isYinElement()); @@ -57,8 +56,8 @@ public class ExtensionStmtTest { assertEquals(1, testModule1.getExtensionSchemaNodes().size()); - final List extensions = testModule1.getExtensionSchemaNodes(); - final ExtensionDefinition extensionDefinition = extensions.get(0); + final Collection extensions = testModule1.getExtensionSchemaNodes(); + final ExtensionDefinition extensionDefinition = extensions.iterator().next(); final Module testModule2 = result.findModules("ext-use").iterator().next(); assertNotNull(testModule2); @@ -68,8 +67,8 @@ public class ExtensionStmtTest { assertNotNull(leaf); assertEquals(1, leaf.getUnknownSchemaNodes().size()); - final List unknownNodes = leaf.getUnknownSchemaNodes(); - final UnknownSchemaNode extensionUse = unknownNodes.get(0); + final Collection unknownNodes = leaf.getUnknownSchemaNodes(); + final UnknownSchemaNode extensionUse = unknownNodes.iterator().next(); assertEquals(extensionDefinition.getQName().getLocalName(), extensionUse.getExtensionDefinition().getQName() .getLocalName()); assertEquals(extensionDefinition.getArgument(), extensionUse.getExtensionDefinition().getArgument()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java index b7399bd0f6..3b8f25ef82 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.hamcrest.CoreMatchers.anyOf; @@ -15,10 +14,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; +import java.util.Collection; import java.util.Iterator; -import java.util.List; import java.util.Map; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; @@ -54,10 +52,10 @@ public class GroupingAndUsesStmtTest { final Module testModule = result.findModules("baz").iterator().next(); assertNotNull(testModule); - final Set groupings = testModule.getGroupings(); + final Collection groupings = testModule.getGroupings(); assertEquals(1, groupings.size()); - final Iterator groupingsIterator = groupings.iterator(); + final Iterator groupingsIterator = groupings.iterator(); final GroupingDefinition grouping = groupingsIterator.next(); assertEquals("target", grouping.getQName().getLocalName()); assertEquals(5, grouping.getChildNodes().size()); @@ -84,9 +82,9 @@ public class GroupingAndUsesStmtTest { assertEquals(1, grouping.getTypeDefinitions().size()); assertEquals("group-type", grouping.getTypeDefinitions().iterator().next().getQName().getLocalName()); - final List unknownSchemaNodes = grouping.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = grouping.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); - final UnknownSchemaNode extensionUse = unknownSchemaNodes.get(0); + final UnknownSchemaNode extensionUse = unknownSchemaNodes.iterator().next(); assertEquals("opendaylight", extensionUse.getExtensionDefinition().getQName().getLocalName()); } @@ -100,7 +98,7 @@ public class GroupingAndUsesStmtTest { final Module testModule = result.findModules("foo").iterator().next(); assertNotNull(testModule); - final Set usesNodes = testModule.getUses(); + final Collection usesNodes = testModule.getUses(); assertEquals(1, usesNodes.size()); UsesNode usesNode = usesNodes.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java index dea745f814..6bb3fe7a77 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java @@ -17,10 +17,8 @@ import java.io.IOException; import java.net.URI; import java.text.ParseException; import java.util.Collection; -import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Set; import java.util.SortedMap; import org.junit.Before; import org.junit.Test; @@ -70,7 +68,7 @@ public class GroupingTest { final ContainerSchemaNode destination = (ContainerSchemaNode) peer.getDataChildByName(QName.create( testModule.getQNameModule(), "destination")); - final Set usesNodes = destination.getUses(); + final Collection usesNodes = destination.getUses(); assertEquals(1, usesNodes.size()); final UsesNode usesNode = usesNodes.iterator().next(); final Map refines = usesNode.getRefines(); @@ -105,7 +103,7 @@ public class GroupingTest { assertEquals(Optional.of("address reference added by refine"), refineLeaf.getReference()); assertFalse(refineLeaf.isConfiguration()); assertFalse(refineLeaf.isMandatory()); - final Collection leafMustConstraints = refineLeaf.getMustConstraints(); + final Collection leafMustConstraints = refineLeaf.getMustConstraints(); assertEquals(1, leafMustConstraints.size()); final MustDefinition leafMust = leafMustConstraints.iterator().next(); assertEquals("ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)", leafMust.toString()); @@ -113,7 +111,7 @@ public class GroupingTest { // container port assertNotNull(refineContainer); - final Collection mustConstraints = refineContainer.getMustConstraints(); + final Collection mustConstraints = refineContainer.getMustConstraints(); assertTrue(mustConstraints.isEmpty()); assertEquals(Optional.of("description of port defined by refine"), refineContainer.getDescription()); assertEquals(Optional.of("port reference added by refine"), refineContainer.getReference()); @@ -137,10 +135,10 @@ public class GroupingTest { @Test public void testGrouping() { final Module testModule = TestUtils.findModule(ctx, "baz").get(); - final Set groupings = testModule.getGroupings(); + final Collection groupings = testModule.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition grouping = groupings.iterator().next(); - final Collection children = grouping.getChildNodes(); + final Collection children = grouping.getChildNodes(); assertEquals(5, children.size()); } @@ -151,7 +149,7 @@ public class GroupingTest { // get grouping - final Set groupings = baz.getGroupings(); + final Collection groupings = baz.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition grouping = groupings.iterator().next(); @@ -162,7 +160,7 @@ public class GroupingTest { foo.getQNameModule(), "destination")); // check uses - final Set uses = destination.getUses(); + final Collection uses = destination.getUses(); assertEquals(1, uses.size()); // check uses process @@ -239,26 +237,26 @@ public class GroupingTest { assertEquals(addresses_g, SchemaNodeUtils.getRootOriginalIfPossible(addresses_u)); // grouping defined by 'uses' - final Set groupings_u = destination.getGroupings(); + final Collection groupings_u = destination.getGroupings(); assertEquals(1, groupings_u.size()); final GroupingDefinition grouping_u = groupings_u.iterator().next(); TestUtils.checkIsAddedByUses(grouping_u, true); // grouping defined in 'grouping' node - final Set groupings_g = grouping.getGroupings(); + final Collection groupings_g = grouping.getGroupings(); assertEquals(1, groupings_g.size()); final GroupingDefinition grouping_g = groupings_g.iterator().next(); TestUtils.checkIsAddedByUses(grouping_g, false); assertFalse(grouping_u.equals(grouping_g)); - final List nodes_u = destination.getUnknownSchemaNodes(); + final Collection nodes_u = destination.getUnknownSchemaNodes(); assertEquals(1, nodes_u.size()); - final UnknownSchemaNode node_u = nodes_u.get(0); + final UnknownSchemaNode node_u = nodes_u.iterator().next(); assertTrue(node_u.isAddedByUses()); - final List nodes_g = grouping.getUnknownSchemaNodes(); + final Collection nodes_g = grouping.getUnknownSchemaNodes(); assertEquals(1, nodes_g.size()); - final UnknownSchemaNode node_g = nodes_g.get(0); + final UnknownSchemaNode node_g = nodes_g.iterator().next(); assertFalse(node_g.isAddedByUses()); assertFalse(node_u.equals(node_g)); } @@ -269,12 +267,12 @@ public class GroupingTest { // suffix _g = defined in grouping // get grouping - final Set groupings = baz.getGroupings(); + final Collection groupings = baz.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition grouping = groupings.iterator().next(); // check uses - final Set uses = foo.getUses(); + final Collection uses = foo.getUses(); assertEquals(1, uses.size()); // check uses process @@ -358,35 +356,35 @@ public class GroupingTest { assertEquals(addresses_g, SchemaNodeUtils.getRootOriginalIfPossible(addresses_u)); // grouping defined by 'uses' - final Set groupings_u = foo.getGroupings(); + final Collection groupings_u = foo.getGroupings(); assertEquals(1, groupings_u.size()); final GroupingDefinition grouping_u = groupings_u.iterator().next(); TestUtils.checkIsAddedByUses(grouping_u, true); // grouping defined in 'grouping' node - final Set groupings_g = grouping.getGroupings(); + final Collection groupings_g = grouping.getGroupings(); assertEquals(1, groupings_g.size()); final GroupingDefinition grouping_g = groupings_g.iterator().next(); TestUtils.checkIsAddedByUses(grouping_g, false); assertFalse(grouping_u.equals(grouping_g)); - final List nodes_u = foo.getUnknownSchemaNodes(); + final Collection nodes_u = foo.getUnknownSchemaNodes(); assertEquals(1, nodes_u.size()); - final UnknownSchemaNode node_u = nodes_u.get(0); + final UnknownSchemaNode node_u = nodes_u.iterator().next(); assertTrue(node_u.isAddedByUses()); - final List nodes_g = grouping.getUnknownSchemaNodes(); + final Collection nodes_g = grouping.getUnknownSchemaNodes(); assertEquals(1, nodes_g.size()); - final UnknownSchemaNode node_g = nodes_g.get(0); + final UnknownSchemaNode node_g = nodes_g.iterator().next(); assertFalse(node_g.isAddedByUses()); assertFalse(node_u.equals(node_g)); final UsesNode un = uses.iterator().next(); - final Set usesAugments = un.getAugmentations(); + final Collection usesAugments = un.getAugmentations(); assertEquals(1, usesAugments.size()); final AugmentationSchemaNode augment = usesAugments.iterator().next(); assertEquals(Optional.of("inner augment"), augment.getDescription()); - final Collection children = augment.getChildNodes(); + final Collection children = augment.getChildNodes(); assertEquals(1, children.size()); final DataSchemaNode leaf = children.iterator().next(); assertTrue(leaf instanceof LeafSchemaNode); @@ -399,7 +397,7 @@ public class GroupingTest { assertEquals(1, ctx.getModules().size()); final Module testModule = TestUtils.findModule(ctx, "cascade-uses").get(); - final Set groupings = testModule.getGroupings(); + final Collection groupings = testModule.getGroupings(); GroupingDefinition gu = null; GroupingDefinition gv = null; @@ -443,7 +441,7 @@ public class GroupingTest { Revision.of("2013-07-18")); // grouping-U - Collection childNodes = gu.getChildNodes(); + Collection childNodes = gu.getChildNodes(); assertEquals(7, childNodes.size()); final LeafSchemaNode leafGroupingU = (LeafSchemaNode) gu.getDataChildByName(QName.create( @@ -614,8 +612,7 @@ public class GroupingTest { .getDataChildByName(QName.create(foo.getQNameModule(), "my-leaf")); TypeDefinition impType = null; - final Set> typeDefinitions = imp.getTypeDefinitions(); - for (final TypeDefinition typeDefinition : typeDefinitions) { + for (final TypeDefinition typeDefinition : imp.getTypeDefinitions()) { if (typeDefinition.getQName().getLocalName().equals("imp-type")) { impType = typeDefinition; break; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java index a58ece2738..4e300e925b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.hamcrest.CoreMatchers.anyOf; @@ -15,8 +14,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -79,10 +78,10 @@ public class IdentityStmtTest { Module testModule = result.findModules("legal-chained-identity-test").iterator().next(); assertNotNull(testModule); - Set identities = testModule.getIdentities(); + Collection identities = testModule.getIdentities(); assertEquals(4, identities.size()); - Iterator identitiesIterator = identities.iterator(); + Iterator identitiesIterator = identities.iterator(); IdentitySchemaNode identity = identitiesIterator.next(); assertThat(identity.getQName().getLocalName(), anyOf(is("first-identity"), is("second-identity"), is("third-identity"), is("fourth-identity"))); @@ -108,7 +107,7 @@ public class IdentityStmtTest { assertNotNull(result); Module testModule = result.findModules("duplicate-identity-test").iterator().next(); - Set identities = testModule.getIdentities(); + Collection identities = testModule.getIdentities(); assertEquals(1, identities.size()); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java index e078597c8a..c3d0c1575b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.hamcrest.CoreMatchers.anyOf; @@ -15,8 +14,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -51,10 +50,10 @@ public class IncludedStmtsTest { final Module testModule = result.findModules("root-module").iterator().next(); assertNotNull(testModule); - final Set> typedefs = testModule.getTypeDefinitions(); + final Collection> typedefs = testModule.getTypeDefinitions(); assertEquals(2, typedefs.size()); - final Iterator> typedefsIterator = typedefs.iterator(); + final Iterator> typedefsIterator = typedefs.iterator(); TypeDefinition typedef = typedefsIterator.next(); assertThat(typedef.getQName().getLocalName(), anyOf(is("new-string-type"), is("new-int32-type"))); assertThat(typedef.getBaseType().getQName().getLocalName(), anyOf(is("string"), is("int32"))); @@ -68,10 +67,10 @@ public class IncludedStmtsTest { final Module testModule = result.findModules("root-module").iterator().next(); assertNotNull(testModule); - final Set features = testModule.getFeatures(); + final Collection features = testModule.getFeatures(); assertEquals(2, features.size()); - final Iterator featuresIterator = features.iterator(); + final Iterator featuresIterator = features.iterator(); FeatureDefinition feature = featuresIterator.next(); assertThat(feature.getQName().getLocalName(), anyOf(is("new-feature1"), is("new-feature2"))); feature = featuresIterator.next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java index 55cb14136b..e3f9e19827 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -15,8 +14,8 @@ import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.net.URI; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -89,7 +88,7 @@ public class MoreRevisionsTest { .addSources(NETWORK_TOPOLOGY_20130712, NETWORK_TOPOLOGY_20131021, IETF_TYPES) .buildEffective(); assertNotNull(result); - Set modules = result.getModules(); + Collection modules = result.getModules(); assertEquals(3, modules.size()); assertEquals(2, StmtTestUtils.findModules(modules, "network-topology").size()); @@ -155,7 +154,7 @@ public class MoreRevisionsTest { Revision rev20121115 = Revision.of("2012-11-15"); Module interfacesModule20121115 = context.findModule("ietf-interfaces", rev20121115).get(); - Set imports = interfacesModule20121115.getImports(); + Collection imports = interfacesModule20121115.getImports(); assertEquals(1, imports.size()); ModuleImport interfacesImport = imports.iterator().next(); assertEquals("ietf-yang-types", interfacesImport.getModuleName()); @@ -167,7 +166,7 @@ public class MoreRevisionsTest { Revision rev20101004 = Revision.of("2010-10-04"); Module monitoringModule20101004 = context.findModule("ietf-netconf-monitoring", rev20101004).get(); - Set imports = monitoringModule20101004.getImports(); + Collection imports = monitoringModule20101004.getImports(); assertEquals(2, imports.size()); for (ModuleImport monitoringImport : imports) { if (monitoringImport.getModuleName().equals("ietf-yang-types")) { @@ -228,7 +227,7 @@ public class MoreRevisionsTest { QName lastChangeTypeQName = ((LeafSchemaNode) leafLastChange).getType().getQName(); assertEquals(dateTimeTypeDef20100924, lastChangeTypeQName); - Set imports = interfacesModule20121115.getImports(); + Collection imports = interfacesModule20121115.getImports(); assertEquals(1, imports.size()); ModuleImport interfacesImport = imports.iterator().next(); assertEquals("ietf-yang-types", interfacesImport.getModuleName()); @@ -249,7 +248,7 @@ public class MoreRevisionsTest { QName lockedTimeTypeQName = ((LeafSchemaNode) leafLockedTime).getType().getQName(); assertEquals(dateTimeTypeDef20130715, lockedTimeTypeQName); - Set imports = monitoringModule19700101.getImports(); + Collection imports = monitoringModule19700101.getImports(); assertEquals(1, imports.size()); ModuleImport monitoringImport = imports.iterator().next(); assertEquals("ietf-yang-types", monitoringImport.getModuleName()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java index 98e6656c3f..4b0d2086ad 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.hamcrest.CoreMatchers.anyOf; @@ -44,10 +43,10 @@ public class MustAndWhenStmtTest { assertNotNull(container); assertTrue(container.isPresenceContainer()); - final Collection musts = container.getMustConstraints(); + final Collection musts = container.getMustConstraints(); assertEquals(2, musts.size()); - final Iterator mustsIterator = musts.iterator(); + final Iterator mustsIterator = musts.iterator(); MustDefinition mustStmt = mustsIterator.next(); assertThat(mustStmt.getXpath().getOriginalString(), anyOf(is("ifType != 'ethernet' or (ifType = 'ethernet' and " + "ifMTU = 1500)"), is("ifType != 'atm' or (ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)"))); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java index 87f6356f1e..e8530efea9 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java @@ -5,14 +5,13 @@ * 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.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; @@ -35,7 +34,7 @@ public class NotificationStmtTest { final Module testModule = result.findModules("baz").iterator().next(); assertNotNull(testModule); - final Set notifications = testModule.getNotifications(); + final Collection notifications = testModule.getNotifications(); assertEquals(1, notifications.size()); final NotificationDefinition notification = notifications.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java index 9b44d3b33b..c29b5d55eb 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertNotNull; import java.io.IOException; import java.net.URISyntaxException; import java.util.Collection; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -45,7 +44,7 @@ public class OrderingTest { @Test public void testOrderingTypedef() throws Exception { - final Set> typedefs = bar.getTypeDefinitions(); + final Collection> typedefs = bar.getTypeDefinitions(); final String[] expectedOrder = { "int32-ext1", "int32-ext2", "string-ext1", "string-ext2", "string-ext3", "string-ext4", "invalid-string-pattern", "multiple-pattern-string", "my-decimal-type", "my-union", "my-union-ext", "nested-union2" @@ -85,7 +84,7 @@ public class OrderingTest { @Test public void testOrderingNestedChildNodes1() throws Exception { - final Collection childNodes = foo.getChildNodes(); + final Collection childNodes = foo.getChildNodes(); final String[] expectedOrder = { "int32-leaf", "string-leaf", "invalid-pattern-string-leaf", "invalid-direct-string-pattern-def-leaf", "multiple-pattern-string-leaf", "multiple-pattern-direct-string-def-leaf", "length-leaf", "decimal-leaf", "decimal-leaf2", "ext", @@ -104,11 +103,11 @@ public class OrderingTest { @Test public void testOrderingNestedChildNodes2() throws Exception { - final Set groupings = baz.getGroupings(); + final Collection groupings = baz.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition target = groupings.iterator().next(); - final Collection childNodes = target.getChildNodes(); + final Collection childNodes = target.getChildNodes(); final String[] expectedOrder = { "data", "how", "address", "port", "addresses" }; final String[] actualOrder = new String[childNodes.size()]; @@ -126,7 +125,7 @@ public class OrderingTest { .getModules().iterator().next(); final ContainerSchemaNode x = (ContainerSchemaNode) justFoo .getDataChildByName(QName.create(justFoo.getQNameModule(), "x")); - final Collection childNodes = x.getChildNodes(); + final Collection childNodes = x.getChildNodes(); final String[] expectedOrder = { "x15", "x10", "x5", "x1", "a5", "a1", "x2", "b5", "b1", "x3", "ax15", "ax5" }; final String[] actualOrder = new String[childNodes.size()]; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java index 0458bf3b77..4ff7eb1298 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; @@ -65,7 +65,7 @@ public class RpcStmtTest { assertNotNull(anyXml); final Module fooModule = result.findModule("foo", Revision.of("2016-09-23")).get(); - final Set rpcs = fooModule.getRpcs(); + final Collection rpcs = fooModule.getRpcs(); assertEquals(2, rpcs.size()); RpcDefinition fooRpc1 = null; @@ -103,7 +103,7 @@ public class RpcStmtTest { assertNotNull(schemaContext); final Module barModule = schemaContext.findModule("bar", Revision.of("2016-11-25")).get(); - final Set rpcs = barModule.getRpcs(); + final Collection rpcs = barModule.getRpcs(); assertEquals(1, rpcs.size()); final RpcDefinition barRpc = rpcs.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java index b2042cfd2a..0b5b6a4f58 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java @@ -5,7 +5,6 @@ * 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.stmt; import com.google.common.io.Files; @@ -65,7 +64,7 @@ public final class StmtTestUtils { } } - public static List findModules(final Set modules, final String moduleName) { + public static List findModules(final Collection modules, final String moduleName) { final List result = new ArrayList<>(); for (final Module module : modules) { if (module.getName().equals(moduleName)) { @@ -84,15 +83,14 @@ public final class StmtTestUtils { } public static void printReferences(final Module module, final boolean isSubmodule, final String indent) { - LOG.debug("{}{} {}", indent, (isSubmodule ? "Submodule" : "Module"), module.getName()); - final Set submodules = module.getSubmodules(); - for (final Module submodule : submodules) { + LOG.debug("{}{} {}", indent, isSubmodule ? "Submodule" : "Module", module.getName()); + for (final Module submodule : module.getSubmodules()) { printReferences(submodule, true, indent + " "); printChilds(submodule.getChildNodes(), indent + " "); } } - public static void printChilds(final Collection childNodes, final String indent) { + public static void printChilds(final Collection childNodes, final String indent) { for (final DataSchemaNode child : childNodes) { LOG.debug("{}{} {}", indent, "Child", child.getQName().getLocalName()); @@ -257,8 +255,7 @@ public final class StmtTestUtils { public static Module findImportedModule(final SchemaContext context, final Module rootModule, final String importedModuleName) { ModuleImport requestedModuleImport = null; - final Set rootImports = rootModule.getImports(); - for (final ModuleImport moduleImport : rootImports) { + for (final ModuleImport moduleImport : rootModule.getImports()) { if (moduleImport.getModuleName().equals(importedModuleName)) { requestedModuleImport = moduleImport; break; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java index 21cb097921..3498fe561e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -16,7 +15,7 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; -import java.util.Set; +import java.util.Collection; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -80,8 +79,8 @@ public class SubstatementValidatorTest { @Test public void bug6173Test() throws Exception { - final Set loadModules = TestUtils.loadModules(getClass().getResource( - "/substatement-validator/empty-element").toURI()).getModules(); + final Collection loadModules = TestUtils.loadModules(getClass() + .getResource("/substatement-validator/empty-element").toURI()).getModules(); assertEquals(1, loadModules.size()); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java index 1f2ba43b3b..ec127b8a6c 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangConstants; @@ -100,30 +99,27 @@ public final class TestUtils { return ctx.getModules().iterator().next(); } - public static Optional findModule(final SchemaContext context, final String moduleName) { + public static Optional findModule(final SchemaContext context, final String moduleName) { return context.getModules().stream().filter(module -> moduleName.equals(module.getName())).findAny(); } - public static ModuleImport findImport(final Set imports, final String prefix) { - ModuleImport result = null; + public static ModuleImport findImport(final Collection imports, final String prefix) { for (ModuleImport moduleImport : imports) { if (moduleImport.getPrefix().equals(prefix)) { - result = moduleImport; - break; + return moduleImport; } } - return result; + return null; } - public static TypeDefinition findTypedef(final Set> typedefs, final String name) { - TypeDefinition result = null; + public static TypeDefinition findTypedef(final Collection> typedefs, + final String name) { for (TypeDefinition td : typedefs) { if (td.getQName().getLocalName().equals(name)) { - result = td; - break; + return td; } } - return result; + return null; } public static SchemaPath createPath(final boolean absolute, final QNameModule module, final String... names) { @@ -187,7 +183,7 @@ public final class TestUtils { } } - public static List findModules(final Set modules, final String moduleName) { + public static List findModules(final Collection modules, final String moduleName) { List result = new ArrayList<>(); for (Module module : modules) { if (module.getName().equals(moduleName)) { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java index cd1e068014..1a1eee60d5 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java @@ -9,17 +9,16 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; public class TwoRevisionsTest { - @Test public void testTwoRevisions() throws Exception { - Set modules = TestUtils.loadModules(getClass().getResource("/ietf").toURI()).getModules(); + Collection modules = TestUtils.loadModules(getClass().getResource("/ietf").toURI()) + .getModules(); //FIXME: following assert needs module revisions .equals() solution first assertEquals(2, TestUtils.findModules(modules, "network-topology").size()); } - } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java index 70e0c9e6f5..0d5921bef4 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java @@ -5,7 +5,6 @@ * 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.stmt; import static org.junit.Assert.assertEquals; @@ -15,6 +14,7 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.Range; import java.math.BigDecimal; +import java.util.Collection; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -33,7 +33,7 @@ public class TypedefConstraintsTest { assertNotNull(context); - final Set> typeDefinitions = context.getTypeDefinitions(); + final Collection> typeDefinitions = context.getTypeDefinitions(); assertNotNull(typeDefinitions); assertEquals(1, typeDefinitions.size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java index b967de0b7d..a4b722e7c4 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java @@ -5,15 +5,14 @@ * 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.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -29,7 +28,7 @@ public class TypedefSubStmtsTest { .buildEffective(); assertNotNull(result); - Set> typedefs = result.getTypeDefinitions(); + Collection> typedefs = result.getTypeDefinitions(); assertEquals(1, typedefs.size()); TypeDefinition typedef = typedefs.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java index 254b4ca8bc..ace5eebc1b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java @@ -17,9 +17,10 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour import com.google.common.collect.Iterables; import com.google.common.collect.Range; import java.net.URI; +import java.util.Collection; +import java.util.Iterator; import java.util.List; import java.util.Optional; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -63,7 +64,7 @@ public class TypesResolutionTest { @Test public void testIPVersion() { Module tested = TestUtils.findModule(context, "ietf-inet-types").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); assertEquals(14, typedefs.size()); TypeDefinition type = TestUtils.findTypedef(typedefs, "ip-version"); @@ -94,7 +95,7 @@ public class TypesResolutionTest { @Test public void testEnumeration() { Module tested = TestUtils.findModule(context, "custom-types-test").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); TypeDefinition type = TestUtils.findTypedef(typedefs, "ip-version"); EnumTypeDefinition enumType = (EnumTypeDefinition) type.getBaseType(); @@ -126,7 +127,7 @@ public class TypesResolutionTest { @Test public void testIpAddress() { Module tested = TestUtils.findModule(context, "ietf-inet-types").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); TypeDefinition type = TestUtils.findTypedef(typedefs, "ip-address"); UnionTypeDefinition baseType = (UnionTypeDefinition) type.getBaseType(); List> unionTypes = baseType.getTypes(); @@ -153,7 +154,7 @@ public class TypesResolutionTest { @Test public void testDomainName() { Module tested = TestUtils.findModule(context, "ietf-inet-types").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); StringTypeDefinition type = (StringTypeDefinition) TestUtils.findTypedef(typedefs, "domain-name"); assertNotNull(type.getBaseType()); List patterns = type.getPatternConstraints(); @@ -191,7 +192,7 @@ public class TypesResolutionTest { @Test public void testIdentity() { Module tested = TestUtils.findModule(context, "custom-types-test").get(); - Set identities = tested.getIdentities(); + Collection identities = tested.getIdentities(); assertEquals(5, identities.size()); IdentitySchemaNode cryptoAlg = null; IdentitySchemaNode cryptoBase = null; @@ -225,57 +226,59 @@ public class TypesResolutionTest { LeafSchemaNode leaf = (LeafSchemaNode) tested.getDataChildByName( QName.create(tested.getQNameModule(), "mybits")); BitsTypeDefinition leafType = (BitsTypeDefinition) leaf.getType(); - List bits = leafType.getBits(); - assertEquals(3, bits.size()); + Iterator bits = leafType.getBits().iterator(); - Bit bit1 = bits.get(0); + Bit bit1 = bits.next(); assertEquals("disable-nagle", bit1.getName()); assertEquals(0L, bit1.getPosition()); - Bit bit2 = bits.get(1); + Bit bit2 = bits.next(); assertEquals("auto-sense-speed", bit2.getName()); assertEquals(1L, bit2.getPosition()); - Bit bit3 = bits.get(2); + Bit bit3 = bits.next(); assertEquals("only-10-Mb", bit3.getName()); assertEquals(2L, bit3.getPosition()); + + assertFalse(bits.hasNext()); } @Test public void testBitsType2() { Module tested = TestUtils.findModule(context, "custom-types-test").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); TypeDefinition testedType = TestUtils.findTypedef(typedefs, "access-operations-type"); BitsTypeDefinition bitsType = (BitsTypeDefinition) testedType.getBaseType(); - List bits = bitsType.getBits(); - assertEquals(5, bits.size()); + Iterator bits = bitsType.getBits().iterator(); - Bit bit0 = bits.get(0); + Bit bit0 = bits.next(); assertEquals("create", bit0.getName()); assertEquals(0L, bit0.getPosition()); - Bit bit1 = bits.get(1); + Bit bit1 = bits.next(); assertEquals("delete", bit1.getName()); assertEquals(365L, bit1.getPosition()); - Bit bit2 = bits.get(2); + Bit bit2 = bits.next(); assertEquals("read", bit2.getName()); assertEquals(500L, bit2.getPosition()); - Bit bit3 = bits.get(3); + Bit bit3 = bits.next(); assertEquals("update", bit3.getName()); assertEquals(501L, bit3.getPosition()); - Bit bit4 = bits.get(4); + Bit bit4 = bits.next(); assertEquals("exec", bit4.getName()); assertEquals(502L, bit4.getPosition()); + + assertFalse(bits.hasNext()); } @Test public void testIanaTimezones() { Module tested = TestUtils.findModule(context, "iana-timezones").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); TypeDefinition testedType = TestUtils.findTypedef(typedefs, "iana-timezone"); String expectedDesc = "A timezone location as defined by the IANA timezone"; @@ -307,7 +310,7 @@ public class TypesResolutionTest { @Test public void testObjectId128() { Module tested = TestUtils.findModule(context, "ietf-yang-types").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); StringTypeDefinition testedType = (StringTypeDefinition) TestUtils.findTypedef(typedefs, "object-identifier-128"); @@ -338,7 +341,7 @@ public class TypesResolutionTest { @Test public void testIdentityref() { Module tested = TestUtils.findModule(context, "custom-types-test").get(); - Set> typedefs = tested.getTypeDefinitions(); + Collection> typedefs = tested.getTypeDefinitions(); TypeDefinition testedType = TestUtils.findTypedef(typedefs, "service-type-ref"); IdentityrefTypeDefinition baseType = (IdentityrefTypeDefinition) testedType.getBaseType(); QName identity = baseType.getIdentities().iterator().next().getQName(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java index a0a9c59068..2888a67a3a 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java @@ -18,7 +18,6 @@ import java.net.URISyntaxException; import java.util.ArrayDeque; import java.util.Collection; import java.util.Deque; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -117,7 +116,7 @@ public class UsesAugmentTest { final Deque path = new ArrayDeque<>(); // * notification pcreq - final Set notifications = testModule.getNotifications(); + final Collection notifications = testModule.getNotifications(); assertEquals(1, notifications.size()); final NotificationDefinition pcreq = notifications.iterator().next(); assertNotNull(pcreq); @@ -125,7 +124,7 @@ public class UsesAugmentTest { path.offer(expectedQName); SchemaPath expectedPath = SchemaPath.create(path, true); assertEquals(expectedPath, pcreq.getPath()); - Collection childNodes = pcreq.getChildNodes(); + Collection childNodes = pcreq.getChildNodes(); assertEquals(4, childNodes.size()); // * |-- leaf version LeafSchemaNode version = (LeafSchemaNode) pcreq.getDataChildByName(QName.create(testModule.getQNameModule(), @@ -642,7 +641,7 @@ public class UsesAugmentTest { @Test public void testTypedefs() throws Exception { final Module testModule = TestUtils.findModule(context, "grouping-definitions").get(); - final Set> types = testModule.getTypeDefinitions(); + final Collection> types = testModule.getTypeDefinitions(); TypeDefinition intExt = null; for (final TypeDefinition td : types) { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java index 4b2d78add2..1da4672592 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java @@ -5,14 +5,13 @@ * 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.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import java.io.IOException; -import java.util.Set; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.ModuleImport; @@ -50,7 +49,7 @@ public class YangParserIdentityTest { public void testParsingImportPrefixIdentityTestModule() throws Exception { Module module = TestUtils.findModule(TestUtils.loadModules(getClass().getResource("/identity/import").toURI()), "prefiximportidentitytest").get(); - Set imports = module.getImports(); + Collection imports = module.getImports(); assertEquals(imports.size(), 1); ModuleImport dummy = TestUtils.findImport(imports, "dummy"); assertNotEquals(dummy.getPrefix(), module.getPrefix()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java index 328ac01b3d..4a70b3b248 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -74,7 +73,7 @@ public class YangParserSimpleTest { assertTrue(data.isMandatory()); assertEquals("class != 'wheel'", data.getWhenCondition().get().getOriginalString()); - final Collection mustConstraints = data.getMustConstraints(); + final Collection mustConstraints = data.getMustConstraints(); assertEquals(2, mustConstraints.size()); final String must1 = "ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)"; @@ -121,7 +120,7 @@ public class YangParserSimpleTest { assertTrue(anydata.isMandatory()); assertTrue(anydata.getWhenCondition().isPresent()); assertEquals("class != 'wheel'", anydata.getWhenCondition().get().getOriginalString()); - final Collection mustConstraints = anydata.getMustConstraints(); + final Collection mustConstraints = anydata.getMustConstraints(); assertEquals(2, mustConstraints.size()); final String must1 = "ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)"; @@ -162,7 +161,7 @@ public class YangParserSimpleTest { // constraints assertEquals("class != 'wheel'", nodes.getWhenCondition().get().getOriginalString()); - final Collection mustConstraints = nodes.getMustConstraints(); + final Collection mustConstraints = nodes.getMustConstraints(); assertEquals(2, mustConstraints.size()); final String must1 = "ifType != 'atm' or (ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)"; @@ -189,7 +188,7 @@ public class YangParserSimpleTest { assertTrue(nodes.isPresenceContainer()); // typedef - final Set> typedefs = nodes.getTypeDefinitions(); + final Collection> typedefs = nodes.getTypeDefinitions(); assertEquals(1, typedefs.size()); final TypeDefinition nodesType = typedefs.iterator().next(); final QName typedefQName = QName.create(SN, "nodes-type"); @@ -212,7 +211,7 @@ public class YangParserSimpleTest { testModule.getQNameModule(), "links")); assertFalse(links.isUserOrdered()); - final Set groupings = nodes.getGroupings(); + final Collection groupings = nodes.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition nodeGroup = groupings.iterator().next(); final QName groupQName = QName.create(SN, "node-group"); @@ -220,7 +219,7 @@ public class YangParserSimpleTest { final SchemaPath nodeGroupPath = SN_NODES_PATH.createChild(groupQName); assertEquals(nodeGroupPath, nodeGroup.getPath()); - final Set uses = nodes.getUses(); + final Collection uses = nodes.getUses(); assertEquals(1, uses.size()); final UsesNode use = uses.iterator().next(); assertEquals(nodeGroupPath, use.getGroupingPath()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java index 44e219c129..b110164a15 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java @@ -99,7 +99,7 @@ public class YangParserTest { assertEquals(FOO.getNamespace(), foo.getNamespace()); assertEquals("foo", foo.getPrefix()); - final Set imports = foo.getImports(); + final Collection imports = foo.getImports(); assertEquals(2, imports.size()); final ModuleImport import2 = TestUtils.findImport(imports, "br"); @@ -143,7 +143,7 @@ public class YangParserTest { assertEquals(1, constraints.getMinElements().intValue()); assertEquals(11, constraints.getMaxElements().intValue()); // test AugmentationTarget args - final Set availableAugmentations = ifEntry.getAvailableAugmentations(); + final Collection availableAugmentations = ifEntry.getAvailableAugmentations(); assertEquals(2, availableAugmentations.size()); // test ListSchemaNode args final List expectedKey = new ArrayList<>(); @@ -543,7 +543,7 @@ public class YangParserTest { @Test public void testDeviation() { - final Set deviations = foo.getDeviations(); + final Collection deviations = foo.getDeviations(); assertEquals(1, deviations.size()); final Deviation dev = deviations.iterator().next(); assertEquals(Optional.of("system/user ref"), dev.getReference()); @@ -560,24 +560,24 @@ public class YangParserTest { public void testUnknownNode() { final ContainerSchemaNode network = (ContainerSchemaNode) baz.getDataChildByName( QName.create(baz.getQNameModule(), "network")); - final List unknownNodes = network.getUnknownSchemaNodes(); + final Collection unknownNodes = network.getUnknownSchemaNodes(); assertEquals(1, unknownNodes.size()); - final UnknownSchemaNode unknownNode = unknownNodes.get(0); + final UnknownSchemaNode unknownNode = unknownNodes.iterator().next(); assertNotNull(unknownNode.getNodeType()); assertEquals("point", unknownNode.getNodeParameter()); } @Test public void testFeature() { - final Set features = baz.getFeatures(); + final Collection features = baz.getFeatures(); assertEquals(3, features.size()); } @Test public void testExtension() { - final List extensions = baz.getExtensionSchemaNodes(); + final Collection extensions = baz.getExtensionSchemaNodes(); assertEquals(1, extensions.size()); - final ExtensionDefinition extension = extensions.get(0); + final ExtensionDefinition extension = extensions.iterator().next(); assertEquals("name", extension.getArgument()); assertEquals( Optional.of("Takes as argument a name string. Makes the code generator use the given name in the #define."), @@ -587,7 +587,7 @@ public class YangParserTest { @Test public void testNotification() { - final Set notifications = baz.getNotifications(); + final Collection notifications = baz.getNotifications(); assertEquals(1, notifications.size()); final NotificationDefinition notification = notifications.iterator().next(); @@ -615,7 +615,7 @@ public class YangParserTest { @Test public void testRpc() { - final Set rpcs = baz.getRpcs(); + final Collection rpcs = baz.getRpcs(); assertEquals(1, rpcs.size()); final RpcDefinition rpc = rpcs.iterator().next(); @@ -625,7 +625,7 @@ public class YangParserTest { @Test public void testTypePath() throws ParseException { - final Set> types = bar.getTypeDefinitions(); + final Collection> types = bar.getTypeDefinitions(); // int32-ext1 final Int32TypeDefinition int32ext1 = (Int32TypeDefinition) TestUtils.findTypedef(types, "int32-ext1"); @@ -645,7 +645,7 @@ public class YangParserTest { @Test public void testTypePath2() throws ParseException { - final Set> types = bar.getTypeDefinitions(); + final Collection> types = bar.getTypeDefinitions(); // my-decimal-type final DecimalTypeDefinition myDecType = (DecimalTypeDefinition) TestUtils.findTypedef(types, "my-decimal-type"); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java index 259aa1d25c..7752047fad 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java @@ -113,7 +113,7 @@ public class YangParserWithContextTest { final Module testModule = context.findModule("test2", Revision.of("2013-06-18")).get(); final Module contextModule = context.findModules(URI.create("urn:opendaylight.baz")).iterator().next(); assertNotNull(contextModule); - final Set groupings = contextModule.getGroupings(); + final Collection groupings = contextModule.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition grouping = groupings.iterator().next(); @@ -124,7 +124,7 @@ public class YangParserWithContextTest { testModule.getQNameModule(), "destination")); // check uses - final Set uses = destination.getUses(); + final Collection uses = destination.getUses(); assertEquals(1, uses.size()); // check uses process @@ -184,26 +184,26 @@ public class YangParserWithContextTest { assertFalse(addresses_u.equals(addresses_g)); // grouping defined by 'uses' - final Set groupings_u = destination.getGroupings(); + final Collection groupings_u = destination.getGroupings(); assertEquals(1, groupings_u.size()); final GroupingDefinition grouping_u = groupings_u.iterator().next(); assertTrue(grouping_u.isAddedByUses()); // grouping defined in 'grouping' node - final Set groupings_g = grouping.getGroupings(); + final Collection groupings_g = grouping.getGroupings(); assertEquals(1, groupings_g.size()); final GroupingDefinition grouping_g = groupings_g.iterator().next(); assertFalse(grouping_g.isAddedByUses()); assertFalse(grouping_u.equals(grouping_g)); - final List nodes_u = destination.getUnknownSchemaNodes(); + final Collection nodes_u = destination.getUnknownSchemaNodes(); assertEquals(1, nodes_u.size()); - final UnknownSchemaNode node_u = nodes_u.get(0); + final UnknownSchemaNode node_u = nodes_u.iterator().next(); assertTrue(node_u.isAddedByUses()); - final List nodes_g = grouping.getUnknownSchemaNodes(); + final Collection nodes_g = grouping.getUnknownSchemaNodes(); assertEquals(1, nodes_g.size()); - final UnknownSchemaNode node_g = nodes_g.get(0); + final UnknownSchemaNode node_g = nodes_g.iterator().next(); assertFalse(node_g.isAddedByUses()); assertFalse(node_u.equals(node_g)); } @@ -219,7 +219,7 @@ public class YangParserWithContextTest { module.getQNameModule(), "peer")); final ContainerSchemaNode destination = (ContainerSchemaNode) peer.getDataChildByName(QName.create( module.getQNameModule(), "destination")); - final Set usesNodes = destination.getUses(); + final Collection usesNodes = destination.getUses(); assertEquals(1, usesNodes.size()); final UsesNode usesNode = usesNodes.iterator().next(); @@ -255,14 +255,14 @@ public class YangParserWithContextTest { assertEquals(Optional.of("address reference added by refine"), refineLeaf.getReference()); assertFalse(refineLeaf.isConfiguration()); assertTrue(refineLeaf.isMandatory()); - final Collection leafMustConstraints = refineLeaf.getMustConstraints(); + final Collection leafMustConstraints = refineLeaf.getMustConstraints(); assertEquals(1, leafMustConstraints.size()); final MustDefinition leafMust = leafMustConstraints.iterator().next(); assertEquals("ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)", leafMust.toString()); // container port assertNotNull(refineContainer); - final Collection mustConstraints = refineContainer.getMustConstraints(); + final Collection mustConstraints = refineContainer.getMustConstraints(); assertTrue(mustConstraints.isEmpty()); assertEquals(Optional.of("description of port defined by refine"), refineContainer.getDescription()); assertEquals(Optional.of("port reference added by refine"), refineContainer.getReference()); @@ -288,7 +288,7 @@ public class YangParserWithContextTest { .buildEffective(); final Module module = context.findModule("test3", Revision.of("2013-06-18")).get(); - final Set identities = module.getIdentities(); + final Collection identities = module.getIdentities(); assertEquals(1, identities.size()); final IdentitySchemaNode identity = identities.iterator().next(); @@ -315,10 +315,10 @@ public class YangParserWithContextTest { final Module module = context.findModule("test3", Revision.of("2013-06-18")).get(); final ContainerSchemaNode network = (ContainerSchemaNode) module.getDataChildByName(QName.create( module.getQNameModule(), "network")); - final List unknownNodes = network.getUnknownSchemaNodes(); + final Collection unknownNodes = network.getUnknownSchemaNodes(); assertEquals(1, unknownNodes.size()); - final UnknownSchemaNode un = unknownNodes.get(0); + final UnknownSchemaNode un = unknownNodes.iterator().next(); final QName unType = un.getNodeType(); assertEquals(URI.create("urn:custom.types.demo"), unType.getNamespace()); assertEquals(Revision.ofNullable("2012-04-16"), unType.getRevision()); @@ -371,7 +371,7 @@ public class YangParserWithContextTest { .buildEffective(); final Module testModule = context.findModule("deviation-test", Revision.of("2013-02-27")).get(); - final Set deviations = testModule.getDeviations(); + final Collection deviations = testModule.getDeviations(); assertEquals(1, deviations.size()); final Deviation dev = deviations.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java index a26f0027c8..7359edb52a 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.net.URI; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.model.api.Module; @@ -82,8 +81,7 @@ public class OpenconfigVersionMultipleImportTest { private static Module findImportedModule(final SchemaContext context, final Module rootModule, final String importedModuleName) { ModuleImport requestedModuleImport = null; - Set rootImports = rootModule.getImports(); - for (ModuleImport moduleImport : rootImports) { + for (ModuleImport moduleImport : rootModule.getImports()) { if (moduleImport.getModuleName().equals(importedModuleName)) { requestedModuleImport = moduleImport; break; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java index c842887960..8843256b56 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; @@ -30,10 +30,10 @@ public class YinFileAugmentStmtTest extends AbstractYinModulesTest { final Module testModule = TestUtils.findModule(context, "main-impl").get(); assertNotNull(testModule); - final Set augmentations = testModule.getAugmentations(); + final Collection augmentations = testModule.getAugmentations(); assertEquals(1, augmentations.size()); - final Iterator augmentIterator = augmentations.iterator(); + final Iterator augmentIterator = augmentations.iterator(); final AugmentationSchemaNode augment = augmentIterator.next(); assertNotNull(augment); assertTrue(augment.getTargetPath().toString().contains( diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java index 7a57d5cd19..cdd573ffb6 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import java.util.Collection; import java.util.Iterator; -import java.util.List; import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; @@ -26,10 +26,10 @@ public class YinFileExtensionStmtTest extends AbstractYinModulesTest { Module testModule = TestUtils.findModule(context, "config").get(); assertNotNull(testModule); - List extensions = testModule.getExtensionSchemaNodes(); + Collection extensions = testModule.getExtensionSchemaNodes(); assertEquals(5, extensions.size()); - Iterator extIterator = extensions.iterator(); + Iterator extIterator = extensions.iterator(); ExtensionDefinition extension = extIterator.next(); assertEquals("name", extension.getArgument()); assertEquals("java-class", extension.getQName().getLocalName()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java index b3c8ce9504..3219ec2515 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertThat; import java.io.IOException; import java.net.URISyntaxException; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.FeatureDefinition; @@ -42,10 +42,10 @@ public class YinFileFeatureStmtTest { Module testModule = TestUtils.findModule(context, "yang-with-features").get(); assertNotNull(testModule); - Set features = testModule.getFeatures(); + Collection features = testModule.getFeatures(); assertEquals(2, features.size()); - Iterator featuresIterator = features.iterator(); + Iterator featuresIterator = features.iterator(); FeatureDefinition feature = featuresIterator.next(); assertThat(feature.getQName().getLocalName(), anyOf(is("arbitrary-names"), is("pre-provisioning"))); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java index 0b23496c55..d405e2bc97 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java @@ -15,7 +15,6 @@ import java.net.URISyntaxException; import java.util.Collection; import java.util.Iterator; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -31,10 +30,10 @@ public class YinFileGroupingStmtTest extends AbstractYinModulesTest { final Module testModule = TestUtils.findModule(context, "config").get(); assertNotNull(testModule); - final Set groupings = testModule.getGroupings(); + final Collection groupings = testModule.getGroupings(); assertEquals(1, groupings.size()); - final Iterator groupingsIterator = groupings.iterator(); + final Iterator groupingsIterator = groupings.iterator(); final GroupingDefinition grouping = groupingsIterator.next(); assertEquals("service-ref", grouping.getQName().getLocalName()); assertEquals(Optional.of("Type of references to a particular service instance. This type\n" @@ -44,7 +43,7 @@ public class YinFileGroupingStmtTest extends AbstractYinModulesTest { + "is expected to inject a reference to the service as the value\n" + "of the container."), grouping.getDescription()); - final Collection children = grouping.getChildNodes(); + final Collection children = grouping.getChildNodes(); assertEquals(2, children.size()); final LeafSchemaNode leaf1 = (LeafSchemaNode) grouping.findDataChildByName(QName.create( diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java index a4a1900144..4ec4a7529d 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.net.URISyntaxException; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -29,10 +29,10 @@ public class YinFileIdentityStmtTest extends AbstractYinModulesTest { Module testModule = TestUtils.findModule(context, "config").get(); assertNotNull(testModule); - Set identities = testModule.getIdentities(); + Collection identities = testModule.getIdentities(); assertEquals(2, identities.size()); - Iterator idIterator = identities.iterator(); + Iterator idIterator = identities.iterator(); IdentitySchemaNode id = idIterator.next(); assertThat(id.getQName().getLocalName(), anyOf(is("module-type"), is("service-type"))); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java index abacb5a5dd..34edf8a71d 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java @@ -14,8 +14,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import java.text.ParseException; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.ModuleImport; @@ -28,10 +28,10 @@ public class YinFileImportStmtTest extends AbstractYinModulesTest { Module testModule = TestUtils.findModule(context, "ietf-netconf-monitoring").get(); assertNotNull(testModule); - Set imports = testModule.getImports(); + Collection imports = testModule.getImports(); assertEquals(2, imports.size()); - Iterator importsIterator = imports.iterator(); + Iterator importsIterator = imports.iterator(); ModuleImport moduleImport = importsIterator.next(); assertThat(moduleImport.getModuleName(), anyOf(is("ietf-yang-types"), is("ietf-inet-types"))); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java index ee69341eb1..c2cd1fb8f7 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java @@ -39,7 +39,7 @@ public class YinFileIncludeStmtTest { assertNotNull(parentModule); assertEquals(1, parentModule.getSubmodules().size()); - Iterator submodulesIterator = parentModule.getSubmodules().iterator(); + Iterator submodulesIterator = parentModule.getSubmodules().iterator(); Module childModule = submodulesIterator.next() ; assertNotNull(childModule); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java index 45e941fd0f..1bddb05583 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java @@ -40,10 +40,10 @@ public class YinFileListStmtTest extends AbstractYinModulesTest { assertEquals(1, keys.size()); assertEquals("name", keys.get(0).getLocalName()); - final Collection children = list.getChildNodes(); + final Collection children = list.getChildNodes(); assertEquals(4, children.size()); - final Iterator childrenIterator = children.iterator(); + final Iterator childrenIterator = children.iterator(); LeafSchemaNode leaf = (LeafSchemaNode) childrenIterator.next(); assertEquals("name", leaf.getQName().getLocalName()); assertEquals(Optional.of("Unique module instance name"), leaf.getDescription()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java index 86884f45f4..56493db97e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.stmt.yin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.util.Collection; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -24,7 +24,7 @@ public class YinFileRpcStmtTest extends AbstractYinModulesTest { public void testRpc() { Module testModule = TestUtils.findModule(context, "ietf-netconf-monitoring").get(); - Set rpcs = testModule.getRpcs(); + Collection rpcs = testModule.getRpcs(); assertEquals(1, rpcs.size()); RpcDefinition rpc = rpcs.iterator().next(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java index 0faec82721..f23d9075b2 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java @@ -10,25 +10,24 @@ package org.opendaylight.yangtools.yang.stmt.yin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.util.Collection; import java.util.Iterator; import java.util.Optional; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.stmt.TestUtils; public class YinFileTypeDefStmtTest extends AbstractYinModulesTest { - @Test public void testTypedef() { Module testModule = TestUtils.findModule(context, "config").get(); assertNotNull(testModule); - Set> typeDefs = testModule.getTypeDefinitions(); + Collection> typeDefs = testModule.getTypeDefinitions(); assertEquals(1, typeDefs.size()); - Iterator> typeDefIterator = typeDefs.iterator(); + Iterator> typeDefIterator = typeDefs.iterator(); TypeDefinition typeDef = typeDefIterator.next(); assertEquals("service-type-ref", typeDef.getQName().getLocalName()); assertEquals(Optional.of("Internal type of references to service type identity."), typeDef.getDescription()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java index 40d705529f..370ec9e039 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; +import java.util.Collection; import java.util.Iterator; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; @@ -28,10 +28,10 @@ public class YinFileUsesStmtTest extends AbstractYinModulesTest { public void testUses() { final Module testModule = TestUtils.findModule(context, "main-impl").get(); - final Set augmentations = testModule.getAugmentations(); + final Collection augmentations = testModule.getAugmentations(); assertEquals(1, augmentations.size()); - final Iterator augmentIterator = augmentations.iterator(); + final Iterator augmentIterator = augmentations.iterator(); final AugmentationSchemaNode augment = augmentIterator.next(); final ContainerSchemaNode container = (ContainerSchemaNode) augment.findDataChildByName( diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java index bd756fc152..eaad694566 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertThat; import java.io.IOException; import java.net.URISyntaxException; -import java.util.List; +import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -41,10 +41,10 @@ public class ThirdPartyExtensionPluginTest { final ContainerSchemaNode root = (ContainerSchemaNode) dataChildByName; - final List unknownSchemaNodes = root.getUnknownSchemaNodes(); + final Collection unknownSchemaNodes = root.getUnknownSchemaNodes(); assertEquals(1, unknownSchemaNodes.size()); - final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.get(0); + final UnknownSchemaNode unknownSchemaNode = unknownSchemaNodes.iterator().next(); assertThat(unknownSchemaNode, isA(ThirdPartyExtensionEffectiveStatement.class)); final ThirdPartyExtensionEffectiveStatement thirdPartyExtensionStmt = (ThirdPartyExtensionEffectiveStatement) unknownSchemaNode;