commit e254d6cd47669e4e60f4936c679e109662508b6d
author Frank Wang <wangpeihuixyz@126.com> Thu Jul 20 14:46:36 2017 +0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Jul 20 15:10:13 2017 +0000
tree aab1d4973d4b843898122b3b3865c2b7ecbe2a17
parent c672c984e80f4b1296125ba032b4e29b179e404e

change the way ImmutableBiMap is created for subsequent expansion

Change-Id: I87d631513a8eb859d597e38c2be9c201b1546440

drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/Bmv2DefaultInterpreter.java

diff --git a/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/Bmv2DefaultInterpreter.java b/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/Bmv2DefaultInterpreter.java
index ee307b6..29e2a3a 100644
--- a/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/Bmv2DefaultInterpreter.java
+++ b/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/Bmv2DefaultInterpreter.java
@@ -56,11 +56,13 @@
     private static final PiHeaderFieldId ETH_SRC_ID = PiHeaderFieldId.of("ethernet_t", "srcAddr");
     private static final PiHeaderFieldId ETH_TYPE_ID = PiHeaderFieldId.of("ethernet_t", "etherType");
 
-    private static final ImmutableBiMap<Criterion.Type, PiHeaderFieldId> CRITERION_MAP = ImmutableBiMap.of(
-            Criterion.Type.IN_PORT, IN_PORT_ID,
-            Criterion.Type.ETH_DST, ETH_DST_ID,
-            Criterion.Type.ETH_SRC, ETH_SRC_ID,
-            Criterion.Type.ETH_TYPE, ETH_TYPE_ID);
+    private static final ImmutableBiMap<Criterion.Type, PiHeaderFieldId> CRITERION_MAP =
+            new ImmutableBiMap.Builder<Criterion.Type, PiHeaderFieldId>()
+                    .put(Criterion.Type.IN_PORT, IN_PORT_ID)
+                    .put(Criterion.Type.ETH_DST, ETH_DST_ID)
+                    .put(Criterion.Type.ETH_SRC, ETH_SRC_ID)
+                    .put(Criterion.Type.ETH_TYPE, ETH_TYPE_ID)
+                    .build();
 
     private static final ImmutableBiMap<Integer, PiTableId> TABLE_MAP = ImmutableBiMap.of(
             0, PiTableId.of(TABLE0));