Cleanup use of Guava library

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / SchemaNodeUtils.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java
index 1ad31d4812c761af2b6ea8807c452af912f42800..0754104f70ed160e460d315bdb1bc7671ffa665b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -26,20 +27,20 @@ public class SchemaNodeUtils {
     public static Optional<SchemaNode> getOriginalIfPossible(final SchemaNode node) {
         if (node instanceof DerivableSchemaNode) {
             @SuppressWarnings("unchecked")
-            final Optional<SchemaNode> ret  = (Optional<SchemaNode>) (((DerivableSchemaNode) node).getOriginal());
+            final Optional<SchemaNode> ret  = (Optional<SchemaNode>) ((DerivableSchemaNode) node).getOriginal();
             return ret;
         }
-        return Optional.absent();
+        return Optional.empty();
     }
 
     public static SchemaNode getRootOriginalIfPossible(final SchemaNode data) {
-        Optional<SchemaNode> previous = Optional.absent();
+        Optional<SchemaNode> previous = Optional.empty();
         Optional<SchemaNode> next = getOriginalIfPossible(data);
         while (next.isPresent()) {
             previous = next;
             next = getOriginalIfPossible(next.get());
         }
-        return previous.orNull();
+        return previous.orElse(null);
     }
 
     /**
@@ -51,8 +52,8 @@ public class SchemaNodeUtils {
      */
     @Nullable public static ContainerSchemaNode getRpcDataSchema(@Nonnull final RpcDefinition rpc,
             @Nonnull final QName qname) {
-        Preconditions.checkNotNull(rpc, "Rpc Schema must not be null");
-        Preconditions.checkNotNull(qname,"QName must not be null");
+        requireNonNull(rpc, "Rpc Schema must not be null");
+        requireNonNull(qname, "QName must not be null");
         switch (qname.getLocalName()) {
             case "input":
                 return rpc.getInput();