Merge "Remove dependency of impl on onf-extensions"

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImpl.java
index 9a9a00b2c1abf21e6ecbd24fab55053a7a1d850e..ea0361423d22104abe7753b5dbe4543cb5f79e88 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImpl.java
@@ -64,7 +64,8 @@ public class SalMetersBatchServiceImpl implements SalMetersBatchService {
     private final SalMeterService salMeterService;
     private final FlowCapableTransactionService transactionService;
 
-    public SalMetersBatchServiceImpl(final SalMeterService salMeterService, final FlowCapableTransactionService transactionService) {
+    public SalMetersBatchServiceImpl(final SalMeterService salMeterService,
+                                     final FlowCapableTransactionService transactionService) {
         this.salMeterService = Preconditions.checkNotNull(salMeterService);
         this.transactionService = Preconditions.checkNotNull(transactionService);
     }
@@ -86,12 +87,12 @@ public class SalMetersBatchServiceImpl implements SalMetersBatchService {
         }
 
         final Iterable<Meter> meters = Iterables.transform(batchUpdateMeters, new Function<BatchUpdateMeters, Meter>() {
-                    @Nullable
-                    @Override
-                    public Meter apply(@Nullable final BatchUpdateMeters input) {
-                        return input.getUpdatedBatchedMeter();
-                    }
+                @Nullable
+                @Override
+                public Meter apply(@Nullable final BatchUpdateMeters input) {
+                    return input.getUpdatedBatchedMeter();
                 }
+            }
         );
 
         final ListenableFuture<RpcResult<List<BatchFailedMetersOutput>>> commonResult =
@@ -138,7 +139,9 @@ public class SalMetersBatchServiceImpl implements SalMetersBatchService {
 
     @Override
     public Future<RpcResult<RemoveMetersBatchOutput>> removeMetersBatch(final RemoveMetersBatchInput input) {
-        LOG.trace("Removing meters @ {} : {}", PathUtil.extractNodeId(input.getNode()), input.getBatchRemoveMeters().size());
+        LOG.trace("Removing meters @ {} : {}",
+                  PathUtil.extractNodeId(input.getNode()),
+                  input.getBatchRemoveMeters().size());
         final ArrayList<ListenableFuture<RpcResult<RemoveMeterOutput>>> resultsLot = new ArrayList<>();
         for (BatchRemoveMeters addMeter : input.getBatchRemoveMeters()) {
             final RemoveMeterInput removeMeterInput = new RemoveMeterInputBuilder(addMeter)