Bug 4896: Use HashMap instead of ImmutableMap.Builder in ChoiceModification

Change-Id: Id5f851c65476d9cce94aeec54ccf483d979b2f1a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java
index 3a0d14a72d6429e00aa1d688e47f1a15af70cbf3..56e2bac02f81dc33812e211513fd399191484b7c 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java
@@ -18,6 +18,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -58,12 +59,12 @@ final class ChoiceModificationStrategy extends AbstractNodeContainerModification
         childNodes = childBuilder.build();
         caseEnforcers = enforcerBuilder.build();
 
-        final Builder<CaseEnforcer, Collection<CaseEnforcer>> exclusionsBuilder = ImmutableMap.builder();
+        final Map<CaseEnforcer, Collection<CaseEnforcer>> exclusionsBuilder = new HashMap<>();
         for (CaseEnforcer e : caseEnforcers.values()) {
             exclusionsBuilder.put(e, ImmutableList.copyOf(
                 Collections2.filter(caseEnforcers.values(), Predicates.not(Predicates.equalTo(e)))));
         }
-        exclusions = exclusionsBuilder.build();
+        exclusions = ImmutableMap.copyOf(exclusionsBuilder);
     }
 
     @Override