Annotate some parameters as @Nonnull

This allows to remove some checks.

Change-Id: I37125b35da5d37f9556d05223ad0cfe83070e0a1
Signed-off-by: David Suarez <[email protected]>

diff --git a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionChainListener.java b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionChainListener.java
index f14ed1b5b40f164738d899a308a99908e7db7832..4bc3308fe8bd738582b4698147a0153048cbf58d 100644 (file)
--- a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionChainListener.java
+++ b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionChainListener.java
@@ -57,11 +57,9 @@ public class ServiceFunctionChainListener extends AbstractSyncDataTreeChangeList
 
     @Override
     public void update(@Nonnull ServiceFunctionChain originalServiceFunctionChain,
-                       ServiceFunctionChain updatedServiceFunctionChain) {
-        if (updatedServiceFunctionChain != null) {
-            LOG.debug("update:Updating Service Function chain: {}", originalServiceFunctionChain.getName());
-            SfcDatastoreCache.getSfChainToSfTypeList().invalidate(originalServiceFunctionChain.getName());
-            add(updatedServiceFunctionChain);
-        }
+                       @Nonnull ServiceFunctionChain updatedServiceFunctionChain) {
+        LOG.debug("update:Updating Service Function chain: {}", originalServiceFunctionChain.getName());
+        SfcDatastoreCache.getSfChainToSfTypeList().invalidate(originalServiceFunctionChain.getName());
+        add(updatedServiceFunctionChain);
     }
 }

diff --git a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionClassifierListener.java b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionClassifierListener.java
index 3d497e2592a84b9aba93debce5e4046945316b72..098afdd34b96d65603e6bcfb7ef206c064605742 100644 (file)
--- a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionClassifierListener.java
+++ b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionClassifierListener.java
@@ -66,7 +66,7 @@ public class ServiceFunctionClassifierListener extends AbstractSyncDataTreeChang
 
     @Override
     public void update(@Nonnull ServiceFunctionClassifier originalServiceFunctionClassifier,
-                       ServiceFunctionClassifier updatedServiceFunctionClassifier) {
+                       @Nonnull ServiceFunctionClassifier updatedServiceFunctionClassifier) {
         if (originalServiceFunctionClassifier.getAcl() != null
                 && updatedServiceFunctionClassifier.getAcl() != null && !originalServiceFunctionClassifier.getAcl()
                 .equals(updatedServiceFunctionClassifier.getAcl())) {

diff --git a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionForwarderListener.java b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionForwarderListener.java
index 10c7c5ea04eb867402bafb9e7555f99d0ea2f36c..9c85446796e46050a6a705f620dcd49c8848ee3d 100644 (file)
--- a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionForwarderListener.java
+++ b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionForwarderListener.java
@@ -67,7 +67,7 @@ public class ServiceFunctionForwarderListener extends AbstractSyncDataTreeChange
 
     @Override
     public void update(@Nonnull ServiceFunctionForwarder originalServiceFunctionForwarder,
-                       ServiceFunctionForwarder updatedServiceFunctionForwarder) {
+                       @Nonnull ServiceFunctionForwarder updatedServiceFunctionForwarder) {
         LOG.debug("Updating Service Function Forwarder: {}", originalServiceFunctionForwarder.getName());
         List<RspName> rspNames = findAffectedRsp(originalServiceFunctionForwarder, updatedServiceFunctionForwarder);
         LOG.debug("Deleting Rendered Service Paths {}", rspNames);

diff --git a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionListener.java b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionListener.java
index c0cb7a3912548439fbd25c80a7b7cf6f2e9a0ff3..a7202508e1de326259405be10ced66a759be2880 100644 (file)
--- a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionListener.java
+++ b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionListener.java
@@ -72,7 +72,8 @@ public class ServiceFunctionListener extends AbstractSyncDataTreeChangeListener<
     }
 
     @Override
-    public void update(@Nonnull ServiceFunction originalServiceFunction, ServiceFunction updatedServiceFunction) {
+    public void update(@Nonnull ServiceFunction originalServiceFunction,
+                       @Nonnull ServiceFunction updatedServiceFunction) {
         LOG.debug("update:Updating Service Function: {}", originalServiceFunction.getName());
 
         if (!compareSfs(originalServiceFunction, updatedServiceFunction)) {
@@ -91,10 +92,9 @@ public class ServiceFunctionListener extends AbstractSyncDataTreeChangeListener<
         }
     }
 
-    private boolean compareSfs(ServiceFunction originalServiceFunction, ServiceFunction serviceFunction) {
-        //
+    private boolean compareSfs(@Nonnull ServiceFunction originalServiceFunction,
+                               @Nonnull ServiceFunction serviceFunction) {
         // Compare SFF IP Mgmt Addresses
-        //
         if (serviceFunction.getIpMgmtAddress() != null && originalServiceFunction.getIpMgmtAddress() != null) {
             if (!serviceFunction.getIpMgmtAddress().toString()
                     .equals(originalServiceFunction.getIpMgmtAddress().toString())) {
@@ -108,18 +108,14 @@ public class ServiceFunctionListener extends AbstractSyncDataTreeChangeListener<
             return false;
         }
 
-        //
         // Compare SF Types
-        //
         if (!serviceFunction.getType().getValue().equals(originalServiceFunction.getType().getValue())) {
             LOG.info("compareSFs: SF type changed orig [{}] new [{}]", originalServiceFunction.getType().getValue(),
                      serviceFunction.getType().getValue());
             return false;
         }
 
-        //
         // Compare SF DPLs
-        //
         List<SfDataPlaneLocator> origSfDplList = originalServiceFunction.getSfDataPlaneLocator();
         List<SfDataPlaneLocator> sfDplList = serviceFunction.getSfDataPlaneLocator();
 

diff --git a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionSchedulerTypeListener.java b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionSchedulerTypeListener.java
index 78b075db8ef2052260af9ac49d5ab9b545b6137a..e4f82e093de4538bf838c7f04bd3a64c1c27348d 100644 (file)
--- a/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionSchedulerTypeListener.java
+++ b/sfc-provider/src/main/java/org/opendaylight/sfc/provider/listeners/ServiceFunctionSchedulerTypeListener.java
@@ -72,7 +72,7 @@ public class ServiceFunctionSchedulerTypeListener extends
     // SF Scheduler Type UPDATE
     @Override
     public void update(@Nonnull ServiceFunctionSchedulerType originalServiceFunctionSchedulerType,
-                       ServiceFunctionSchedulerType updatedServiceFunctionSchedulerType) {
+                       @Nonnull ServiceFunctionSchedulerType updatedServiceFunctionSchedulerType) {
         if (originalServiceFunctionSchedulerType.getType() != null
                 && updatedServiceFunctionSchedulerType.getType() != null && originalServiceFunctionSchedulerType
                 .getType().equals(updatedServiceFunctionSchedulerType.getType())) {