commit bfc2e92c976b0febeaebf92d4b8e99f7f262bbaf
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Jun 07 21:46:05 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri Jun 09 00:20:52 2017 +0000
tree 280dc69cd987e6d282646898c21768f690006b46
parent 537fe85b8b413fc016681f054e619bf63122d911

Ensure immutability of constants Collection

Change-Id: I9b26282ccabaef5e4ac81fb626abfa6e537d9333

utils/misc/src/main/java/org/onlab/packet/PIM.java

diff --git a/utils/misc/src/main/java/org/onlab/packet/PIM.java b/utils/misc/src/main/java/org/onlab/packet/PIM.java
index 94590df..5262ea4 100644
--- a/utils/misc/src/main/java/org/onlab/packet/PIM.java
+++ b/utils/misc/src/main/java/org/onlab/packet/PIM.java
@@ -18,8 +18,9 @@
 import org.onlab.packet.pim.PIMHello;
 import org.onlab.packet.pim.PIMJoinPrune;
 
+import com.google.common.collect.ImmutableMap;
+
 import java.nio.ByteBuffer;
-import java.util.HashMap;
 import java.util.Map;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -48,12 +49,10 @@
     public static final byte ADDRESS_FAMILY_IP6 = 0x2;
 
     public static final Map<Byte, Deserializer<? extends IPacket>> PROTOCOL_DESERIALIZER_MAP =
-            new HashMap<>();
-
-    static {
-        PIM.PROTOCOL_DESERIALIZER_MAP.put(PIM.TYPE_HELLO, PIMHello.deserializer());
-        PIM.PROTOCOL_DESERIALIZER_MAP.put(PIM.TYPE_JOIN_PRUNE_REQUEST, PIMJoinPrune.deserializer());
-    }
+            ImmutableMap.<Byte, Deserializer<? extends IPacket>>builder()
+                .put(PIM.TYPE_HELLO, PIMHello.deserializer())
+                .put(PIM.TYPE_JOIN_PRUNE_REQUEST, PIMJoinPrune.deserializer())
+                .build();
 
     /*
      * PIM Header fields