BUG-7464: Eliminate custom Map.Entry implementation

[yangtools.git] / third-party / triemap / src / main / java / org / opendaylight / yangtools / triemap / TrieMap.java

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java
index f727f0eddcf89bae862f984f765f96ebf1b5eea6..63118d3b8019a3be46844e5fd79137da8042ace7 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java
@@ -6,6 +6,7 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.AbstractMap;
+import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.AbstractSet;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -671,7 +672,7 @@ public class TrieMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K,
         }
 
         final public Map.Entry<K, V> kvPair () {
-            return new Pair<K, V> (k, v);
+            return new SimpleImmutableEntry<K, V> (k, v);
         }
 
         final public String string (int lev) {
@@ -703,8 +704,8 @@ public class TrieMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K,
             return new SNode<K, V> (k, v, hc);
         }
 
-        final public Pair<K, V> kvPair () {
-            return new Pair<K, V> (k, v);
+        final public Map.Entry<K, V> kvPair () {
+            return new SimpleImmutableEntry<K, V> (k, v);
         }
 
         final public int cachedSize (Object ct) {