Mass-migrate to Objects.requireNonNull()

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / AbstractLeafCandidateNode.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java
index 41e6eb4185ab4720ef96cdd24fec5c9434605389..b25b9c5d7809b3bf771a4aa4b42c22e108e02d4b 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java
@@ -7,9 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-import com.google.common.base.Optional;
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Optional;
+import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
@@ -18,19 +21,21 @@ abstract class AbstractLeafCandidateNode implements DataTreeCandidateNode {
     private final NormalizedNode<?, ?> data;
 
     protected AbstractLeafCandidateNode(final NormalizedNode<?, ?> data) {
-        this.data = data;
+        this.data = requireNonNull(data);
     }
 
     protected final Optional<NormalizedNode<?, ?>> dataOptional() {
-        return Optional.<NormalizedNode<?, ?>>of(data);
+        return Optional.of(data);
     }
 
+    @Nonnull
     @Override
     public final Collection<DataTreeCandidateNode> getChildNodes() {
         return Collections.emptyList();
     }
 
     @Override
+    @Nonnull
     public final PathArgument getIdentifier() {
         return data.getIdentifier();
     }