BUG-7446: update to Guava 21

Futures.transform() was de-overloaded to transformAsync().

Change-Id: Ic01284bee63e4e1dff8deefa4f8ee98d0d11d7c0
Signed-off-by: Robert Varga <nite@hq.sk>
Signed-off-by: Vivekanandan Narasimhan <n.vivekanandan@ericsson.com>

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
index c26d43b9a12748c9c9f3029f47f3a76d6ad4b051..fc147db0654b90ebf86013b38911d48114171224 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
@@ -970,7 +970,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
 
         //On successful generation of the VPN label, advertise the route to the BGP and install the FIB routes.
         ListenableFuture<RpcResult<Void>> future =
-            Futures.transform(JdkFutureAdapters.listenInPoolThread(labelFuture),
+            Futures.transformAsync(JdkFutureAdapters.listenInPoolThread(labelFuture),
                 (AsyncFunction<RpcResult<GenerateVpnLabelOutput>, RpcResult<Void>>) result -> {
                     if (result.isSuccessful()) {
                         LOG.debug("NAT Service : inside apply with result success");
@@ -2093,7 +2093,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
         Future<RpcResult<Void>> future = fibService.removeFibEntry(input);
 
         ListenableFuture<RpcResult<Void>> labelFuture =
-            Futures.transform(JdkFutureAdapters.listenInPoolThread(future),
+            Futures.transformAsync(JdkFutureAdapters.listenInPoolThread(future),
                 (AsyncFunction<RpcResult<Void>, RpcResult<Void>>) result -> {
                     //Release label
                     if (result.isSuccessful()) {
@@ -2186,7 +2186,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
         Future<RpcResult<Void>> future = fibService.removeFibEntry(input);
 
         ListenableFuture<RpcResult<Void>> labelFuture =
-            Futures.transform(JdkFutureAdapters.listenInPoolThread(future),
+            Futures.transformAsync(JdkFutureAdapters.listenInPoolThread(future),
                 (AsyncFunction<RpcResult<Void>, RpcResult<Void>>) result -> {
                     //Release label
                     if (result.isSuccessful()) {

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java
index f7adcef429135833bbb7e6464ebec06c1a06ec2a..05bd79c00e413a12952f1eb7d09fb2a77fab7699 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java
@@ -162,8 +162,9 @@ public class VpnFloatingIpHandler implements FloatingIPHandler {
             .setIpPrefix(externalIp).build();
         Future<RpcResult<GenerateVpnLabelOutput>> labelFuture = vpnService.generateVpnLabel(labelInput);
 
-        ListenableFuture<RpcResult<Void>> future = Futures.transform(JdkFutureAdapters.listenInPoolThread(labelFuture),
-            (AsyncFunction<RpcResult<GenerateVpnLabelOutput>, RpcResult<Void>>) result -> {
+        ListenableFuture<RpcResult<Void>> future = Futures.transformAsync(
+                JdkFutureAdapters.listenInPoolThread(labelFuture),
+                (AsyncFunction<RpcResult<GenerateVpnLabelOutput>, RpcResult<Void>>) result -> {
                 if (result.isSuccessful()) {
                     GenerateVpnLabelOutput output = result.getResult();
                     long label = output.getLabel();
@@ -298,8 +299,9 @@ public class VpnFloatingIpHandler implements FloatingIPHandler {
             .setSourceDpid(dpnId).setIpAddress(externalIp + "/32").setServiceId(label).build();
         Future<RpcResult<Void>> future = fibService.removeFibEntry(input);
 
-        ListenableFuture<RpcResult<Void>> labelFuture = Futures.transform(JdkFutureAdapters.listenInPoolThread(future),
-            (AsyncFunction<RpcResult<Void>, RpcResult<Void>>) result -> {
+        ListenableFuture<RpcResult<Void>> labelFuture = Futures.transformAsync(
+                JdkFutureAdapters.listenInPoolThread(future),
+                (AsyncFunction<RpcResult<Void>, RpcResult<Void>>) result -> {
                 //Release label
                 if (result.isSuccessful()) {
                 /*  check if any floating IP information is available in vpn-to-dpn-list for given dpn id. If exist any