Merge "OPNFLWPLUG-898 : remove deprecated checkedfuture"

diff --combined applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
index e440c9d7742a863541bdc80d97125bf301c41ee5,d408bc4ee35f799ed549e36cbedc2aed203a25c8..417e56e18487bd4cf72b437c4ff3d4f6519a7e4d
--- 1/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
--- 2/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
@@@ -11,7 -11,6 +11,6 @@@ package org.opendaylight.openflowplugin
  import com.google.common.base.Optional;
  import com.google.common.base.Preconditions;
  import com.google.common.collect.Lists;
- import com.google.common.util.concurrent.CheckedFuture;
  import com.google.common.util.concurrent.FutureCallback;
  import com.google.common.util.concurrent.Futures;
  import com.google.common.util.concurrent.JdkFutureAdapters;
@@@ -36,7 -35,6 +35,6 @@@ import org.opendaylight.controller.md.s
  import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
  import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
- import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.openflowplugin.api.OFConstants;
  import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
  import org.opendaylight.openflowplugin.applications.frm.FlowNodeReconciliation;
@@@ -159,6 -157,8 +157,6 @@@ public class FlowNodeReconciliationImp
                      connectedNode.toString());
              reconciliationPreProcess(connectedNode);
          }
 -        LOG.debug("Bundle based reconciliation status : {}",
 -                provider.isBundleBasedReconciliationEnabled() ? "Enable" : "Disable");
          if (provider.isBundleBasedReconciliationEnabled()) {
              BundleBasedReconciliationTask bundleBasedReconTask = new BundleBasedReconciliationTask(connectedNode);
              return JdkFutureAdapters.listenInPoolThread(executor.submit(bundleBasedReconTask));
@@@ -181,7 -181,7 +179,7 @@@
              Optional<FlowCapableNode> flowNode = Optional.absent();
              BundleId bundleIdValue = new BundleId(BUNDLE_ID.getAndIncrement());
              BigInteger dpnId = getDpnIdFromNodeName(node);
 -            LOG.debug("Triggering bundle based reconciliation for device :{}", dpnId);
 +            LOG.info("Triggering bundle based reconciliation for device : {}", dpnId);
              ReadOnlyTransaction trans = provider.getReadTranaction();
              try {
                  flowNode = trans.read(LogicalDatastoreType.CONFIGURATION, nodeIdentity).get();
@@@ -193,10 -193,6 +191,10 @@@
                  LOG.debug("FlowNode present for Datapath ID {}", dpnId);
                  final NodeRef nodeRef = new NodeRef(nodeIdentity.firstIdentifierOf(Node.class));
  
 +                final ControlBundleInput closeBundleInput = new ControlBundleInputBuilder().setNode(nodeRef)
 +                        .setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
 +                        .setType(BundleControlType.ONFBCTCLOSEREQUEST).build();
 +
                  final ControlBundleInput openBundleInput = new ControlBundleInputBuilder().setNode(nodeRef)
                          .setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS).setType(BundleControlType.ONFBCTOPENREQUEST)
                          .build();
@@@ -209,30 -205,22 +207,30 @@@
                          .setNode(nodeRef).setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
                          .setMessages(createMessages(nodeRef, flowNode)).build();
  
 -                ListenableFuture<RpcResult<ControlBundleOutput>> openBundle
 -                        = salBundleService.controlBundle(openBundleInput);
 +                /* Close previously opened bundle on the openflow switch if any */
 +                ListenableFuture<RpcResult<ControlBundleOutput>> closeBundle
 +                        = salBundleService.controlBundle(closeBundleInput);
  
 -                ListenableFuture<RpcResult<AddBundleMessagesOutput>> addBundleMessagesFuture = Futures
 -                        .transformAsync(JdkFutureAdapters.listenInPoolThread(openBundle), rpcResult -> {
 +                /* Open a new bundle on the switch */
 +                ListenableFuture<RpcResult<ControlBundleOutput>> openBundle =
 +                        Futures.transformAsync(closeBundle,
 +                            rpcResult -> salBundleService.controlBundle(openBundleInput),
 +                            MoreExecutors.directExecutor());
 +
 +                /* Push groups and flows via bundle add messages */
 +                ListenableFuture<RpcResult<AddBundleMessagesOutput>> addBundleMessagesFuture
 +                        = Futures.transformAsync(openBundle, rpcResult -> {
                              if (rpcResult.isSuccessful()) {
 -                                return JdkFutureAdapters
 -                                        .listenInPoolThread(salBundleService.addBundleMessages(addBundleMessagesInput));
 +                                return salBundleService.addBundleMessages(addBundleMessagesInput);
                              }
                              return Futures.immediateFuture(null);
                          }, MoreExecutors.directExecutor());
 +
 +                /* Commit the bundle on the openflow switch */
                  ListenableFuture<RpcResult<ControlBundleOutput>> commitBundleFuture
                          = Futures.transformAsync(addBundleMessagesFuture, rpcResult -> {
                              if (rpcResult.isSuccessful()) {
 -                                return JdkFutureAdapters
 -                                        .listenInPoolThread(salBundleService.controlBundle(commitBundleInput));
 +                                return salBundleService.controlBundle(commitBundleInput);
                              }
                              return Futures.immediateFuture(null);
                          }, MoreExecutors.directExecutor());
@@@ -646,7 -634,7 +644,7 @@@
              writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, staleFlowIId);
          }
  
-         CheckedFuture<Void, TransactionCommitFailedException> submitFuture = writeTransaction.submit();
+         ListenableFuture<Void> submitFuture = writeTransaction.submit();
          handleStaleEntityDeletionResultFuture(submitFuture);
      }
  
@@@ -657,7 -645,7 +655,7 @@@
              writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, staleGroupIId);
          }
  
-         CheckedFuture<Void, TransactionCommitFailedException> submitFuture = writeTransaction.submit();
+         ListenableFuture<Void> submitFuture = writeTransaction.submit();
          handleStaleEntityDeletionResultFuture(submitFuture);
      }
  
@@@ -668,7 -656,7 +666,7 @@@
              writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, staleMeterIId);
          }
  
-         CheckedFuture<Void, TransactionCommitFailedException> submitFuture = writeTransaction.submit();
+         ListenableFuture<Void> submitFuture = writeTransaction.submit();
          handleStaleEntityDeletionResultFuture(submitFuture);
      }
  
@@@ -692,8 -680,7 +690,7 @@@
          return nodeIdent.child(StaleMeter.class, new StaleMeterKey(new MeterId(staleMeter.getMeterId())));
      }
  
-     private void handleStaleEntityDeletionResultFuture(
-             CheckedFuture<Void, TransactionCommitFailedException> submitFuture) {
+     private void handleStaleEntityDeletionResultFuture(ListenableFuture<Void> submitFuture) {
          Futures.addCallback(submitFuture, new FutureCallback<Void>() {
              @Override
              public void onSuccess(Void result) {