From 35a126394b12b72f918b5f272e1d067a1745f5e6 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 7 Nov 2018 17:43:55 +0100 Subject: [PATCH] Make nullToEmpty return immutable empty lists This matches the mdsal behaviour. Change-Id: I990e848102e2ec0a2e273ea6c63fa0ad804b19bf Signed-off-by: Stephen Kitt --- .../genius/alivenessmonitor/utils/AlivenessMonitorUtil.java | 5 +++-- .../opendaylight/genius/arputil/internal/ArpUtilImpl.java | 3 ++- .../main/java/org/opendaylight/genius/idmanager/IdUtils.java | 3 ++- .../org/opendaylight/genius/interfacemanager/IfmUtil.java | 3 ++- .../java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java | 5 +++-- .../main/java/org/opendaylight/genius/itm/impl/ItmUtils.java | 2 +- .../mdsalutil/interfaces/testutils/FlowAssertTestUtils.java | 3 ++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/utils/AlivenessMonitorUtil.java b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/utils/AlivenessMonitorUtil.java index 1e987b642..ed16d1a59 100644 --- a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/utils/AlivenessMonitorUtil.java +++ b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/utils/AlivenessMonitorUtil.java @@ -7,7 +7,8 @@ */ package org.opendaylight.genius.alivenessmonitor.utils; -import java.util.ArrayList; +import static java.util.Collections.emptyList; + import java.util.Collection; import java.util.List; import javax.annotation.Nonnull; @@ -102,6 +103,6 @@ public final class AlivenessMonitorUtil { // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } diff --git a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java index c559577eb..2237d735b 100644 --- a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java +++ b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.genius.arputil.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Collections.emptyList; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -567,6 +568,6 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService, // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdUtils.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdUtils.java index 2b16f36d4..e87e31422 100644 --- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdUtils.java +++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdUtils.java @@ -8,6 +8,7 @@ package org.opendaylight.genius.idmanager; +import static java.util.Collections.emptyList; import static org.opendaylight.controller.md.sal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS; import com.google.common.base.Optional; @@ -342,6 +343,6 @@ public class IdUtils { // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java index 7233e2bd0..92d2ce123 100755 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java @@ -7,6 +7,7 @@ */ package org.opendaylight.genius.interfacemanager; +import static java.util.Collections.emptyList; import static org.opendaylight.controller.md.sal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS; import static org.opendaylight.genius.infra.Datastore.CONFIGURATION; import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.GRE_TRUNK_INTERFACE; @@ -578,6 +579,6 @@ public final class IfmUtil { // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } diff --git a/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java b/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java index 173008c83..a2beb4420 100644 --- a/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java +++ b/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java @@ -8,12 +8,13 @@ package org.opendaylight.genius.ipv6util.api; +import static java.util.Collections.emptyList; + import com.google.common.base.Preconditions; import com.google.common.net.InetAddresses; import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; @@ -290,6 +291,6 @@ public final class Ipv6Util { // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java index 05e0c464c..b10828527 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java @@ -1496,6 +1496,6 @@ public final class ItmUtils { // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java index 1147170b4..163c2701f 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java @@ -7,6 +7,7 @@ */ package org.opendaylight.genius.mdsalutil.interfaces.testutils; +import static java.util.Collections.emptyList; import static org.opendaylight.mdsal.binding.testutils.AssertDataObjects.assertEqualBeans; import java.util.ArrayList; @@ -55,6 +56,6 @@ public class FlowAssertTestUtils { // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2 @Nonnull public static List nullToEmpty(final @Nullable List input) { - return input != null ? input : new ArrayList<>(0); + return input != null ? input : emptyList(); } } -- 2.36.6