Migrate nullness annotations to JDT

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

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java
index 94596ceedc3d7163ec308c49467d218db06f9654..022aee6490e9d75b59aa6b4506394e2788d4f0c4 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java
@@ -7,20 +7,21 @@
  */
 package org.opendaylight.yangtools.yang.data.api;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.UnmodifiableIterator;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
 final class StackedPathArguments extends PathArgumentList {
     private final List<PathArgument> base;
     private final List<PathArgument> stack;
 
-    public StackedPathArguments(@Nonnull final YangInstanceIdentifier base, @Nonnull final List<PathArgument> stack) {
-        Verify.verify(!stack.isEmpty());
+    StackedPathArguments(final @NonNull YangInstanceIdentifier base, final @NonNull List<PathArgument> stack) {
+        verify(!stack.isEmpty());
         this.base = base.getPathArguments();
         this.stack = stack;
     }
@@ -31,8 +32,9 @@ final class StackedPathArguments extends PathArgumentList {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public boolean contains(final Object o) {
-        final PathArgument srch = (PathArgument) Preconditions.checkNotNull(o);
+        final PathArgument srch = (PathArgument) requireNonNull(o);
         return stack.contains(srch) || base.contains(srch);
     }
 
@@ -40,14 +42,14 @@ final class StackedPathArguments extends PathArgumentList {
     public PathArgument get(final int index) {
         if (index < base.size()) {
             return base.get(index);
-        } else {
-            return stack.get(index - base.size());
         }
+        return stack.get(index - base.size());
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public int indexOf(final Object o) {
-        final PathArgument srch = (PathArgument) Preconditions.checkNotNull(o);
+        final PathArgument srch = (PathArgument) requireNonNull(o);
 
         int ret = base.indexOf(srch);
         if (ret == -1) {
@@ -60,8 +62,9 @@ final class StackedPathArguments extends PathArgumentList {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:parameterName")
     public int lastIndexOf(final Object o) {
-        final PathArgument srch = (PathArgument) Preconditions.checkNotNull(o);
+        final PathArgument srch = (PathArgument) requireNonNull(o);
 
         final int ret = stack.lastIndexOf(srch);
         if (ret != -1) {