From 124334a02c8e01c62ee96c99a0967b8c84b6d976 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 23 Oct 2018 15:50:30 +0200
Subject: [PATCH] Migrate BitsTypeDefinition to JDT annotations

This migrates @Nonnull to @NonNull in the interface and all its
implementations.

JIRA: YANGTOOLS-907
Change-Id: Ic4a43b8e1e6a85894995c1c73032490111079874
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yangtools/yang/model/api/type/BitsTypeDefinition.java   | 6 +++---
 .../yangtools/yang/model/util/type/BaseBitsType.java        | 5 ++---
 .../yangtools/yang/model/util/type/BitImpl.java             | 1 -
 .../yangtools/yang/model/util/type/DerivedBitsType.java     | 2 --
 .../yangtools/yang/model/util/type/RestrictedBitsType.java  | 5 ++---
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java
index bc3e69dc70..c3a7730c77 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
@@ -23,7 +23,7 @@ public interface BitsTypeDefinition extends TypeDefinition<BitsTypeDefinition> {
      * @return list of <code>Bit</code> type instastances with data about all
      *         individual bits of <code>bits</code> YANG built-in type
      */
-    @Nonnull List<Bit> getBits();
+    @NonNull List<Bit> getBits();
 
     static int hashCode(final BitsTypeDefinition type) {
         return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(),
@@ -53,7 +53,7 @@ public interface BitsTypeDefinition extends TypeDefinition<BitsTypeDefinition> {
          *
          * @return string with the name of the concrete bit
          */
-        @Nonnull String getName();
+        @NonNull String getName();
 
         /**
          * The position value MUST be in the range 0 to 4294967295, and it MUST
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java
index 3faeace1ec..e5496b0ea2 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java
@@ -10,20 +10,19 @@ package org.opendaylight.yangtools.yang.model.util.type;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.List;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
 
 final class BaseBitsType extends AbstractBaseType<BitsTypeDefinition> implements BitsTypeDefinition {
-    private final List<Bit> bits;
+    private final @NonNull List<Bit> bits;
 
     BaseBitsType(final SchemaPath path, final List<UnknownSchemaNode> unknownSchemaNodes, final Collection<Bit> bits) {
         super(path, unknownSchemaNodes);
         this.bits = ImmutableList.copyOf(bits);
     }
 
-    @Nonnull
     @Override
     public List<Bit> getBits() {
         return bits;
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
index 8ef077d390..ed5c5bd7a1 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
@@ -79,7 +79,6 @@ final class BitImpl implements Bit, Immutable {
         return position;
     }
 
-    @Nonnull
     @Override
     public String getName() {
         return getQName().getLocalName();
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java
index 5b6591abf8..6207ae2d43 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.util.type;
 
 import java.util.Collection;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
@@ -22,7 +21,6 @@ final class DerivedBitsType extends AbstractDerivedType<BitsTypeDefinition> impl
         super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes);
     }
 
-    @Nonnull
     @Override
     public List<Bit> getBits() {
         return baseType().getBits();
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java
index ba41a238a0..255271c5d8 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java
@@ -11,13 +11,13 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.List;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
 
 final class RestrictedBitsType extends AbstractRestrictedType<BitsTypeDefinition> implements BitsTypeDefinition {
-    private final List<Bit> bits;
+    private final @NonNull List<Bit> bits;
 
     RestrictedBitsType(final BitsTypeDefinition baseType, final SchemaPath path,
             final Collection<UnknownSchemaNode> unknownSchemaNodes, final Collection<Bit> bits) {
@@ -25,7 +25,6 @@ final class RestrictedBitsType extends AbstractRestrictedType<BitsTypeDefinition
         this.bits = ImmutableList.copyOf(Preconditions.checkNotNull(bits));
     }
 
-    @Nonnull
     @Override
     public List<Bit> getBits() {
         return bits;
-- 
2.36.6