From f67d8418a435af556edb5fb23ea282cbcf0216d1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 16 Oct 2020 11:02:19 +0200 Subject: [PATCH] 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 --- .../hwvtepsouthbound-impl/pom.xml | 5 --- .../HwvtepConnectionManager.java | 13 +++--- .../HwvtepSouthboundMapper.java | 15 +++---- .../HwvtepSouthboundUtil.java | 6 +-- .../reconciliation/ReconciliationTask.java | 17 +++----- .../transact/HwvtepOperationalState.java | 42 +++++++------------ .../md/HwvtepPhysicalPortUpdateCommand.java | 7 ++-- .../md/HwvtepPhysicalSwitchUpdateCommand.java | 7 ++-- .../md/HwvtepTunnelUpdateCommand.java | 12 +++--- 9 files changed, 49 insertions(+), 75 deletions(-) diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml index 9843400c1..0610ae17d 100644 --- 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. --> ODL :: ovsdb :: ${project.artifactId} - - - false - - org.osgi 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 03fa9a6b5..e664a46f0 100644 --- 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 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 nodeIid) { + public void cleanupOperationalNode(final InstanceIdentifier 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 a64d2120b..af7298039 100644 --- 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 createEncapsulationType(String type) { - Preconditions.checkNotNull(type); - if (type.isEmpty()) { + if (requireNonNull(type).isEmpty()) { return EncapsulationTypeVxlanOverIpv4.class; - } else { - ImmutableBiMap> 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 e5ff0cddd..8a1d3098f 100644 --- 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 getManagingNode(DataBroker db, HwvtepPhysicalSwitchAttributes node) { - Preconditions.checkNotNull(node); Optional 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 056c626c9..c4a6ff9b9 100644 --- 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 6c135470b..12fcf5f87 100644 --- 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 getHwvtepGlobalAugmentation(final InstanceIdentifier iid) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getGlobalNode(iid); + Optional nodeOptional = getGlobalNode(requireNonNull(iid)); if (nodeOptional.isPresent()) { return Optional.ofNullable(nodeOptional.get().augmentation(HwvtepGlobalAugmentation.class)); } @@ -192,8 +191,7 @@ public class HwvtepOperationalState { } public Optional getPhysicalSwitchAugmentation(final InstanceIdentifier iid) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getGlobalNode(iid); + Optional nodeOptional = getGlobalNode(requireNonNull(iid)); if (nodeOptional.isPresent()) { return Optional.ofNullable(nodeOptional.get().augmentation(PhysicalSwitchAugmentation.class)); } @@ -202,8 +200,7 @@ public class HwvtepOperationalState { public Optional> getTerminationPointList( final InstanceIdentifier iid) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getGlobalNode(iid); + Optional 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 getLogicalSwitches(final InstanceIdentifier iid, final LogicalSwitchesKey logicalSwitchesKey) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getHwvtepGlobalAugmentation(iid); + Optional 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 getTunnels(final InstanceIdentifier iid, final TunnelsKey tunnelsKey) { - Preconditions.checkNotNull(iid); - Optional psOptional = getPhysicalSwitchAugmentation(iid); + Optional 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 getPhysicalPortAugmentation(final InstanceIdentifier iid, final HwvtepNodeName hwvtepNodeName) { - Preconditions.checkNotNull(iid); - Optional> nodeOptional = getTerminationPointList(iid); + Optional> nodeOptional = + getTerminationPointList(requireNonNull(iid)); if (nodeOptional.isPresent()) { for (TerminationPoint tp : nodeOptional.get().values()) { HwvtepPhysicalPortAugmentation hppAugmentation = @@ -262,8 +257,8 @@ public class HwvtepOperationalState { public Optional getPhysicalLocatorAugmentation(final InstanceIdentifier iid, final IpAddress dstIp, final Class encapType) { - Preconditions.checkNotNull(iid); - Optional> nodeOptional = getTerminationPointList(iid); + Optional> nodeOptional = + getTerminationPointList(requireNonNull(iid)); if (nodeOptional.isPresent()) { for (TerminationPoint tp : nodeOptional.get().values()) { HwvtepPhysicalLocatorAugmentation hppAugmentation = @@ -288,8 +283,7 @@ public class HwvtepOperationalState { } public Optional getLocalMcastMacs(final InstanceIdentifier iid, final LocalMcastMacsKey key) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getHwvtepGlobalAugmentation(iid); + Optional 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 getRemoteMcastMacs(final InstanceIdentifier iid, final RemoteMcastMacsKey key) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getHwvtepGlobalAugmentation(iid); + Optional 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 getLocalUcastMacs(final InstanceIdentifier iid, final LocalUcastMacsKey key) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getHwvtepGlobalAugmentation(iid); + Optional 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 getRemoteUcastMacs(final InstanceIdentifier iid, final RemoteUcastMacsKey key) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getHwvtepGlobalAugmentation(iid); + Optional 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 getLogicalRouters(final InstanceIdentifier iid, final LogicalRoutersKey logicalRoutersKey) { - Preconditions.checkNotNull(iid); - Optional nodeOptional = getHwvtepGlobalAugmentation(iid); + Optional 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 5401c95f9..12a355e3b 100644 --- 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> getPortFaultStatusToRemove( final InstanceIdentifier tpPath, final PhysicalPort port) { - Preconditions.checkNotNull(tpPath); - Preconditions.checkNotNull(port); + requireNonNull(tpPath); + requireNonNull(port); List> 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 d81c56ef8..1295604b3 100644 --- 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> getSwitchFaultStatusToRemove(InstanceIdentifier psIid, PhysicalSwitch phySwitch) { - Preconditions.checkNotNull(psIid); - Preconditions.checkNotNull(phySwitch); + requireNonNull(psIid); + requireNonNull(phySwitch); List> 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 977e5865b..bc5414a91 100644 --- 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 connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier(); //TODO remove these reads Optional 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); -- 2.36.6