Handle nullable lists

[genius.git] / alivenessmonitor / alivenessmonitor-impl / src / main / java / org / opendaylight / genius / alivenessmonitor / internal / HwVtepTunnelsStateHandler.java

diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/HwVtepTunnelsStateHandler.java b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/HwVtepTunnelsStateHandler.java
index a9760aac1c8a070e38190579ecaa5bba981e86c2..93c33218daf9b511cde46ea6d990927bb4a7b41c 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/HwVtepTunnelsStateHandler.java
+++ b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/HwVtepTunnelsStateHandler.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.genius.alivenessmonitor.internal;
 
-import static org.opendaylight.genius.alivenessmonitor.internal.AlivenessMonitorUtil.getMonitorStateId;
+import static org.opendaylight.genius.alivenessmonitor.utils.AlivenessMonitorUtil.getMonitorStateId;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
@@ -29,10 +29,10 @@ import org.opendaylight.genius.alivenessmonitor.protocols.AlivenessProtocolHandl
 import org.opendaylight.genius.alivenessmonitor.protocols.AlivenessProtocolHandlerRegistry;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
-import org.opendaylight.genius.tools.mdsal.listener.AbstractSyncDataTreeChangeListener;
 import org.opendaylight.openflowplugin.libraries.liblldp.Packet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.EtherTypes;
+import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractSyncDataTreeChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.LivenessState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProtocolType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.endpoint.EndpointType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.endpoint.endpoint.type.Interface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor.configs.MonitoringInfo;
@@ -82,7 +82,7 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
                       .augmentation(PhysicalSwitchAugmentation.class).child(Tunnels.class));
         this.dataBroker = dataBroker;
         this.alivenessMonitor = alivenessMonitor;
-        alivenessProtocolHandlerRegistry.register(EtherTypes.Bfd, this);
+        alivenessProtocolHandlerRegistry.register(MonitorProtocolType.Bfd, this);
     }
 
     @Override
@@ -182,9 +182,9 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
             return livenessState;
         }
         for (BfdStatus bfdState : tunnelBfdStatus) {
-            if (bfdState.getBfdStatusKey().equalsIgnoreCase(AlivenessMonitorConstants.BFD_OP_STATE)) {
+            if (AlivenessMonitorConstants.BFD_OP_STATE.equalsIgnoreCase(bfdState.getBfdStatusKey())) {
                 String bfdOpState = bfdState.getBfdStatusValue();
-                if (bfdOpState.equalsIgnoreCase(AlivenessMonitorConstants.BFD_STATE_UP)) {
+                if (AlivenessMonitorConstants.BFD_STATE_UP.equalsIgnoreCase(bfdOpState)) {
                     livenessState = LivenessState.Up;
                 } else {
                     livenessState = LivenessState.Down;
@@ -240,13 +240,13 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
         Iterator<BfdParams> tunnelBfdParamsIterator = tunnelBfdParams.iterator();
         while (tunnelBfdParamsIterator.hasNext()) {
             BfdParams bfdParam = tunnelBfdParamsIterator.next();
-            if (bfdParam.getBfdParamKey().equals(AlivenessMonitorConstants.BFD_PARAM_ENABLE)) {
+            if (AlivenessMonitorConstants.BFD_PARAM_ENABLE.equals(bfdParam.getBfdParamKey())) {
                 tunnelBfdParamsIterator.remove();
                 break;
             }
         }
         setBfdParamForEnable(tunnelBfdParams, isEnable);
-        Tunnels tunnelWithBfdReset = new TunnelsBuilder().setKey(tunnelKey).setBfdParams(tunnelBfdParams).build();
+        Tunnels tunnelWithBfdReset = new TunnelsBuilder().withKey(tunnelKey).setBfdParams(tunnelBfdParams).build();
         MDSALUtil.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION,
                 getTunnelIdentifier(topologyId, nodeId, tunnelKey), tunnelWithBfdReset);
     }
@@ -283,10 +283,10 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
         fillBfdLocalConfigs(bfdLocalConfigs, tunnelLocalMacAddress, tunnelLocalIpAddress);
         List<BfdRemoteConfigs> bfdRemoteConfigs = new ArrayList<>();
         fillBfdRemoteConfigs(bfdRemoteConfigs, tunnelRemoteMacAddress);
-        // tunnelKey is initialized to null and passed to setKey which FindBugs flags as a
+        // tunnelKey is initialized to null and passed to withKey which FindBugs flags as a
         // "Load of known null value" violation. Not sure sure what the intent is...
         //TunnelsKey tunnelKey = null;
-        Tunnels tunnelWithBfd = new TunnelsBuilder().setKey(/*tunnelKey*/ null).setBfdParams(bfdParams)
+        Tunnels tunnelWithBfd = new TunnelsBuilder().withKey(/*tunnelKey*/ null).setBfdParams(bfdParams)
                 .setBfdLocalConfigs(bfdLocalConfigs).setBfdRemoteConfigs(bfdRemoteConfigs).build();
         // TODO: get the following parameters from the interface and use it to
         // update hwvtep datastore
@@ -309,7 +309,7 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
 
     private BfdRemoteConfigs getBfdRemoteConfig(String key, String value) {
         return new BfdRemoteConfigsBuilder().setBfdRemoteConfigKey(key).setBfdRemoteConfigValue(value)
-                .setKey(new BfdRemoteConfigsKey(key)).build();
+                .withKey(new BfdRemoteConfigsKey(key)).build();
     }
 
     private void fillBfdLocalConfigs(List<BfdLocalConfigs> bfdLocalConfigs, String tunnelLocalMacAddress,
@@ -319,7 +319,7 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
     }
 
     private BfdLocalConfigs getBfdLocalConfig(String key, String value) {
-        return new BfdLocalConfigsBuilder().setBfdLocalConfigKey(key).setKey(new BfdLocalConfigsKey(key))
+        return new BfdLocalConfigsBuilder().setBfdLocalConfigKey(key).withKey(new BfdLocalConfigsKey(key))
                 .setBfdLocalConfigValue(value).build();
     }
 
@@ -339,7 +339,8 @@ public class HwVtepTunnelsStateHandler extends AbstractSyncDataTreeChangeListene
     }
 
     private BfdParams getBfdParams(String key, String value) {
-        return new BfdParamsBuilder().setBfdParamKey(key).setKey(new BfdParamsKey(key)).setBfdParamValue(value).build();
+        return new BfdParamsBuilder().setBfdParamKey(key).withKey(new BfdParamsKey(key)).setBfdParamValue(value)
+                .build();
     }
 
     @Override