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 <robert.varga@pantheon.tech>

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 1913e66c550c642bde0f5b85110916f94e60117b..07b83ba7b99e6d97f3fd18a1c82b23629e844af3 100644 (file)
--- 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<? extends TunnelTypeBase>, Class<? extends InterfaceTypeBase>>
-        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<? extends TunnelTypeBase>, Class<? extends InterfaceTypeBase>> 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";