Rename recursive INode methods

[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 cc84647afa719ce2804a09bbc6fb9acbc7c97c6e..503572bd1dabd13fa7322cf793db1a232f41c875 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
@@ -15,7 +15,7 @@
  */
 package org.opendaylight.yangtools.triemap;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.yangtools.triemap.LookupResult.RESTART;
 
 import com.google.common.annotations.Beta;
@@ -96,7 +96,7 @@ public abstract class TrieMap<K, V> extends AbstractMap<K, V> implements Concurr
 
     @Override
     public final boolean containsValue(final Object value) {
-        return super.containsValue(checkNotNull(value));
+        return super.containsValue(requireNonNull(value));
     }
 
     @Override
@@ -114,7 +114,7 @@ public abstract class TrieMap<K, V> extends AbstractMap<K, V> implements Concurr
     @Override
     public final V get(final Object key) {
         @SuppressWarnings("unchecked")
-        final K k = (K) checkNotNull(key);
+        final K k = (K) requireNonNull(key);
         return lookuphc(k, computeHash(k));
     }
 
@@ -220,7 +220,7 @@ public abstract class TrieMap<K, V> extends AbstractMap<K, V> implements Concurr
         Object res;
         do {
             // Keep looping as long as RESTART is being indicated
-            res = RDCSS_READ_ROOT().rec_lookup(key, hc, 0, null, this);
+            res = RDCSS_READ_ROOT().recLookup(key, hc, 0, null, this);
         } while (res == RESTART);
 
         return (V) res;