From daa1649cbcdb00029628df276d45ac19cbb72bf9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 29 Mar 2019 00:04:51 +0100 Subject: [PATCH] Do not use deprecated Futures methods Futures require an executor, pass down directExecutor() to be future-proof. Change-Id: Ib68c29186ba3e57f4c59a4782f1604b17c4dae38 Signed-off-by: Robert Varga --- .../frm/impl/BundleGroupForwarder.java | 9 ++++++--- .../frm/impl/FrmReconciliationServiceImpl.java | 4 +++- .../applications/frsync/util/ReconcileUtil.java | 3 ++- .../services/AbstractSilentErrorService.java | 3 ++- .../services/sal/SalGroupsBatchServiceImpl.java | 16 ++++++++++------ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleGroupForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleGroupForwarder.java index ab3be9549b..663b24f6e3 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleGroupForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleGroupForwarder.java @@ -15,6 +15,7 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.List; import org.opendaylight.infrautils.utils.concurrent.JdkFutures; @@ -77,7 +78,8 @@ public class BundleGroupForwarder { bundleId.getValue(), nodeId.getValue()); final ListenableFuture> resultFuture = forwardingRulesManager .getSalBundleService().addBundleMessages(addBundleMessagesInput); - Futures.addCallback(resultFuture, new BundleRemoveGroupCallBack(group.getGroupId().getValue(), nodeId)); + Futures.addCallback(resultFuture, new BundleRemoveGroupCallBack(group.getGroupId().getValue(), nodeId), + MoreExecutors.directExecutor()); JdkFutures.addErrorLogging(resultFuture, LOG, "removeBundleGroup"); return resultFuture; }); @@ -102,7 +104,7 @@ public class BundleGroupForwarder { final ListenableFuture> resultFuture = forwardingRulesManager .getSalBundleService().addBundleMessages(addBundleMessagesInput); Futures.addCallback(resultFuture, new BundleUpdateGroupCallBack(originalGroup.getGroupId().getValue(), - nodeId)); + nodeId), MoreExecutors.directExecutor()); JdkFutures.addErrorLogging(resultFuture, LOG, "updateBundleGroup"); return resultFuture; }); @@ -130,7 +132,8 @@ public class BundleGroupForwarder { bundleId.getValue(), nodeId.getValue()); ListenableFuture> resultFuture = forwardingRulesManager .getSalBundleService().addBundleMessages(addBundleMessagesInput); - Futures.addCallback(resultFuture, new BundleAddGroupCallBack(groupId, nodeId)); + Futures.addCallback(resultFuture, new BundleAddGroupCallBack(groupId, nodeId), + MoreExecutors.directExecutor()); return resultFuture; }); } diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java index 29856894be..c721b8500a 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java @@ -11,6 +11,7 @@ package org.opendaylight.openflowplugin.applications.frm.impl; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import javax.inject.Inject; import javax.inject.Singleton; @@ -61,7 +62,8 @@ public class FrmReconciliationServiceImpl implements FrmReconciliationService { SettableFuture> rpcResult = SettableFuture.create(); ListenableFuture futureResult = forwardingRulesManagerImpl .getNodeListener().reconcileConfiguration(connectedNode); - Futures.addCallback(futureResult, new ResultCallBack(futureResult, rpcResult)); + Futures.addCallback(futureResult, new ResultCallBack(futureResult, rpcResult), + MoreExecutors.directExecutor()); LOG.debug("Completing reconciliation for node: {}", input.getNodeId().toString()); return rpcResult; } diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java index c7b5bc8018..f135fe2669 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java @@ -15,6 +15,7 @@ import com.google.common.collect.Iterables; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -140,7 +141,7 @@ public final class ReconcileUtil { } else { return Futures.immediateFailedFuture(null); } - }); + }, MoreExecutors.directExecutor()); }; } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractSilentErrorService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractSilentErrorService.java index 727ccff8bb..a1da76e333 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractSilentErrorService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractSilentErrorService.java @@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.impl.services; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.function.Function; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -35,6 +36,6 @@ public abstract class AbstractSilentErrorService return Futures.catching( super.handleServiceCall(input, isComplete), Throwable.class, - t -> RpcResultBuilder.failed().build()); + t -> RpcResultBuilder.failed().build(), MoreExecutors.directExecutor()); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImpl.java index aa6b07144a..8225e94065 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImpl.java @@ -12,6 +12,7 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -87,10 +88,11 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService { final ListenableFuture>> commonResult = Futures .transform(Futures.allAsList(resultsLot), - GroupUtil.createCumulatingFunction(groups, batchUpdateGroups.size())); + GroupUtil.createCumulatingFunction(groups, batchUpdateGroups.size()), + MoreExecutors.directExecutor()); ListenableFuture> updateGroupsBulkFuture = Futures - .transform(commonResult, GroupUtil.GROUP_UPDATE_TRANSFORM); + .transform(commonResult, GroupUtil.GROUP_UPDATE_TRANSFORM, MoreExecutors.directExecutor()); if (input.isBarrierAfter()) { updateGroupsBulkFuture = BarrierUtil @@ -113,10 +115,11 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService { final ListenableFuture>> commonResult = Futures .transform(Futures.allAsList(resultsLot), - GroupUtil.createCumulatingFunction(input.getBatchAddGroups())); + GroupUtil.createCumulatingFunction(input.getBatchAddGroups()), + MoreExecutors.directExecutor()); ListenableFuture> addGroupsBulkFuture = Futures - .transform(commonResult, GroupUtil.GROUP_ADD_TRANSFORM); + .transform(commonResult, GroupUtil.GROUP_ADD_TRANSFORM, MoreExecutors.directExecutor()); if (input.isBarrierAfter()) { addGroupsBulkFuture = BarrierUtil.chainBarrier(addGroupsBulkFuture, input.getNode(), transactionService, @@ -139,10 +142,11 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService { final ListenableFuture>> commonResult = Futures .transform(Futures.allAsList(resultsLot), - GroupUtil.createCumulatingFunction(input.getBatchRemoveGroups())); + GroupUtil.createCumulatingFunction(input.getBatchRemoveGroups()), + MoreExecutors.directExecutor()); ListenableFuture> removeGroupsBulkFuture = Futures - .transform(commonResult, GroupUtil.GROUP_REMOVE_TRANSFORM); + .transform(commonResult, GroupUtil.GROUP_REMOVE_TRANSFORM, MoreExecutors.directExecutor()); if (input.isBarrierAfter()) { removeGroupsBulkFuture = BarrierUtil -- 2.36.6