From 2141188b572f4f97b3703bfd98158e1b8dc23c2b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 29 Sep 2020 12:12:50 +0200 Subject: [PATCH] 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 --- .../internal/AlivenessProtocolHandlerARP.java | 8 ++++---- .../internal/AlivenessProtocolHandlerIPv6ND.java | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) 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 1aa554fbe..4550fa808 100644 --- 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 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> 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 b1748d28d..c725b4cfe 100644 --- 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 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 -- 2.36.6