Cleanup use of Guava library

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / YangInstanceIdentifier.java

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index 392621936859bb79c302457fdd13f34492c2d706..6f2c49cfa3d28a8d8d8f54c10c0e3a56fdfaf135 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.yangtools.yang.data.api;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import javax.annotation.Nonnull;
@@ -239,7 +240,7 @@ public abstract class YangInstanceIdentifier implements Path<YangInstanceIdentif
         while (oit.hasNext()) {
             // Ancestor is not really an ancestor
             if (!lit.hasNext() || !lit.next().equals(oit.next())) {
-                return Optional.absent();
+                return Optional.empty();
             }
 
             ++common;
@@ -261,7 +262,7 @@ public abstract class YangInstanceIdentifier implements Path<YangInstanceIdentif
             return true;
         }
 
-        Preconditions.checkArgument(other != null, "other should not be null");
+        checkArgument(other != null, "other should not be null");
         final Iterator<PathArgument> lit = getPathArguments().iterator();
         final Iterator<PathArgument> oit = other.getPathArguments().iterator();
 
@@ -427,7 +428,7 @@ public abstract class YangInstanceIdentifier implements Path<YangInstanceIdentif
         private transient volatile boolean hashGuard = false;
 
         protected AbstractPathArgument(final QName nodeType) {
-            this.nodeType = Preconditions.checkNotNull(nodeType);
+            this.nodeType = requireNonNull(nodeType);
         }
 
         @Override