Remove unused routedRpcRegistration

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / sal / SalGroupsBatchServiceImpl.java

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 8225e940659be1539431ac62a8ce0f90fa297256..6c22005b73f88304ab0b175ede1c671aba7c9c40 100644 (file)
--- 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
@@ -5,12 +5,11 @@
  * 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.openflowplugin.impl.services.sal;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 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;
@@ -57,7 +56,6 @@ import org.slf4j.LoggerFactory;
  * Default implementation of {@link SalGroupsBatchService} - delegates work to {@link SalGroupService}.
  */
 public class SalGroupsBatchServiceImpl implements SalGroupsBatchService {
-
     private static final Logger LOG = LoggerFactory.getLogger(SalGroupsBatchServiceImpl.class);
 
     private final SalGroupService salGroupService;
@@ -65,8 +63,8 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService {
 
     public SalGroupsBatchServiceImpl(final SalGroupService salGroupService,
                                      final FlowCapableTransactionService transactionService) {
-        this.salGroupService = Preconditions.checkNotNull(salGroupService);
-        this.transactionService = Preconditions.checkNotNull(transactionService);
+        this.salGroupService = requireNonNull(salGroupService);
+        this.transactionService = requireNonNull(transactionService);
     }
 
     @Override
@@ -80,7 +78,7 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService {
                     .setOriginalGroup(new OriginalGroupBuilder(batchGroup.getOriginalBatchedGroup()).build())
                     .setUpdatedGroup(new UpdatedGroupBuilder(batchGroup.getUpdatedBatchedGroup()).build())
                     .setGroupRef(createGroupRef(input.getNode(), batchGroup)).setNode(input.getNode()).build();
-            resultsLot.add(JdkFutureAdapters.listenInPoolThread(salGroupService.updateGroup(updateGroupInput)));
+            resultsLot.add(salGroupService.updateGroup(updateGroupInput));
         }
 
         final Iterable<Group> groups = batchUpdateGroups.stream()
@@ -94,7 +92,7 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService {
         ListenableFuture<RpcResult<UpdateGroupsBatchOutput>> updateGroupsBulkFuture = Futures
                 .transform(commonResult, GroupUtil.GROUP_UPDATE_TRANSFORM, MoreExecutors.directExecutor());
 
-        if (input.isBarrierAfter()) {
+        if (input.getBarrierAfter()) {
             updateGroupsBulkFuture = BarrierUtil
                     .chainBarrier(updateGroupsBulkFuture, input.getNode(), transactionService,
                                   GroupUtil.GROUP_UPDATE_COMPOSING_TRANSFORM);
@@ -107,21 +105,21 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService {
     public ListenableFuture<RpcResult<AddGroupsBatchOutput>> addGroupsBatch(final AddGroupsBatchInput input) {
         LOG.trace("Adding groups @ {} : {}", PathUtil.extractNodeId(input.getNode()), input.getBatchAddGroups().size());
         final ArrayList<ListenableFuture<RpcResult<AddGroupOutput>>> resultsLot = new ArrayList<>();
-        for (BatchAddGroups addGroup : input.getBatchAddGroups()) {
+        for (BatchAddGroups addGroup : input.nonnullBatchAddGroups().values()) {
             final AddGroupInput addGroupInput = new AddGroupInputBuilder(addGroup)
                     .setGroupRef(createGroupRef(input.getNode(), addGroup)).setNode(input.getNode()).build();
-            resultsLot.add(JdkFutureAdapters.listenInPoolThread(salGroupService.addGroup(addGroupInput)));
+            resultsLot.add(salGroupService.addGroup(addGroupInput));
         }
 
         final ListenableFuture<RpcResult<List<BatchFailedGroupsOutput>>> commonResult = Futures
                 .transform(Futures.allAsList(resultsLot),
-                           GroupUtil.createCumulatingFunction(input.getBatchAddGroups()),
+                           GroupUtil.createCumulatingFunction(input.nonnullBatchAddGroups().values()),
                            MoreExecutors.directExecutor());
 
         ListenableFuture<RpcResult<AddGroupsBatchOutput>> addGroupsBulkFuture = Futures
                 .transform(commonResult, GroupUtil.GROUP_ADD_TRANSFORM, MoreExecutors.directExecutor());
 
-        if (input.isBarrierAfter()) {
+        if (input.getBarrierAfter()) {
             addGroupsBulkFuture = BarrierUtil.chainBarrier(addGroupsBulkFuture, input.getNode(), transactionService,
                                                            GroupUtil.GROUP_ADD_COMPOSING_TRANSFORM);
         }
@@ -134,21 +132,21 @@ public class SalGroupsBatchServiceImpl implements SalGroupsBatchService {
         LOG.trace("Removing groups @ {} : {}", PathUtil.extractNodeId(input.getNode()),
                   input.getBatchRemoveGroups().size());
         final ArrayList<ListenableFuture<RpcResult<RemoveGroupOutput>>> resultsLot = new ArrayList<>();
-        for (BatchRemoveGroups addGroup : input.getBatchRemoveGroups()) {
+        for (BatchRemoveGroups addGroup : input.nonnullBatchRemoveGroups().values()) {
             final RemoveGroupInput removeGroupInput = new RemoveGroupInputBuilder(addGroup)
                     .setGroupRef(createGroupRef(input.getNode(), addGroup)).setNode(input.getNode()).build();
-            resultsLot.add(JdkFutureAdapters.listenInPoolThread(salGroupService.removeGroup(removeGroupInput)));
+            resultsLot.add(salGroupService.removeGroup(removeGroupInput));
         }
 
         final ListenableFuture<RpcResult<List<BatchFailedGroupsOutput>>> commonResult = Futures
                 .transform(Futures.allAsList(resultsLot),
-                           GroupUtil.createCumulatingFunction(input.getBatchRemoveGroups()),
+                           GroupUtil.createCumulatingFunction(input.nonnullBatchRemoveGroups().values()),
                            MoreExecutors.directExecutor());
 
         ListenableFuture<RpcResult<RemoveGroupsBatchOutput>> removeGroupsBulkFuture = Futures
                 .transform(commonResult, GroupUtil.GROUP_REMOVE_TRANSFORM, MoreExecutors.directExecutor());
 
-        if (input.isBarrierAfter()) {
+        if (input.getBarrierAfter()) {
             removeGroupsBulkFuture = BarrierUtil
                     .chainBarrier(removeGroupsBulkFuture, input.getNode(), transactionService,
                                   GroupUtil.GROUP_REMOVE_COMPOSING_TRANSFORM);