From: Stephen Kitt Date: Thu, 21 Mar 2019 15:00:22 +0000 (+0100) Subject: Avoid comparing objects using == X-Git-Tag: release/sodium~65 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5d982ffe0b2e81609d8e90698fbf4812ac336678;p=netvirt.git Avoid comparing objects using == A number of BigInteger instances are compared using == or !=; this patch uses .equals() or variants thereof instead. Change-Id: I3ac654b0dd5d255304bca93d6fbc4cdbfec05514 Signed-off-by: Stephen Kitt --- diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java index 05b5b1af09..afe659fff5 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java @@ -510,7 +510,7 @@ public class BaseVrfEntryHandler implements AutoCloseable { vrfEntry.getDestPrefix(), vpnId, localDpnId, remoteDpnId); String rd = vrfTableKey.getRouteDistinguisher(); - if (localDpnId != null && localDpnId != BigInteger.ZERO) { + if (localDpnId != null && !BigInteger.ZERO.equals(localDpnId)) { // localDpnId is not known when clean up happens for last vm for a vpn on a dpn if (extraRouteOptional.isPresent()) { nextHopManager.deleteLoadBalancingNextHop(vpnId, remoteDpnId, vrfEntry.getDestPrefix()); diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java index 1c0d62db6d..59fdbf1e2c 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java @@ -347,7 +347,7 @@ public class BgpRouteVrfEntryHandler extends BaseVrfEntryHandler vrfEntry.getDestPrefix(), vpnId, localDpnId, remoteDpnId); String rd = vrfTableKey.getRouteDistinguisher(); - if (localDpnId != null && localDpnId != BigInteger.ZERO) { + if (localDpnId != null && !BigInteger.ZERO.equals(localDpnId)) { // localDpnId is not known when clean up happens for last vm for a vpn on a dpn if (extraRouteOptional.isPresent()) { nexthopManager.deleteLoadBalancingNextHop(vpnId, remoteDpnId, vrfEntry.getDestPrefix()); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java index 1b326d2e5c..b262e4d4cc 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java @@ -11,8 +11,8 @@ package org.opendaylight.netvirt.natservice.ha; import static org.opendaylight.genius.infra.Datastore.CONFIGURATION; import java.math.BigInteger; - import java.time.Duration; +import java.util.Objects; import java.util.concurrent.ExecutionException; import javax.annotation.PostConstruct; import javax.inject.Inject; @@ -98,7 +98,7 @@ public class SnatCentralizedSwitchChangeListener ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> { Routers origRouter = NatUtil.getRoutersFromConfigDS(confTx, origRouterToNaptSwitch.getRouterName()); Routers updatedRouter = NatUtil.getRoutersFromConfigDS(confTx, updatedRouterToNaptSwitch.getRouterName()); - if (origPrimarySwitchId != updatedPrimarySwitchId) { + if (!Objects.equals(origPrimarySwitchId, updatedPrimarySwitchId)) { if (origRouter != null) { snatServiceManger.notify(confTx, origRouter, null, origPrimarySwitchId, null, SnatServiceManager.Action.CNT_ROUTER_ALL_SWITCH_DISBL); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java index 86bf977355..d0db56e018 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java @@ -12,7 +12,6 @@ import static org.opendaylight.genius.infra.Datastore.CONFIGURATION; import static org.opendaylight.genius.infra.Datastore.OPERATIONAL; import com.google.common.base.Optional; - import java.math.BigInteger; import java.util.ArrayList; import java.util.HashMap; @@ -22,11 +21,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; - import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; @@ -94,7 +91,7 @@ public class WeightedCentralizedSwitchScheduler implements CentralizedSwitchSche public boolean scheduleCentralizedSwitch(Routers router) { String providerNet = NatUtil.getElanInstancePhysicalNetwok(router.getNetworkId().getValue(),dataBroker); BigInteger nextSwitchId = getSwitchWithLowestWeight(providerNet); - if (nextSwitchId == BigInteger.valueOf(0)) { + if (BigInteger.ZERO.equals(nextSwitchId)) { LOG.error("In scheduleCentralizedSwitch, unable to schedule the router {} as there is no available switch.", router.getRouterName()); return false; @@ -158,7 +155,7 @@ public class WeightedCentralizedSwitchScheduler implements CentralizedSwitchSche String providerNet = NatUtil.getElanInstancePhysicalNetwok(router.getNetworkId().getValue(),dataBroker); String routerName = router.getRouterName(); BigInteger primarySwitchId = NatUtil.getPrimaryNaptfromRouterName(dataBroker, routerName); - if (primarySwitchId == null || primarySwitchId == BigInteger.valueOf(0)) { + if (primarySwitchId == null || BigInteger.ZERO.equals(primarySwitchId)) { LOG.info("releaseCentralizedSwitch: NAPT Switch is not allocated for router {}", router.getRouterName()); return false; } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java index ed0b368c97..9d5a520308 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java @@ -216,7 +216,7 @@ public abstract class AbstractSnatService implements SnatServiceListener { List switches = naptSwitchSelector.getDpnsForVpn(routerName); addCentralizedRouter(confTx, routers, primarySwitchId, primarySwitchId); for (BigInteger dpnId : switches) { - if (primarySwitchId != dpnId) { + if (!Objects.equals(primarySwitchId, dpnId)) { addCentralizedRouter(confTx, routers, primarySwitchId, dpnId); } } @@ -237,7 +237,7 @@ public abstract class AbstractSnatService implements SnatServiceListener { String routerName = routers.getRouterName(); List switches = naptSwitchSelector.getDpnsForVpn(routerName); for (BigInteger dpnId : switches) { - if (primarySwitchId != dpnId) { + if (!Objects.equals(primarySwitchId, dpnId)) { removeCentralizedRouter(confTx, routers, primarySwitchId, dpnId); } } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/Ipv6ForwardingService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/Ipv6ForwardingService.java index f60c274a36..dfe21c9d59 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/Ipv6ForwardingService.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/Ipv6ForwardingService.java @@ -14,6 +14,7 @@ import static org.opendaylight.netvirt.natservice.internal.NatUtil.getGroupIdKey import java.math.BigInteger; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -101,7 +102,7 @@ public class Ipv6ForwardingService implements SnatServiceListener { */ addCentralizedRouter(confTx, routers, primarySwitchId, primarySwitchId); for (BigInteger dpnId : switches) { - if (primarySwitchId != dpnId) { + if (!Objects.equals(primarySwitchId, dpnId)) { addCentralizedRouter(confTx, routers, primarySwitchId, dpnId); } } @@ -160,7 +161,7 @@ public class Ipv6ForwardingService implements SnatServiceListener { */ removeCentralizedRouter(confTx, routers, primarySwitchId, primarySwitchId); for (BigInteger dpnId : switches) { - if (primarySwitchId != dpnId) { + if (!Objects.equals(primarySwitchId, dpnId)) { removeCentralizedRouter(confTx, routers, primarySwitchId, dpnId); } } @@ -220,7 +221,7 @@ public class Ipv6ForwardingService implements SnatServiceListener { if (!routerHasIpv6ExtSubnet(origRouter) && routerHasIpv6ExtSubnet(updatedRouter)) { List switches = naptSwitchSelector.getDpnsForVpn(routerName); for (BigInteger dpnId : switches) { - if (primarySwitchId != dpnId) { + if (!Objects.equals(primarySwitchId, dpnId)) { LOG.info("handleRouterUpdate (non-NAPTSwitch) : Installing flows on switch {} for router {}", dpnId, routerName); addIpv6PsNatMissEntryNonNaptSwitch(confTx, dpnId, routerId, routerName,