X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=model%2Fyang-model-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FSchemaContextProxyTest.java;h=839ea2cb3888c287d5980dd9e72d3c9e28527385;hb=bf25c16c89625837be48ee685184707339f487ff;hp=ab75d70bec2f9d6d80861cc427fd456004b53395;hpb=b67b827e357ae40ae26e4bfec35b76ef5ee67967;p=yangtools.git

diff --git a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java
index ab75d70bec..839ea2cb38 100644
--- a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java
+++ b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java
@@ -17,16 +17,15 @@ 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;
 import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
-import org.opendaylight.yangtools.concepts.SemVer;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -369,8 +368,8 @@ public class SchemaContextProxyTest {
 
         SchemaContext schemaContext = mockSchema(module2, module3, module4, module5);
 
-        FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                Collections.singleton(module2), null);
+        FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(module2),
+            null);
         assertProxyContext(filteringSchemaContextProxy, module2, module3, module4, module5);
     }
 
@@ -397,8 +396,8 @@ public class SchemaContextProxyTest {
 
         SchemaContext schemaContext = mockSchema(moduleConfig, module2, module3, module4, module5);
 
-        FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-            Collections.singleton(module3), moduleConfig);
+        FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(module3),
+            moduleConfig);
         assertProxyContext(filteringSchemaContextProxy, moduleConfig, module2, module3, module4);
     }
 
@@ -406,15 +405,13 @@ public class SchemaContextProxyTest {
     public void testGetDataDefinitions() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final ContainerSchemaNode mockedContainer = mock(ContainerSchemaNode.class);
-        final Set<DataSchemaNode> childNodes = Collections.singleton(mockedContainer);
-        doReturn(childNodes).when(moduleConfig).getChildNodes();
+        doReturn(Set.of(mockedContainer)).when(moduleConfig).getChildNodes();
 
-        final Collection<? extends DataSchemaNode> dataDefinitions =
-                filteringSchemaContextProxy.getDataDefinitions();
+        final Collection<? extends DataSchemaNode> dataDefinitions = filteringSchemaContextProxy.getDataDefinitions();
         assertTrue(dataDefinitions.contains(mockedContainer));
     }
 
@@ -422,12 +419,11 @@ public class SchemaContextProxyTest {
     public void testGetNotifications() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final NotificationDefinition mockedNotification = mock(NotificationDefinition.class);
-        final Set<NotificationDefinition> notifications = Collections.singleton(mockedNotification);
-        doReturn(notifications).when(moduleConfig).getNotifications();
+        doReturn(Set.of(mockedNotification)).when(moduleConfig).getNotifications();
 
         final Collection<? extends NotificationDefinition> schemaContextProxyNotifications =
             filteringSchemaContextProxy.getNotifications();
@@ -438,12 +434,11 @@ public class SchemaContextProxyTest {
     public void testGetOperations() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final RpcDefinition mockedRpc = mock(RpcDefinition.class);
-        final Set<RpcDefinition> rpcs = Collections.singleton(mockedRpc);
-        doReturn(rpcs).when(moduleConfig).getRpcs();
+        doReturn(Set.of(mockedRpc)).when(moduleConfig).getRpcs();
 
         final Collection<? extends RpcDefinition> operations = filteringSchemaContextProxy.getOperations();
         assertTrue(operations.contains(mockedRpc));
@@ -453,12 +448,11 @@ public class SchemaContextProxyTest {
     public void testGetExtensions() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final ExtensionDefinition mockedExtension = mock(ExtensionDefinition.class);
-        final List<ExtensionDefinition> extensions = Collections.singletonList(mockedExtension);
-        doReturn(extensions).when(moduleConfig).getExtensionSchemaNodes();
+        doReturn(List.of(mockedExtension)).when(moduleConfig).getExtensionSchemaNodes();
 
         final Collection<? extends ExtensionDefinition> schemaContextProxyExtensions =
                 filteringSchemaContextProxy.getExtensions();
@@ -469,12 +463,11 @@ public class SchemaContextProxyTest {
     public void testGetUnknownSchemaNodes() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final UnknownSchemaNode mockedUnknownSchemaNode = mock(UnknownSchemaNode.class);
-        final List<UnknownSchemaNode> unknownSchemaNodes = Collections.singletonList(mockedUnknownSchemaNode);
-        doReturn(unknownSchemaNodes).when(moduleConfig).getUnknownSchemaNodes();
+        doReturn(List.of(mockedUnknownSchemaNode)).when(moduleConfig).getUnknownSchemaNodes();
 
         final Collection<? extends UnknownSchemaNode> schemaContextProxyUnknownSchemaNodes =
                 filteringSchemaContextProxy.getUnknownSchemaNodes();
@@ -485,12 +478,11 @@ public class SchemaContextProxyTest {
     public void testGetTypeDefinitions() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final TypeDefinition<?> mockedTypeDefinition = mock(TypeDefinition.class);
-        final Set<TypeDefinition<?>> typeDefinitions = Collections.singleton(mockedTypeDefinition);
-        doReturn(typeDefinitions).when(moduleConfig).getTypeDefinitions();
+        doReturn(Set.of(mockedTypeDefinition)).when(moduleConfig).getTypeDefinitions();
 
         final Collection<? extends TypeDefinition<?>> schemaContextProxyTypeDefinitions = filteringSchemaContextProxy
             .getTypeDefinitions();
@@ -501,12 +493,11 @@ public class SchemaContextProxyTest {
     public void testGetChildNodes() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final ContainerSchemaNode mockedContainer = mock(ContainerSchemaNode.class);
-        final Set<DataSchemaNode> childNodes = Collections.singleton(mockedContainer);
-        doReturn(childNodes).when(moduleConfig).getChildNodes();
+        doReturn(Set.of(mockedContainer)).when(moduleConfig).getChildNodes();
 
         final Collection<? extends DataSchemaNode> schemaContextProxyChildNodes =
                 filteringSchemaContextProxy.getChildNodes();
@@ -517,12 +508,11 @@ public class SchemaContextProxyTest {
     public void testGetGroupings() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final GroupingDefinition mockedGrouping = mock(GroupingDefinition.class);
-        final Set<GroupingDefinition> groupings = Collections.singleton(mockedGrouping);
-        doReturn(groupings).when(moduleConfig).getGroupings();
+        doReturn(Set.of(mockedGrouping)).when(moduleConfig).getGroupings();
 
         final Collection<? extends GroupingDefinition> schemaContextProxyGroupings =
                 filteringSchemaContextProxy.getGroupings();
@@ -533,8 +523,8 @@ public class SchemaContextProxyTest {
     public void testGetDataChildByName() {
         final Module moduleConfig = mockModule(CONFIG_NAME);
         final SchemaContext schemaContext = mockSchema(moduleConfig);
-        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext,
-                new HashSet<>(), moduleConfig);
+        final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(),
+            moduleConfig);
 
         final QName qname = QName.create("config-namespace", "2016-08-11", "cont");
         final ContainerSchemaNode mockedContainer = mock(ContainerSchemaNode.class);
@@ -547,7 +537,7 @@ public class SchemaContextProxyTest {
     private static void assertProxyContext(final FilteringSchemaContextProxy filteringSchemaContextProxy,
             final Module... expected) {
 
-        final Set<Module> modSet = expected != null ? ImmutableSet.copyOf(expected) : new HashSet<>();
+        final Set<Module> modSet = expected != null ? ImmutableSet.copyOf(expected) : Set.of();
         Set<Module> modSetFiltering = filteringSchemaContextProxy.getModules();
 
         assertEquals(modSet, modSetFiltering);
@@ -568,11 +558,7 @@ public class SchemaContextProxyTest {
 
     private static FilteringSchemaContextProxy createProxySchemaCtx(final SchemaContext schemaContext,
             final Set<Module> additionalModules, final Module... modules) {
-        Set<Module> modulesSet = new HashSet<>();
-        if (modules != null) {
-            modulesSet = ImmutableSet.copyOf(modules);
-        }
-
+        Set<Module> modulesSet = modules != null ? ImmutableSet.copyOf(modules) : Set.of();
         return new FilteringSchemaContextProxy(schemaContext, createModuleIds(modulesSet),
                 createModuleIds(additionalModules));
     }
@@ -589,10 +575,7 @@ public class SchemaContextProxyTest {
     }
 
     private static void mockSubmodules(final Module mainModule, final Submodule... submodules) {
-        Set<Submodule> submodulesSet = new HashSet<>();
-        submodulesSet.addAll(Arrays.asList(submodules));
-
-        doReturn(submodulesSet).when(mainModule).getSubmodules();
+        doReturn(Set.of(submodules)).when(mainModule).getSubmodules();
     }
 
     private static void mockModuleImport(final ModuleLike importer, final Module... imports) {
@@ -600,8 +583,8 @@ public class SchemaContextProxyTest {
         for (final Module module : imports) {
             mockedImports.add(new ModuleImport() {
                 @Override
-                public String getModuleName() {
-                    return module.getName();
+                public Unqualified getModuleName() {
+                    return Unqualified.of(module.getName());
                 }
 
                 @Override
@@ -614,11 +597,6 @@ public class SchemaContextProxyTest {
                     return module.getName();
                 }
 
-                @Override
-                public Optional<SemVer> getSemanticVersion() {
-                    return module.getSemanticVersion();
-                }
-
                 @Override
                 public Optional<String> getDescription() {
                     return module.getDescription();
@@ -674,7 +652,7 @@ public class SchemaContextProxyTest {
         final XMLNamespace newNamespace = XMLNamespace.of(NAMESPACE.toString() + ":" + name);
         doReturn(newNamespace).when(mockedModule).getNamespace();
         doReturn(QNameModule.create(newNamespace, REVISION)).when(mockedModule).getQNameModule();
-        doReturn(new HashSet<>()).when(mockedModule).getSubmodules();
+        doReturn(Set.of()).when(mockedModule).getSubmodules();
         doReturn(mockedModule.getQNameModule().toString()).when(mockedModule).toString();
         mockModuleImport(mockedModule);
     }