Bump odlparent to 5.0.0

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / batch / FlatBatchMeterAdapters.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java
index c1140f727fa77cef8834097b9c7e7d8368faa2a1..584498dcbdc3527788e8fe7596d4b4747cd8cbeb 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java
@@ -13,10 +13,10 @@ import com.google.common.base.Function;
 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.concurrent.Future;
-import javax.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeter;
@@ -46,10 +46,9 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 /**
  * Transform between FlatBatch API and meter batch API.
  */
-public class FlatBatchMeterAdapters {
+public final class FlatBatchMeterAdapters {
 
     private FlatBatchMeterAdapters() {
-        throw new IllegalStateException("This class should not be instantiated.");
     }
 
     /**
@@ -129,9 +128,8 @@ public class FlatBatchMeterAdapters {
     static <T extends BatchMeterOutputListGrouping> Function<RpcResult<T>, RpcResult<ProcessFlatBatchOutput>>
         convertBatchMeterResult(final int stepOffset) {
         return new Function<RpcResult<T>, RpcResult<ProcessFlatBatchOutput>>() {
-            @Nullable
             @Override
-            public RpcResult<ProcessFlatBatchOutput> apply(@Nullable final RpcResult<T> input) {
+            public RpcResult<ProcessFlatBatchOutput> apply(final RpcResult<T> input) {
                 List<BatchFailure> batchFailures = wrapBatchMeterFailuresForFlat(input, stepOffset);
                 ProcessFlatBatchOutputBuilder outputBuilder =
                         new ProcessFlatBatchOutputBuilder().setBatchFailure(batchFailures);
@@ -172,6 +170,7 @@ public class FlatBatchMeterAdapters {
         convertMeterBatchFutureForChain(final Future<RpcResult<T>> resultUpdateMeterFuture,
                                     final int currentOffset) {
         return Futures.transform(JdkFutureAdapters.listenInPoolThread(resultUpdateMeterFuture),
-                FlatBatchMeterAdapters.<T>convertBatchMeterResult(currentOffset));
+                FlatBatchMeterAdapters.convertBatchMeterResult(currentOffset),
+                MoreExecutors.directExecutor());
     }
 }