Migrate to Objects.requireNonNull()

Fix up final violations reported by modernizer and flip it on. Also
turn a few obvious uses to the proper guards -- i.e. use the return
value of requireNonNull().

Change-Id: I7e3e814219a08357c5f4bc87e7b125173743379a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 9843400c1e74e6c557814a0d437e46ec1fe413aa..0610ae17d1c4b7716ecfd191cd395a6db83b475b 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -25,11 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: ovsdb :: ${project.artifactId}</name>
 
-  <properties>
-    <!-- FIXME: Remove this -->
-    <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
index 03fa9a6b57e7081e9c82158e515f2b80d355156f..e664a46f0063ccbf6b5e18ae179711464da12622 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.ovsdb.hwvtepsouthbound;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -292,7 +291,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
     }
 
     public HwvtepConnectionInstance getConnectionInstance(final Node node) {
-        Preconditions.checkNotNull(node);
+        requireNonNull(node);
         HwvtepGlobalAugmentation hwvtepGlobal = node.augmentation(HwvtepGlobalAugmentation.class);
         PhysicalSwitchAugmentation switchNode = node.augmentation(PhysicalSwitchAugmentation.class);
         if (hwvtepGlobal != null) {
@@ -383,7 +382,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
-    private void registerCallbacks(HwvtepConnectionInstance hwvtepConnectionInstance) {
+    private void registerCallbacks(final HwvtepConnectionInstance hwvtepConnectionInstance) {
         LOG.info("HWVTEP entity {} is owned by this controller registering callbacks",
                 hwvtepConnectionInstance.getConnectionInfo());
         try {
@@ -400,7 +399,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
     }
 
 
-    private void registerEntityForOwnership(HwvtepConnectionInstance hwvtepConnectionInstance) {
+    private void registerEntityForOwnership(final HwvtepConnectionInstance hwvtepConnectionInstance) {
 
         Entity candidateEntity = getEntityFromConnectionInstance(hwvtepConnectionInstance);
         if (entityConnectionMap.get(candidateEntity) != null) {
@@ -533,7 +532,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
     }
 
     private void retryConnection(final InstanceIdentifier<Node> iid, final HwvtepGlobalAugmentation hwvtepNode,
-                                 ConnectionReconciliationTriggers trigger) {
+                                 final ConnectionReconciliationTriggers trigger) {
         if (hwvtepNode == null) {
             //switch initiated connection
             return;
@@ -719,7 +718,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
         return Collections.unmodifiableMap(nodeIidVsConnectionInstance);
     }
 
-    public void cleanupOperationalNode(InstanceIdentifier<Node> nodeIid) {
+    public void cleanupOperationalNode(final InstanceIdentifier<Node> nodeIid) {
         txInvoker.invoke(new HwvtepGlobalRemoveCommand(nodeIid));
     }
 }

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java
index a64d2120bff05b4461b5f353a817093a1536e58b..af7298039be9bc0a387af99cfe96219aca422c12 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java
@@ -5,11 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.ovsdb.hwvtepsouthbound;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableBiMap;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.net.InetAddresses;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -223,16 +222,12 @@ public final class HwvtepSouthboundMapper {
                 .build();
     }
 
-
     public static Class<? extends EncapsulationTypeBase> createEncapsulationType(String type) {
-        Preconditions.checkNotNull(type);
-        if (type.isEmpty()) {
+        if (requireNonNull(type).isEmpty()) {
             return EncapsulationTypeVxlanOverIpv4.class;
-        } else {
-            ImmutableBiMap<String, Class<? extends EncapsulationTypeBase>> mapper =
-                    HwvtepSouthboundConstants.ENCAPS_TYPE_MAP.inverse();
-            return mapper.get(type);
         }
+
+        return HwvtepSouthboundConstants.ENCAPS_TYPE_MAP.inverse().get(type);
     }
 
     public static TerminationPointKey getTerminationPointKey(PhysicalLocator physicalLocator) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java
index e5ff0cddd8abc54b1716e7b15662de7d49fb53b4..8a1d3098f0254829f6521eb8a8bb2ab7a91a991f 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.ovsdb.hwvtepsouthbound;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.Collection;
 import java.util.Map;
@@ -139,9 +140,8 @@ public final class HwvtepSouthboundUtil {
 
     public static Optional<HwvtepGlobalAugmentation> getManagingNode(DataBroker db,
                     HwvtepPhysicalSwitchAttributes node) {
-        Preconditions.checkNotNull(node);
         Optional<HwvtepGlobalAugmentation> result = null;
-        HwvtepGlobalRef ref = node.getManagedBy();
+        HwvtepGlobalRef ref = requireNonNull(node).getManagedBy();
         if (ref != null && ref.getValue() != null) {
             result = getManagingNode(db, ref);
         } else {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java
index 056c626c9419657c331f76df4c3e8e1058cb2705..c4a6ff9b91dc9838a3df0b4d805e3b96ca8c1840 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager;
 import org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation.connection.ConnectionReconciliationTask;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Copied from org.opendaylight.ovsdb.southbound.reconciliation.ReconciliationTask
@@ -25,9 +24,6 @@ import org.slf4j.LoggerFactory;
  * Created by Anil Vishnoi (avishnoi@Brocade.com) on 3/9/16.
  */
 public abstract class ReconciliationTask implements Runnable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ReconciliationTask.class);
-
     protected final ReconciliationManager reconciliationManager;
     protected final HwvtepConnectionManager connectionManager;
     protected final InstanceIdentifier<?> nodeIid;
@@ -36,12 +32,9 @@ public abstract class ReconciliationTask implements Runnable {
     protected ReconciliationTask(ReconciliationManager reconciliationManager, HwvtepConnectionManager connectionManager,
                                  InstanceIdentifier<?> nodeIid,
                                  DataObject configData) {
-        Preconditions.checkNotNull(reconciliationManager, "Reconciliation manager must not be null");
-        Preconditions.checkNotNull(connectionManager, "Connection manager must not be null");
-        Preconditions.checkNotNull(nodeIid, "Node Iid must not be null");
-        this.reconciliationManager = reconciliationManager;
-        this.connectionManager = connectionManager;
-        this.nodeIid = nodeIid;
+        this.reconciliationManager = requireNonNull(reconciliationManager, "Reconciliation manager must not be null");
+        this.connectionManager = requireNonNull(connectionManager, "Connection manager must not be null");
+        this.nodeIid = requireNonNull(nodeIid, "Node Iid must not be null");
         this.configData = configData;
     }
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java
index 6c135470b57c497a25618f65eb11ab9d970699cc..12fcf5f87d76b66b2722efbf266e07003e0c74b7 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.ovsdb.hwvtepsouthbound.transact;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -183,8 +183,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<HwvtepGlobalAugmentation> getHwvtepGlobalAugmentation(final InstanceIdentifier<?> iid) {
-        Preconditions.checkNotNull(iid);
-        Optional<Node> nodeOptional = getGlobalNode(iid);
+        Optional<Node> nodeOptional = getGlobalNode(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             return Optional.ofNullable(nodeOptional.get().augmentation(HwvtepGlobalAugmentation.class));
         }
@@ -192,8 +191,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<PhysicalSwitchAugmentation> getPhysicalSwitchAugmentation(final InstanceIdentifier<?> iid) {
-        Preconditions.checkNotNull(iid);
-        Optional<Node> nodeOptional = getGlobalNode(iid);
+        Optional<Node> nodeOptional = getGlobalNode(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             return Optional.ofNullable(nodeOptional.get().augmentation(PhysicalSwitchAugmentation.class));
         }
@@ -202,8 +200,7 @@ public class HwvtepOperationalState {
 
     public Optional<Map<TerminationPointKey, TerminationPoint>> getTerminationPointList(
             final InstanceIdentifier<?> iid) {
-        Preconditions.checkNotNull(iid);
-        Optional<Node> nodeOptional = getGlobalNode(iid);
+        Optional<Node> nodeOptional = getGlobalNode(requireNonNull(iid));
         if (nodeOptional.isPresent() && nodeOptional.get().getTerminationPoint() != null) {
             return Optional.ofNullable(nodeOptional.get().getTerminationPoint());
         }
@@ -212,8 +209,7 @@ public class HwvtepOperationalState {
 
     public Optional<LogicalSwitches> getLogicalSwitches(final InstanceIdentifier<?> iid,
             final LogicalSwitchesKey logicalSwitchesKey) {
-        Preconditions.checkNotNull(iid);
-        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(iid);
+        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             LogicalSwitches lswitch = nodeOptional.get().nonnullLogicalSwitches().get(logicalSwitchesKey);
             if (lswitch != null) {
@@ -228,8 +224,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<Tunnels> getTunnels(final InstanceIdentifier<?> iid, final TunnelsKey tunnelsKey) {
-        Preconditions.checkNotNull(iid);
-        Optional<PhysicalSwitchAugmentation> psOptional = getPhysicalSwitchAugmentation(iid);
+        Optional<PhysicalSwitchAugmentation> psOptional = getPhysicalSwitchAugmentation(requireNonNull(iid));
         if (psOptional.isPresent()) {
             Tunnels tunnel = psOptional.get().nonnullTunnels().get(tunnelsKey);
             if (tunnel != null) {
@@ -246,8 +241,8 @@ public class HwvtepOperationalState {
 
     public Optional<HwvtepPhysicalPortAugmentation> getPhysicalPortAugmentation(final InstanceIdentifier<?> iid,
             final HwvtepNodeName hwvtepNodeName) {
-        Preconditions.checkNotNull(iid);
-        Optional<Map<TerminationPointKey, TerminationPoint>> nodeOptional = getTerminationPointList(iid);
+        Optional<Map<TerminationPointKey, TerminationPoint>> nodeOptional =
+                getTerminationPointList(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             for (TerminationPoint tp : nodeOptional.get().values()) {
                 HwvtepPhysicalPortAugmentation hppAugmentation =
@@ -262,8 +257,8 @@ public class HwvtepOperationalState {
 
     public Optional<HwvtepPhysicalLocatorAugmentation> getPhysicalLocatorAugmentation(final InstanceIdentifier<?> iid,
             final IpAddress dstIp, final Class<? extends EncapsulationTypeBase> encapType) {
-        Preconditions.checkNotNull(iid);
-        Optional<Map<TerminationPointKey, TerminationPoint>> nodeOptional = getTerminationPointList(iid);
+        Optional<Map<TerminationPointKey, TerminationPoint>> nodeOptional =
+                getTerminationPointList(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             for (TerminationPoint tp : nodeOptional.get().values()) {
                 HwvtepPhysicalLocatorAugmentation hppAugmentation =
@@ -288,8 +283,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<LocalMcastMacs> getLocalMcastMacs(final InstanceIdentifier<?> iid, final LocalMcastMacsKey key) {
-        Preconditions.checkNotNull(iid);
-        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(iid);
+        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             LocalMcastMacs mac = nodeOptional.get().nonnullLocalMcastMacs().get(key);
             if (mac != null) {
@@ -300,8 +294,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<RemoteMcastMacs> getRemoteMcastMacs(final InstanceIdentifier<?> iid, final RemoteMcastMacsKey key) {
-        Preconditions.checkNotNull(iid);
-        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(iid);
+        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             RemoteMcastMacs mac = nodeOptional.get().nonnullRemoteMcastMacs().get(key);
             if (mac != null) {
@@ -312,8 +305,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<LocalUcastMacs> getLocalUcastMacs(final InstanceIdentifier<?> iid, final LocalUcastMacsKey key) {
-        Preconditions.checkNotNull(iid);
-        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(iid);
+        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             LocalUcastMacs mac = nodeOptional.get().nonnullLocalUcastMacs().get(key);
             if (mac != null) {
@@ -324,8 +316,7 @@ public class HwvtepOperationalState {
     }
 
     public Optional<RemoteUcastMacs> getRemoteUcastMacs(final InstanceIdentifier<?> iid, final RemoteUcastMacsKey key) {
-        Preconditions.checkNotNull(iid);
-        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(iid);
+        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             RemoteUcastMacs mac = nodeOptional.get().nonnullRemoteUcastMacs().get(key);
             if (mac != null) {
@@ -337,8 +328,7 @@ public class HwvtepOperationalState {
 
     public Optional<LogicalRouters> getLogicalRouters(final InstanceIdentifier<?> iid,
             final LogicalRoutersKey logicalRoutersKey) {
-        Preconditions.checkNotNull(iid);
-        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(iid);
+        Optional<HwvtepGlobalAugmentation> nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid));
         if (nodeOptional.isPresent()) {
             LogicalRouters lrouter = nodeOptional.get().nonnullLogicalRouters().get(logicalRoutersKey);
             if (lrouter != null) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java
index 5401c95f9e8b7200133572ae6aa61878e7dd1c7e..12a355e3be05e15afe5983c703ea7d1bef074ac6 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -326,8 +327,8 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
 
     private List<InstanceIdentifier<PortFaultStatus>> getPortFaultStatusToRemove(
             final InstanceIdentifier<TerminationPoint> tpPath, final PhysicalPort port) {
-        Preconditions.checkNotNull(tpPath);
-        Preconditions.checkNotNull(port);
+        requireNonNull(tpPath);
+        requireNonNull(port);
         List<InstanceIdentifier<PortFaultStatus>> result = new ArrayList<>();
         PhysicalPort oldPort = oldPPRows.get(port.getUuid());
         if (oldPort != null && oldPort.getPortFaultStatusColumn() != null) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java
index d81c56ef846b165ac7438d75c1109328f984dc2e..1295604b36d107f933c74ffab98a8ce5c315f877 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -238,8 +239,8 @@ public class HwvtepPhysicalSwitchUpdateCommand extends AbstractTransactionComman
 
     private List<InstanceIdentifier<SwitchFaultStatus>> getSwitchFaultStatusToRemove(InstanceIdentifier<Node> psIid,
             PhysicalSwitch phySwitch) {
-        Preconditions.checkNotNull(psIid);
-        Preconditions.checkNotNull(phySwitch);
+        requireNonNull(psIid);
+        requireNonNull(phySwitch);
         List<InstanceIdentifier<SwitchFaultStatus>> result = new ArrayList<>();
         PhysicalSwitch oldSwitch = oldPSRows.get(phySwitch.getUuid());
         if (oldSwitch != null && oldSwitch.getSwitchFaultStatusColumn() != null) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java
index 977e5865b6a622acd38f8e13aa64f81df762a4c2..bc5414a914ab88858e0559ff2c0565553f94ce03 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -72,8 +72,8 @@ public class HwvtepTunnelUpdateCommand extends AbstractTransactionCommand {
     }
 
     private void updateTunnel(ReadWriteTransaction transaction, Tunnel tunnel) {
-        Preconditions.checkNotNull(tunnel.getLocalColumn().getData());
-        Preconditions.checkNotNull(tunnel.getRemoteColumn().getData());
+        final UUID localData = requireNonNull(tunnel.getLocalColumn().getData());
+        final UUID remoteData = requireNonNull(tunnel.getRemoteColumn().getData());
         final InstanceIdentifier<Node> connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier();
         //TODO remove these reads
         Optional<Node> connection = HwvtepSouthboundUtil.readNode(transaction, connectionIId);
@@ -90,9 +90,9 @@ public class HwvtepTunnelUpdateCommand extends AbstractTransactionCommand {
         if (connection.isPresent() && tunnelIid != null) {
             TunnelsBuilder builder = new TunnelsBuilder();
             builder.setLocalLocatorRef(new HwvtepPhysicalLocatorRef(getPhysicalLocatorRefFromUUID(
-                    getOvsdbConnectionInstance().getInstanceIdentifier(), tunnel.getLocalColumn().getData())));
+                    getOvsdbConnectionInstance().getInstanceIdentifier(), localData)));
             builder.setRemoteLocatorRef(new HwvtepPhysicalLocatorRef(getPhysicalLocatorRefFromUUID(
-                    getOvsdbConnectionInstance().getInstanceIdentifier(), tunnel.getRemoteColumn().getData())));
+                    getOvsdbConnectionInstance().getInstanceIdentifier(), remoteData)));
             builder.setTunnelUuid(new Uuid(tunnel.getUuid().toString()));
             setBfdLocalConfigs(builder, tunnel);
             setBfdRemoteConfigs(builder, tunnel);