Update MRI projects for Aluminium

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / DummyMonitoringService.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java
index 973a059586f171b8c7e2d977ae97f8f4088bfde2..eef17df333e6d0ae13bc6aa9ac2e0c3211cc9163 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java
@@ -10,13 +10,12 @@ package org.opendaylight.netconf.test.tool;
 import com.google.common.base.Function;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.NetconfManagementSession;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
@@ -38,25 +37,19 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 
 public class DummyMonitoringService implements NetconfMonitoringService {
 
-    private static final Sessions EMPTY_SESSIONS = new SessionsBuilder().setSession(Collections.emptyList()).build();
+    private static final Sessions EMPTY_SESSIONS = new SessionsBuilder().build();
     private static final Function<Capability, Uri> CAPABILITY_URI_FUNCTION =
         capability -> new Uri(capability.getCapabilityUri());
 
-    private static final Function<Capability, Schema> CAPABILITY_SCHEMA_FUNCTION = new Function<Capability, Schema>() {
-        @Nullable
-        @Override
-        public Schema apply(@Nonnull final Capability capability) {
-            return new SchemaBuilder()
-                    .setIdentifier(capability.getModuleName().get())
-                    .setNamespace(new Uri(capability.getModuleNamespace().get()))
-                    .setFormat(Yang.class)
-                    .setVersion(capability.getRevision().or(""))
-                    .setLocation(Collections.singletonList(new Location(Enumeration.NETCONF)))
-                    .withKey(new SchemaKey(Yang.class, capability.getModuleName().get(),
-                        capability.getRevision().or("")))
-                    .build();
-        }
-    };
+    private static final Function<Capability, Schema> CAPABILITY_SCHEMA_FUNCTION = capability -> new SchemaBuilder()
+            .setIdentifier(capability.getModuleName().get())
+            .setNamespace(new Uri(capability.getModuleNamespace().get()))
+            .setFormat(Yang.class)
+            .setVersion(capability.getRevision().orElse(""))
+            .setLocation(Collections.singletonList(new Location(Enumeration.NETCONF)))
+            .withKey(new SchemaKey(Yang.class, capability.getModuleName().get(),
+                capability.getRevision().orElse("")))
+            .build();
 
     private final Capabilities capabilities;
     private final ArrayListMultimap<String, Capability> capabilityMultiMap;
@@ -65,9 +58,9 @@ public class DummyMonitoringService implements NetconfMonitoringService {
     public DummyMonitoringService(final Set<Capability> capabilities) {
 
         this.capabilities = new CapabilitiesBuilder().setCapability(
-                Lists.newArrayList(Collections2.transform(capabilities, CAPABILITY_URI_FUNCTION))).build();
+                new ArrayList<>(Collections2.transform(capabilities, CAPABILITY_URI_FUNCTION))).build();
 
-        Set<Capability> moduleCapabilities = Sets.newHashSet();
+        Set<Capability> moduleCapabilities = new HashSet<>();
         this.capabilityMultiMap = ArrayListMultimap.create();
         for (Capability cap : capabilities) {
             if (cap.getModuleName().isPresent()) {
@@ -76,8 +69,10 @@ public class DummyMonitoringService implements NetconfMonitoringService {
             }
         }
 
-        this.schemas = new SchemasBuilder().setSchema(
-            Lists.newArrayList(Collections2.transform(moduleCapabilities, CAPABILITY_SCHEMA_FUNCTION))).build();
+        this.schemas = new SchemasBuilder()
+                .setSchema(Maps.uniqueIndex(Collections2.transform(moduleCapabilities, CAPABILITY_SCHEMA_FUNCTION),
+                    Schema::key))
+                .build();
     }
 
     @Override