Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / util / FlowUtil.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java
index b9cd4736094bad12f5bde738a0977e2670a929a5..6e9a92480b48a8c5e7e655217654ed4c2dbbbaac 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java
@@ -16,6 +16,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
@@ -36,8 +37,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.Upd
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
+import org.opendaylight.yangtools.yang.binding.Identifiable;
+import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -79,7 +83,7 @@ public final class FlowUtil {
         RpcResult<RemoveFlowsBatchOutput>> FLOW_REMOVE_TRANSFORM =
             batchFlowsCumulativeResult -> {
                 final RemoveFlowsBatchOutput batchOutput = new RemoveFlowsBatchOutputBuilder()
-                        .setBatchFailedFlowsOutput(batchFlowsCumulativeResult.getResult()).build();
+                        .setBatchFailedFlowsOutput(index(batchFlowsCumulativeResult.getResult())).build();
 
                 final RpcResultBuilder<RemoveFlowsBatchOutput> resultBld =
                         createCumulativeRpcResult(batchFlowsCumulativeResult, batchOutput);
@@ -93,7 +97,7 @@ public final class FlowUtil {
         RpcResult<AddFlowsBatchOutput>> FLOW_ADD_TRANSFORM =
             batchFlowsCumulativeResult -> {
                 final AddFlowsBatchOutput batchOutput = new AddFlowsBatchOutputBuilder()
-                        .setBatchFailedFlowsOutput(batchFlowsCumulativeResult.getResult()).build();
+                        .setBatchFailedFlowsOutput(index(batchFlowsCumulativeResult.getResult())).build();
 
                 final RpcResultBuilder<AddFlowsBatchOutput> resultBld =
                         createCumulativeRpcResult(batchFlowsCumulativeResult, batchOutput);
@@ -107,7 +111,7 @@ public final class FlowUtil {
         RpcResult<UpdateFlowsBatchOutput>> FLOW_UPDATE_TRANSFORM =
             batchFlowsCumulativeResult -> {
                 final UpdateFlowsBatchOutput batchOutput = new UpdateFlowsBatchOutputBuilder()
-                        .setBatchFailedFlowsOutput(batchFlowsCumulativeResult.getResult()).build();
+                        .setBatchFailedFlowsOutput(index(batchFlowsCumulativeResult.getResult())).build();
 
                 final RpcResultBuilder<UpdateFlowsBatchOutput> resultBld =
                         createCumulativeRpcResult(batchFlowsCumulativeResult, batchOutput);
@@ -118,6 +122,10 @@ public final class FlowUtil {
         throw new IllegalStateException("This class should not be instantiated.");
     }
 
+    static <K extends Identifier<V>, V extends Identifiable<K>> Map<K, V> index(final List<V> list) {
+        return list == null ? null : BindingMap.ordered(list);
+    }
+
     /**
      * Wrap given list of problematic flow-ids into {@link RpcResult} of given type.
      *