From e12cd502b4ac8fb898d33a8f4f835cb68afb25a2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 26 Sep 2020 23:39:44 +0200 Subject: [PATCH] Migrate to use Objects.requireNonNull These users of Preconditions.checkNotNull() are pointer out by modernizer, migrate them. Change-Id: I198384e8fc62ed32dc7c2fbba63fb16789bfc993 Signed-off-by: Robert Varga --- .../southbound/OvsdbConnectionManager.java | 4 ++-- .../ovsdb/southbound/SouthboundMapper.java | 17 +++++++---------- .../ovsdb/southbound/SouthboundUtil.java | 5 +++-- .../reconciliation/ReconciliationManager.java | 5 +++-- .../md/OvsdbBridgeUpdateCommand.java | 14 +++++++------- .../md/OvsdbControllerRemovedCommand.java | 11 +++++------ .../md/OvsdbManagersRemovedCommand.java | 16 ++++++++-------- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java index 1d30d7982..8b60bb14a 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java @@ -7,10 +7,10 @@ */ package org.opendaylight.ovsdb.southbound; +import static java.util.Objects.requireNonNull; import static org.opendaylight.ovsdb.lib.operations.Operations.op; import com.google.common.annotations.VisibleForTesting; -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; @@ -347,7 +347,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos } public OvsdbConnectionInstance getConnectionInstance(final Node node) { - Preconditions.checkNotNull(node); + requireNonNull(node); OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); OvsdbBridgeAugmentation ovsdbManagedNode = node.augmentation(OvsdbBridgeAugmentation.class); if (ovsdbNode != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java index 490d815cb..7d17bad3e 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java @@ -7,6 +7,7 @@ */ package org.opendaylight.ovsdb.southbound; +import static java.util.Objects.requireNonNull; import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog; import com.google.common.base.Joiner; @@ -169,7 +170,7 @@ public final class SouthboundMapper { } public static DatapathId createDatapathId(final Bridge bridge) { - Preconditions.checkNotNull(bridge); + requireNonNull(bridge); if (bridge.getDatapathIdColumn() == null) { return null; } else { @@ -178,7 +179,7 @@ public final class SouthboundMapper { } public static DatapathId createDatapathId(final Set dpids) { - Preconditions.checkNotNull(dpids); + requireNonNull(dpids); if (dpids.isEmpty()) { return null; } else { @@ -189,7 +190,7 @@ public final class SouthboundMapper { } public static DatapathId createDatapathId(final String dpid) { - Preconditions.checkNotNull(dpid); + requireNonNull(dpid); DatapathId datapath; if (dpid.matches("^[0-9a-fA-F]{16}")) { Splitter splitter = Splitter.fixedLength(2); @@ -235,15 +236,11 @@ public final class SouthboundMapper { } public static Class createInterfaceType(final String type) { - Preconditions.checkNotNull(type); - return SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.get(type); + return SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.get(requireNonNull(type)); } public static String createOvsdbInterfaceType(final Class mdsaltype) { - Preconditions.checkNotNull(mdsaltype); - ImmutableBiMap, String> mapper = - SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.inverse(); - return mapper.get(mdsaltype); + return SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.inverse().get(requireNonNull(mdsaltype)); } public static List createMdsalProtocols(final Bridge bridge) { @@ -484,7 +481,7 @@ public final class SouthboundMapper { * @return class matching the input QoS type {@link QosTypeBase} */ public static Class createQosType(final String type) { - Preconditions.checkNotNull(type); + requireNonNull(type); if (type.isEmpty()) { LOG.info("QoS type not supplied"); return QosTypeBase.class; diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java index 12c9275bf..3069d356e 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java @@ -7,8 +7,9 @@ */ package org.opendaylight.ovsdb.southbound; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import java.net.InetAddress; import java.net.NetworkInterface; @@ -49,7 +50,7 @@ public final class SouthboundUtil { } public static Optional getManagingNode(DataBroker db, OvsdbBridgeAttributes mn) { - Preconditions.checkNotNull(mn); + requireNonNull(mn); try { OvsdbNodeRef ref = mn.getManagedBy(); if (ref != null && ref.getValue() != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java index 9d824b120..7cd3b0c38 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java @@ -7,7 +7,8 @@ */ package org.opendaylight.ovsdb.southbound.reconciliation; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -151,7 +152,7 @@ public class ReconciliationManager implements AutoCloseable { final OvsdbConnectionInstance connectionInstance, final List bridgeNodes) { LOG.debug("Reconcile Termination Point Configuration for Bridges {}", bridgeNodes); - Preconditions.checkNotNull(bridgeNodes, "Bridge Node list must not be null"); + requireNonNull(bridgeNodes, "Bridge Node list must not be null"); if (!bridgeNodes.isEmpty()) { for (Node node : bridgeNodes) { bridgeNodeCache.put(node.key(), diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java index 8fd8f11fc..99caee95c 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java @@ -7,10 +7,10 @@ */ package org.opendaylight.ovsdb.southbound.transactions.md; +import static java.util.Objects.requireNonNull; import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.net.InetAddresses; import java.net.InetAddress; import java.net.NetworkInterface; @@ -131,8 +131,8 @@ public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand { private List> bridgeOtherConfigsToRemove( InstanceIdentifier bridgeIid, Bridge bridge) { - Preconditions.checkNotNull(bridgeIid); - Preconditions.checkNotNull(bridge); + requireNonNull(bridgeIid); + requireNonNull(bridge); List> result = new ArrayList<>(); Bridge oldBridge = oldBridgeRows.get(bridge.getUuid()); @@ -155,8 +155,8 @@ public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand { private List> externalIdsToRemove( InstanceIdentifier bridgeIid, Bridge bridge) { - Preconditions.checkNotNull(bridgeIid); - Preconditions.checkNotNull(bridge); + requireNonNull(bridgeIid); + requireNonNull(bridge); List> result = new ArrayList<>(); Bridge oldBridge = oldBridgeRows.get(bridge.getUuid()); @@ -179,8 +179,8 @@ public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand { private List> protocolEntriesToRemove( InstanceIdentifier bridgeIid, Bridge bridge) { - Preconditions.checkNotNull(bridgeIid); - Preconditions.checkNotNull(bridge); + requireNonNull(bridgeIid); + requireNonNull(bridge); List> result = new ArrayList<>(); Bridge oldBridge = oldBridgeRows.get(bridge.getUuid()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerRemovedCommand.java index 78951b328..498d0fd36 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerRemovedCommand.java @@ -7,7 +7,8 @@ */ package org.opendaylight.ovsdb.southbound.transactions.md; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -30,7 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class OvsdbControllerRemovedCommand extends AbstractTransactionCommand { - private final InstanceIdentifierCodec instanceIdentifierCodec; private final Map oldBridgeRows; private final Map removedControllerRows; @@ -65,10 +65,9 @@ public class OvsdbControllerRemovedCommand extends AbstractTransactionCommand { private List> controllerEntriesToRemove( InstanceIdentifier bridgeIid, Bridge bridge) { - Preconditions.checkNotNull(bridgeIid); - Preconditions.checkNotNull(bridge); - List> result = - new ArrayList<>(); + requireNonNull(bridgeIid); + requireNonNull(bridge); + List> result = new ArrayList<>(); Bridge oldBridgeNode = oldBridgeRows.get(bridge.getUuid()); if (oldBridgeNode != null && oldBridgeNode.getControllerColumn() != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommand.java index 4cfe98436..905b97b29 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommand.java @@ -7,8 +7,9 @@ */ package org.opendaylight.ovsdb.southbound.transactions.md; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -30,11 +31,10 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class OvsdbManagersRemovedCommand extends AbstractTransactionCommand { - - private Map oldOpenVSwitchRows; - private Map removedManagerRows; - private Map updatedOpenVSwitchRows; - private Map updatedManagerRows; + private final Map oldOpenVSwitchRows; + private final Map removedManagerRows; + private final Map updatedOpenVSwitchRows; + private final Map updatedManagerRows; public OvsdbManagersRemovedCommand(OvsdbConnectionInstance key, TableUpdates updates, DatabaseSchema dbSchema) { @@ -66,8 +66,8 @@ public class OvsdbManagersRemovedCommand extends AbstractTransactionCommand { @VisibleForTesting List> managerEntriesToRemove( InstanceIdentifier ovsdbNodeIid, OpenVSwitch openVSwitch) { - Preconditions.checkNotNull(ovsdbNodeIid); - Preconditions.checkNotNull(openVSwitch); + requireNonNull(ovsdbNodeIid); + requireNonNull(openVSwitch); List> result = new ArrayList<>(); -- 2.36.6