From dce13fe940ccab85ae9670a5164a1fe5872391af Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 29 Sep 2020 14:09:14 +0200 Subject: [PATCH] Use ImmutableMap for TUNNEL_TYPE_MAP Eclipse warns about subclass not having a serialialVersionUUID. Rather than subclassing HashMap, use ImmutableMap to hold this read-only lookup table. Change-Id: I2182ec730986862e03760626feb547c590827d99 Signed-off-by: Robert Varga --- .../renderer/ovs/utilities/SouthboundUtils.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java index 1913e66c5..07b83ba7b 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java @@ -7,6 +7,7 @@ */ package org.opendaylight.genius.interfacemanager.renderer.ovs.utilities; +import com.google.common.collect.ImmutableMap; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.HashMap; @@ -122,15 +123,12 @@ public class SouthboundUtils { private static final String TUNNEL_OPTIONS_VALUE_LEGACY_L3 = "legacy_l3"; // To keep the mapping between Tunnel Types and Tunnel Interfaces - private static final Map, Class> - TUNNEL_TYPE_MAP = new HashMap<>() { - { - put(TunnelTypeGre.class, InterfaceTypeGre.class); - put(TunnelTypeMplsOverGre.class, InterfaceTypeGre.class); - put(TunnelTypeVxlan.class, InterfaceTypeVxlan.class); - put(TunnelTypeVxlanGpe.class, InterfaceTypeVxlan.class); - } - }; + private static final Map, Class> TUNNEL_TYPE_MAP = + ImmutableMap.of( + TunnelTypeGre.class, InterfaceTypeGre.class, + TunnelTypeMplsOverGre.class, InterfaceTypeGre.class, + TunnelTypeVxlan.class, InterfaceTypeVxlan.class, + TunnelTypeVxlanGpe.class, InterfaceTypeVxlan.class); // OVS Detection statics private static final String DEFAULT_OVS_VERSION = "2.8.0"; -- 2.36.6