Bump odlparent to 5.0.0

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java
index 747f104d94da1590b36436d5df001d82995c9e55..c0de5ebaa97519c0600577869ede892790807f09 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java
@@ -17,7 +17,6 @@ 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.group._case.FlatBatchAddGroup;
@@ -129,9 +128,8 @@ public final class FlatBatchGroupAdapters {
     static <T extends BatchGroupOutputListGrouping> Function<RpcResult<T>, RpcResult<ProcessFlatBatchOutput>>
         convertBatchGroupResult(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 = wrapBatchGroupFailuresForFlat(input, stepOffset);
                 ProcessFlatBatchOutputBuilder outputBuilder =
                         new ProcessFlatBatchOutputBuilder().setBatchFailure(batchFailures);
@@ -172,7 +170,7 @@ public final class FlatBatchGroupAdapters {
         convertGroupBatchFutureForChain(final Future<RpcResult<T>> resultUpdateGroupFuture,
                                     final int currentOffset) {
         return Futures.transform(JdkFutureAdapters.listenInPoolThread(resultUpdateGroupFuture),
-                FlatBatchGroupAdapters.<T>convertBatchGroupResult(currentOffset),
+                FlatBatchGroupAdapters.convertBatchGroupResult(currentOffset),
                 MoreExecutors.directExecutor());
     }
 }