Use Java declarations instead of Google Collections

[netvirt.git] / openstack / net-virt-sfc / impl / src / main / java / org / opendaylight / netvirt / openstack / netvirt / sfc / standalone / openflow13 / NetvirtSfcStandaloneOF13Provider.java

diff --git a/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/netvirt/openstack/netvirt/sfc/standalone/openflow13/NetvirtSfcStandaloneOF13Provider.java b/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/netvirt/openstack/netvirt/sfc/standalone/openflow13/NetvirtSfcStandaloneOF13Provider.java
index d50f63b41273b51f5c46c0b01b06594b3abee023..5903bc7b57c0a9378b679bf9036d5bfcaeab8160 100644 (file)
--- a/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/netvirt/openstack/netvirt/sfc/standalone/openflow13/NetvirtSfcStandaloneOF13Provider.java
+++ b/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/netvirt/openstack/netvirt/sfc/standalone/openflow13/NetvirtSfcStandaloneOF13Provider.java
@@ -102,10 +102,8 @@ public class NetvirtSfcStandaloneOF13Provider implements INetvirtSfcOF13Provider
 
         LOG.debug("add: Classifiers: {}", classifiers);
         for (Classifier classifier : classifiers.getClassifier()) {
-            if (classifier.getAcl().equals(aclName)) {
-                if (classifier.getBridges() != null) {
-                    addClassifierRules(classifier.getBridges(), acl);
-                }
+            if (classifier.getAcl().equals(aclName) && classifier.getBridges() != null) {
+                addClassifierRules(classifier.getBridges(), acl);
             }
         }
     }
@@ -116,11 +114,9 @@ public class NetvirtSfcStandaloneOF13Provider implements INetvirtSfcOF13Provider
         Classifiers classifiers = mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, getClassifierIid());
         if (classifiers != null) {
             for (Classifier classifier : classifiers.getClassifier()) {
-                if (classifier.getAcl().equalsIgnoreCase(aclName)) {
-                    if (classifier.getSffs() != null) {
-                        for (Sff sff : classifier.getSffs().getSff()) {
-                            removeClassifierRules(sff, acl);
-                        }
+                if (classifier.getAcl().equalsIgnoreCase(aclName) && classifier.getSffs() != null) {
+                    for (Sff sff : classifier.getSffs().getSff()) {
+                        removeClassifierRules(sff, acl);
                     }
                 }
             }