Fix alivenessmonitor-impl-protocols deprecation warnings

We are using sinleton lists where we should be using a map. Fix
this simple case.

Change-Id: I60fcd1b102873419ddab36953712c8e78cb2e543
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
index 1aa554fbe5509d91872cf3c143b41b0fb2fa5050..4550fa8087d4f6e171a659a6e7b87bf277a95550 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
@@ -16,8 +16,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Collections;
-import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -151,8 +150,9 @@ public class AlivenessProtocolHandlerARP extends AbstractAlivenessProtocolHandle
             if (srcMacAddress != null) {
                 interfaceAddressBuilder.setMacaddress(srcMacAddress);
             }
-            List<InterfaceAddress> addresses = Collections.singletonList(interfaceAddressBuilder.build());
-            SendArpRequestInput input = new SendArpRequestInputBuilder().setInterfaceAddress(addresses)
+            final InterfaceAddress interfaceAddress = interfaceAddressBuilder.build();
+            SendArpRequestInput input = new SendArpRequestInputBuilder()
+                    .setInterfaceAddress(Map.of(interfaceAddress.key(), interfaceAddress))
                     .setIpaddress(IpAddressBuilder.getDefaultInstance(targetIp)).build();
             ListenableFuture<RpcResult<SendArpRequestOutput>> future = arpService.sendArpRequest(input);
             final String msgFormat = String.format("Send ARP Request on interface %s to destination %s",

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java
index b1748d28d9bf2561d23c235584967a1624a40947..c725b4cfec40f0bb4d60d2e5fe405010b3a0afee 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java
@@ -16,8 +16,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import javax.inject.Inject;
@@ -175,10 +174,12 @@ public class AlivenessProtocolHandlerIPv6ND extends AbstractAlivenessProtocolHan
         if (srcMacAddress != null) {
             interfaceAddressBuilder.setSrcMacAddress(srcMacAddress);
         }
-        List<InterfaceAddress> addresses = Collections.singletonList(interfaceAddressBuilder.build());
-        SendNeighborSolicitationInput input = new SendNeighborSolicitationInputBuilder().setInterfaceAddress(addresses)
-                .setTargetIpAddress(Ipv6Address.getDefaultInstance(targetIp)).build();
-        return input;
+
+        InterfaceAddress interfaceAddress = interfaceAddressBuilder.build();
+        return new SendNeighborSolicitationInputBuilder()
+                .setInterfaceAddress(Map.of(interfaceAddress.key(), interfaceAddress))
+                .setTargetIpAddress(Ipv6Address.getDefaultInstance(targetIp))
+                .build();
     }
 
     @Override