Migrate ListenableFutures.addErrorLogging() callers

ListenableFutures.addErrorLogging() has been migrated to
LoggingFutures, use these methods from their new home.

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

diff --git a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java
index 9209942f1638d39d48fc1151b4348aae17b9013e..05cd9d9f33daab1ef5c201f1a80c654dc8c13b3a 100644 (file)
--- a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java
+++ b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java
@@ -22,7 +22,7 @@ import javax.inject.Singleton;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.infrautils.utils.concurrent.Executors;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
@@ -209,13 +209,13 @@ public class CloudscalerRpcServiceImpl implements CloudscalerRpcService {
                 LOG.info("Cloudscaler Deleting compute node details {}",
                         buildOpenflowNodeIid(computeNode));
                 LOG.info("Cloudscaler Deleting compute node details {}", buildOvsdbNodeId(computeNode));
-                ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
+                LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
                     computeNodeManager.deleteComputeNode(tx, computeNode);
                 }), LOG, "Cloudscaler Failed to delete the compute node");
-                ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
+                LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
                     tx.delete(LogicalDatastoreType.CONFIGURATION, buildOpenflowNodeIid(computeNode));
                 }), LOG, "Cloudscaler Failed to delete the config inventory");
-                ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
+                LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
                     tx.delete(LogicalDatastoreType.CONFIGURATION, buildOvsdbNodeId(computeNode));
                 }), LOG, "Cloudscaler Failed to delete the config topology");
             }
@@ -313,7 +313,7 @@ public class CloudscalerRpcServiceImpl implements CloudscalerRpcService {
                                         .child(TransportZone.class, zone.key())
                                         .child(Vteps.class, vteps.key());
                                 LOG.error("Cloudscaler deleting dpn {}", vteps);
-                                ListenableFutures.addErrorLogging(
+                                LoggingFutures.addErrorLogging(
                                         txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
                                             tx.delete(LogicalDatastoreType.CONFIGURATION, dpnVtepIid);
                                         }), LOG, "Cloudscaler Failed to delete the itm tep");

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
index f05f922b184be3aeec6bb5b439559f268f0031ed..b2562f0b99da3f84ec71589abf02a8400010683a 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
@@ -42,7 +42,7 @@ import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilit
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.infrautils.diagstatus.ServiceState;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -428,7 +428,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
                 .getInterfaceIdentifier(new InterfaceKey(interfaceName));
         ListenableFuture<Void> future = txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
             tx -> tx.mergeParentStructurePut(interfaceIId, interfaceBuilder.build()));
-        ListenableFutures.addErrorLogging(future, LOG, "Failed to (async) write {}", interfaceIId);
+        LoggingFutures.addErrorLogging(future, LOG, "Failed to (async) write {}", interfaceIId);
         return future;
     }
 
@@ -465,7 +465,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
     public void bindService(String interfaceName, Class<? extends ServiceModeBase> serviceMode,
             BoundServices serviceInfo, TypedWriteTransaction<Configuration> tx) {
         if (tx == null) {
-            ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
+            LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
                 wtx -> IfmUtil.bindService(wtx, interfaceName, serviceInfo, serviceMode)), LOG,
                 "Error binding the InterfacemgrProvider service");
         } else {

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java
index 1b306ba77b9af611da954a8138d54754c7d214c5..70be2cf7aca97f0cc954cce109ab9eb306642af2 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java
@@ -24,7 +24,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.genius.infra.TypedReadTransaction;
 import org.opendaylight.genius.infra.TypedReadWriteTransaction;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.AlivenessMonitorService;
@@ -101,7 +101,7 @@ public final class AlivenessMonitorUtils {
                 RpcResult<MonitorStartOutput> rpcResult = result.get();
                 if (rpcResult.isSuccessful()) {
                     long monitorId = rpcResult.getResult().getMonitorId().toJava();
-                    ListenableFutures.addErrorLogging(
+                    LoggingFutures.addErrorLogging(
                         txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
                             createOrUpdateInterfaceMonitorIdMap(tx, trunkInterfaceName, monitorId);
                             createOrUpdateMonitorIdInterfaceMap(tx, trunkInterfaceName, monitorId);
@@ -121,7 +121,7 @@ public final class AlivenessMonitorUtils {
             return;
         }
         LOG.debug("stop LLDP monitoring for {}", trunkInterface);
-        ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
+        LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
             List<Uint32> monitorIds = getMonitorIdForInterface(tx, trunkInterface);
             if (monitorIds == null) {
                 LOG.error("Monitor Id doesn't exist for Interface {}", trunkInterface);
@@ -133,7 +133,7 @@ public final class AlivenessMonitorUtils {
                     MonitorStopInput input = new MonitorStopInputBuilder().setMonitorId(monitorId).build();
 
                     ListenableFuture<RpcResult<MonitorStopOutput>> future = alivenessMonitorService.monitorStop(input);
-                    ListenableFutures.addErrorLogging(future, LOG, "Stop LLDP monitoring for {}", trunkInterface);
+                    LoggingFutures.addErrorLogging(future, LOG, "Stop LLDP monitoring for {}", trunkInterface);
 
                     removeMonitorIdInterfaceMap(tx, monitorId);
                     removeMonitorIdFromInterfaceMonitorIdMap(tx, interfaceName, monitorId);
@@ -210,7 +210,7 @@ public final class AlivenessMonitorUtils {
 
                 ListenableFuture<RpcResult<MonitorProfileDeleteOutput>> future =
                         alivenessMonitorService.monitorProfileDelete(profileDeleteInput);
-                ListenableFutures.addErrorLogging(future, LOG, "Delete monitor profile {}", interfaceName);
+                LoggingFutures.addErrorLogging(future, LOG, "Delete monitor profile {}", interfaceName);
             }
         }
     }

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/AlivenessMonitorListenerImpl.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/AlivenessMonitorListenerImpl.java
index 287e7205d23e84f04d5c071df9261e5ed3ebadac..900083654700f42650ca84857cb2b64779876a92 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/AlivenessMonitorListenerImpl.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/AlivenessMonitorListenerImpl.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.genius.interfacemanager.listeners;
 
 import static org.opendaylight.genius.infra.Datastore.OPERATIONAL;
@@ -19,7 +18,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.genius.interfacemanager.commons.AlivenessMonitorUtils;
 import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.OperStatus;
@@ -59,7 +58,7 @@ public class AlivenessMonitorListenerImpl implements AlivenessMonitorListener {
 
     @Override
     public void onMonitorEvent(MonitorEvent notification) {
-        ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
+        LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
             Uint32 monitorId = notification.getEventData().getMonitorId();
             String tunnelInterface = AlivenessMonitorUtils.getInterfaceFromMonitorId(tx, monitorId);
             if (tunnelInterface == null) {

diff --git a/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NsHelper.java b/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NsHelper.java
index d863946f9346adb8837acff052fb621343bd7f35..8981726b0c60e9168fe02343f4ba1f55028eb51f 100644 (file)
--- a/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NsHelper.java
+++ b/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NsHelper.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.genius.ipv6util.nd;
 
 import java.net.InetAddress;
@@ -24,7 +23,7 @@ import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.mdsalutil.actions.ActionGroup;
 import org.opendaylight.genius.mdsalutil.packet.IPProtocols;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.ipv6.nd.packet.rev160620.NeighborSolicitationPacket;
@@ -131,7 +130,7 @@ public class Ipv6NsHelper {
 
         // Tx the packet out of the controller.
         LOG.debug("Transmitting the Neighbor Solicitation packet out on {}", dpnId);
-        ListenableFutures.addErrorLogging(packetService.transmitPacket(input), LOG, "transmitPacket");
+        LoggingFutures.addErrorLogging(packetService.transmitPacket(input), LOG, "transmitPacket");
         return true;
     }
 
@@ -147,6 +146,6 @@ public class Ipv6NsHelper {
                 "Transmitting Neighbor Solicitation packet out. srcMacAddress={}, srcIpv6Address={}, "
                         + "targetIpv6Address={}, dpId={}, ofGroupId={}",
                 srcMacAddress.getValue(), srcIpv6Address.getValue(), targetIpv6Address.getValue(), dpId, ofGroupId);
-        ListenableFutures.addErrorLogging(packetService.transmitPacket(input), LOG, "transmitPacket");
+        LoggingFutures.addErrorLogging(packetService.transmitPacket(input), LOG, "transmitPacket");
     }
 }