From 6acb23d88c7d9e8b8b2939e6f840bd41561fad25 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 1 Nov 2019 14:48:51 +0100 Subject: [PATCH] Speed up NeutronvpnUtils.isNetworkTypeSupported() Make SUPPORTED_NETWORK_TYPES an ImmutableSet and eliminate a superfluous null check. Change-Id: I60c5ca22e2560472690eab6fdfb3873d1146c237 Signed-off-by: Robert Varga --- .../netvirt/neutronvpn/NeutronvpnUtils.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java index 0ed48979e3..9a19f971b7 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java @@ -5,7 +5,6 @@ * 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.netvirt.neutronvpn; import static org.opendaylight.genius.infra.Datastore.OPERATIONAL; @@ -13,6 +12,7 @@ import static org.opendaylight.genius.infra.Datastore.OPERATIONAL; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.ImmutableBiMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -25,7 +25,6 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -176,14 +175,11 @@ public class NeutronvpnUtils { .put(NetworkTypeVxlan.class, SegmentTypeVxlan.class) .build(); - private static final Set> SUPPORTED_NETWORK_TYPES = new HashSet<>(); - - static { - SUPPORTED_NETWORK_TYPES.add(NetworkTypeFlat.class); - SUPPORTED_NETWORK_TYPES.add(NetworkTypeVlan.class); - SUPPORTED_NETWORK_TYPES.add(NetworkTypeVxlan.class); - SUPPORTED_NETWORK_TYPES.add(NetworkTypeGre.class); - } + private static final ImmutableSet> SUPPORTED_NETWORK_TYPES = ImmutableSet.of( + NetworkTypeFlat.class, + NetworkTypeVlan.class, + NetworkTypeVxlan.class, + NetworkTypeGre.class); private final ConcurrentMap networkMap = new ConcurrentHashMap<>(); private final ConcurrentMap routerMap = new ConcurrentHashMap<>(); @@ -1104,7 +1100,7 @@ public class NeutronvpnUtils { static boolean isNetworkTypeSupported(Network network) { NetworkProviderExtension npe = network.augmentation(NetworkProviderExtension.class); - return npe != null && npe.getNetworkType() != null && SUPPORTED_NETWORK_TYPES.contains(npe.getNetworkType()); + return npe != null && SUPPORTED_NETWORK_TYPES.contains(npe.getNetworkType()); } static boolean isNetworkOfType(Network network, Class type) { -- 2.36.6