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>
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
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.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
if (srcMacAddress != null) {
interfaceAddressBuilder.setMacaddress(srcMacAddress);
}
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",
.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",
import com.google.common.util.concurrent.MoreExecutors;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.net.UnknownHostException;
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.concurrent.ExecutionException;
import java.util.concurrent.Future;
import javax.inject.Inject;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import javax.inject.Inject;
if (srcMacAddress != null) {
interfaceAddressBuilder.setSrcMacAddress(srcMacAddress);
}
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();