Merge dev/fluorine work across to master

[unimgr.git] / ovs-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / ovs / tapi / DataObjectModificationQualifier.java

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java
index ba120829ab0c34a62b0fc51aff9fa78e4e5474ff..94b9d5c748168b8b39840b84ec904e1dc9b154b7 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java
@@ -1,5 +1,12 @@
 package org.opendaylight.unimgr.mef.nrp.ovs.tapi;
 
+import static org.opendaylight.unimgr.mef.nrp.ovs.util.OvsCapabilitiesService.NodeCapability.OVSDB;
+import static org.opendaylight.unimgr.utils.CapabilitiesService.Capability.Mode.AND;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.unimgr.utils.CapabilitiesService;
@@ -10,14 +17,6 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import static org.opendaylight.unimgr.utils.CapabilitiesService.Capability.Mode.AND;
-import static org.opendaylight.unimgr.utils.CapabilitiesService.NodeContext.NodeCapability.OVSDB;
-
 /**
  * Class created to classify object according to its modification types.
  *
@@ -33,65 +32,75 @@ public class DataObjectModificationQualifier {
 
     private Function<Node,Boolean> isOvs = node -> capabilitiesService.node(node).isSupporting(AND, OVSDB);
 
-    protected void checkNodes(List<DataObjectModification> nodes, Map<TerminationPoint,String> toAddMap, Map<TerminationPoint,String> toUpdateMap, Map<TerminationPoint,String> toDeleteMap) {
+    protected void checkNodes(List<DataObjectModification> nodes,
+                              Map<TerminationPoint,String> toAddMap,
+                              Map<TerminationPoint,String> toUpdateMap, Map<TerminationPoint,String> toDeleteMap) {
         Node n;
         for (DataObjectModification node: nodes) {
-            switch(node.getModificationType()) {
+            switch (node.getModificationType()) {
                 //new ovs node
-                case WRITE :{
+                case WRITE :
                     n = (Node) node.getDataAfter();
-                    if (!isOvs.apply(n) || n.getTerminationPoint()==null)
+                    if (!isOvs.apply(n) || n.getTerminationPoint() == null) {
                         break;
-                    String bridgeName = n.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
-                    n.getTerminationPoint().forEach(tp -> toAddMap.put(tp,bridgeName));
-                } break;
-                case SUBTREE_MODIFIED:{
+                    }
+                    String bn1 = n.augmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
+                    n.getTerminationPoint().forEach(tp -> toAddMap.put(tp,bn1));
+                break;
+                case SUBTREE_MODIFIED:
                     checkTerminationPoints(node, toAddMap, toUpdateMap, toDeleteMap);
-                } break;
+                break;
                 //whole ovs-node eg. s1 deleted
-                case DELETE:{
+                case DELETE:
                     n = (Node) node.getDataBefore();
-                    if (!isOvs.apply(n) || n.getTerminationPoint()==null)
+                    if (!isOvs.apply(n) || n.getTerminationPoint() == null) {
                         break;
-                    String bridgeName = n.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
-                    n.getTerminationPoint().forEach(tp -> toDeleteMap.put(tp,bridgeName));
-                } break;
-                default:{
+                    }
+                    String bn2 = n.augmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
+                    n.getTerminationPoint().forEach(tp -> toDeleteMap.put(tp,bn2));
+                break;
+                default:
                     LOG.debug("Not supported modification type: {}",node.getModificationType());
-                } break;
+                break;
             }
         }
     }
 
-    private void checkTerminationPoints(DataObjectModification node, Map<TerminationPoint,String> toAddMap, Map<TerminationPoint,String> toUpdateMap, Map<TerminationPoint,String> toDeleteMap) {
+    private void checkTerminationPoints(DataObjectModification node,
+                                        Map<TerminationPoint,String> toAddMap,
+                                        Map<TerminationPoint,String> toUpdateMap,
+                                        Map<TerminationPoint,String> toDeleteMap) {
         Node n = (Node) node.getDataAfter();
-        if (!isOvs.apply(n))
+        if (!isOvs.apply(n)) {
             return ;
-        String bridgeName = n.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
+        }
+        String bridgeName = n.augmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
         Collection<DataObjectModification<? extends DataObject>> modifiedChildren = node.getModifiedChildren();
 
         TerminationPoint terminationPoint;
         for (DataObjectModification tp: modifiedChildren) {
-            if (!tp.getDataType().equals(TerminationPoint.class))
+            if (!tp.getDataType().equals(TerminationPoint.class)) {
                 continue;
+            }
             switch (tp.getModificationType()) {
                 //new port added eg. s1-eth7
-                case WRITE: {
+                case WRITE:
                     terminationPoint = (TerminationPoint) tp.getDataAfter();
                     toAddMap.put(terminationPoint,bridgeName);
-                } break;
-                case SUBTREE_MODIFIED: {
+                break;
+                case SUBTREE_MODIFIED:
                     terminationPoint = (TerminationPoint) tp.getDataAfter();
-                    if (!tp.getDataBefore().equals(tp.getDataAfter()))
+                    if (!tp.getDataBefore().equals(tp.getDataAfter())) {
                         toUpdateMap.put(terminationPoint,bridgeName);
-                } break;
-                case DELETE: {
+                    }
+                break;
+                case DELETE:
                     terminationPoint = (TerminationPoint) tp.getDataBefore();
                     toDeleteMap.put(terminationPoint,bridgeName);
-                } break;
-                default: {
+                break;
+                default:
                     LOG.debug("Not supported modification type: SUBTREE_MODIFIED.{}",tp.getModificationType());
-                } break;
+                break;
             }
         }
     }