Bump upstreams

[openflowplugin.git] / applications / forwardingrules-sync / src / main / java / org / opendaylight / openflowplugin / applications / frsync / impl / strategy / SyncPlanPushStrategyIncrementalImpl.java

diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java
index da2117120f17711f16eee157436f27bfaa3e8c1d..8299322df7f54e659b3a09c5d70f1762a254f48a 100644 (file)
--- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java
+++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java
@@ -55,13 +55,11 @@ import org.slf4j.LoggerFactory;
  * Execute CRUD API for flow + group + meter involving one-by-one (incremental) strategy.
  */
 public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy {
-
     private static final Logger LOG = LoggerFactory.getLogger(SyncPlanPushStrategyIncrementalImpl.class);
 
     private FlowForwarder flowForwarder;
     private MeterForwarder meterForwarder;
     private GroupForwarder groupForwarder;
-    private TableForwarder tableForwarder;
     private FlowCapableTransactionService transactionService;
 
     @Override
@@ -75,59 +73,37 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy
         // TODO enable table-update when ready
         //resultVehicle = updateTableFeatures(nodeIdent, configTree);
 
-        resultVehicle = Futures.transformAsync(resultVehicle, input -> {
-            // if (!input.isSuccessful()) {
-                //TODO chain errors but not skip processing on first error return Futures.immediateFuture(input);
-                //final ListenableFuture<RpcResult<Void>> singleVoidUpdateResult = Futures.transform(
-                //        Futures.asList Arrays.asList(input, output),
-                //        ReconcileUtil.<UpdateFlowOutput>createRpcResultCondenser("TODO"));
-            // }
-            return addMissingGroups(nodeId, nodeIdent, diffInput.getGroupsToAddOrUpdate(), counters);
-        }, MoreExecutors.directExecutor());
+        resultVehicle = Futures.transformAsync(resultVehicle,
+            input -> addMissingGroups(nodeId, nodeIdent, diffInput.getGroupsToAddOrUpdate(), counters),
+            MoreExecutors.directExecutor());
         Futures.addCallback(resultVehicle, FxChainUtil.logResultCallback(nodeId, "addMissingGroups"),
-                MoreExecutors.directExecutor());
-        resultVehicle = Futures.transformAsync(resultVehicle, input -> {
-            // if (!input.isSuccessful()) {
-                //TODO chain errors but not skip processing on first error return Futures.immediateFuture(input);
-            // }
-            return addMissingMeters(nodeId, nodeIdent, diffInput.getMetersToAddOrUpdate(), counters);
-        }, MoreExecutors.directExecutor());
+            MoreExecutors.directExecutor());
+        resultVehicle = Futures.transformAsync(resultVehicle,
+            input -> addMissingMeters(nodeId, nodeIdent, diffInput.getMetersToAddOrUpdate(), counters),
+            MoreExecutors.directExecutor());
         Futures.addCallback(resultVehicle, FxChainUtil.logResultCallback(nodeId, "addMissingMeters"),
-                MoreExecutors.directExecutor());
-        resultVehicle = Futures.transformAsync(resultVehicle, input -> {
-            // if (!input.isSuccessful()) {
-                //TODO chain errors but not skip processing on first error return Futures.immediateFuture(input);
-            // }
-            return addMissingFlows(nodeId, nodeIdent, diffInput.getFlowsToAddOrUpdate(), counters);
-        }, MoreExecutors.directExecutor());
+            MoreExecutors.directExecutor());
+        resultVehicle = Futures.transformAsync(resultVehicle,
+            input -> addMissingFlows(nodeId, nodeIdent, diffInput.getFlowsToAddOrUpdate(), counters),
+            MoreExecutors.directExecutor());
         Futures.addCallback(resultVehicle, FxChainUtil.logResultCallback(nodeId, "addMissingFlows"),
-                MoreExecutors.directExecutor());
-
+            MoreExecutors.directExecutor());
 
-        resultVehicle = Futures.transformAsync(resultVehicle, input -> {
-            // if (!input.isSuccessful()) {
-                //TODO chain errors but not skip processing on first error return Futures.immediateFuture(input);
-            // }
-            return removeRedundantFlows(nodeId, nodeIdent, diffInput.getFlowsToRemove(), counters);
-        }, MoreExecutors.directExecutor());
+        resultVehicle = Futures.transformAsync(resultVehicle,
+            input -> removeRedundantFlows(nodeId, nodeIdent, diffInput.getFlowsToRemove(), counters),
+            MoreExecutors.directExecutor());
         Futures.addCallback(resultVehicle, FxChainUtil.logResultCallback(nodeId, "removeRedundantFlows"),
-                MoreExecutors.directExecutor());
-        resultVehicle = Futures.transformAsync(resultVehicle, input -> {
-            // if (!input.isSuccessful()) {
-                //TODO chain errors but not skip processing on first error return Futures.immediateFuture(input);
-            // }
-            return removeRedundantMeters(nodeId, nodeIdent, diffInput.getMetersToRemove(), counters);
-        }, MoreExecutors.directExecutor());
+            MoreExecutors.directExecutor());
+        resultVehicle = Futures.transformAsync(resultVehicle,
+            input -> removeRedundantMeters(nodeId, nodeIdent, diffInput.getMetersToRemove(), counters),
+            MoreExecutors.directExecutor());
         Futures.addCallback(resultVehicle, FxChainUtil.logResultCallback(nodeId, "removeRedundantMeters"),
-                MoreExecutors.directExecutor());
-        resultVehicle = Futures.transformAsync(resultVehicle, input -> {
-            // if (!input.isSuccessful()) {
-                //TODO chain errors but not skip processing on first error return Futures.immediateFuture(input);
-            // }
-            return removeRedundantGroups(nodeId, nodeIdent, diffInput.getGroupsToRemove(), counters);
-        }, MoreExecutors.directExecutor());
+            MoreExecutors.directExecutor());
+        resultVehicle = Futures.transformAsync(resultVehicle,
+            input -> removeRedundantGroups(nodeId, nodeIdent, diffInput.getGroupsToRemove(), counters),
+            MoreExecutors.directExecutor());
         Futures.addCallback(resultVehicle, FxChainUtil.logResultCallback(nodeId, "removeRedundantGroups"),
-                MoreExecutors.directExecutor());
+            MoreExecutors.directExecutor());
         return resultVehicle;
     }
 
@@ -483,8 +459,8 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy
         return this;
     }
 
+    @Deprecated(since = "0.17.2", forRemoval = true)
     public SyncPlanPushStrategyIncrementalImpl setTableForwarder(final TableForwarder tableForwarder) {
-        this.tableForwarder = tableForwarder;
         return this;
     }
 
@@ -503,5 +479,4 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy
         this.transactionService = transactionService;
         return this;
     }
-
 }