From e3233ae5c3fb026f17f7d4fcb44326b7c0233cff Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 8 Oct 2018 18:52:05 +0200
Subject: [PATCH] Migrate ietf-type-util to JDT annotations

This removes the use of javax.annotation nullable annotations
to remove import-package.

Change-Id: I05d01bb4aa3a8e343432987e8a66e06971d22e69
JIRA: MDSAL-373
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 model/ietf/ietf-type-util/pom.xml             |  14 ++
 .../model/ietf/util/AbstractIetfInetUtil.java | 163 +++++++++---------
 .../model/ietf/util/AbstractIetfYangUtil.java |  16 +-
 .../mdsal/model/ietf/util/Ipv4Utils.java      |   6 +-
 .../mdsal/model/ietf/util/Ipv6Utils.java      |  25 +--
 .../mdsal/model/ietf/util/IpUtil.java         |   9 -
 6 files changed, 121 insertions(+), 112 deletions(-)

diff --git a/model/ietf/ietf-type-util/pom.xml b/model/ietf/ietf-type-util/pom.xml
index 6d3e26e2c7..8c5c7911ef 100644
--- a/model/ietf/ietf-type-util/pom.xml
+++ b/model/ietf/ietf-type-util/pom.xml
@@ -42,6 +42,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>!javax.annotation,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
index 153b796d88..7321274ec4 100644
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
@@ -18,8 +18,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Map.Entry;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.spec.reflect.StringValueObjectFactory;
 
 /**
@@ -47,22 +47,22 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         this.prefix6Factory = StringValueObjectFactory.create(prefix6Class, "::0/0");
     }
 
-    @Nonnull protected abstract A ipv4Address(@Nonnull A4 addr);
-    @Nonnull protected abstract ANZ ipv4AddressNoZone(@Nonnull A4NZ addr);
-    @Nonnull protected abstract A ipv6Address(@Nonnull A6 addr);
-    @Nonnull protected abstract ANZ ipv6AddressNoZone(@Nonnull A6NZ addr);
+    protected abstract @NonNull A ipv4Address(@NonNull A4 addr);
+    protected abstract @NonNull ANZ ipv4AddressNoZone(@NonNull A4NZ addr);
+    protected abstract @NonNull A ipv6Address(@NonNull A6 addr);
+    protected abstract @NonNull ANZ ipv6AddressNoZone(@NonNull A6NZ addr);
 
-    @Nullable protected abstract A4 maybeIpv4Address(@Nonnull A addr);
-    @Nullable protected abstract A4NZ maybeIpv4AddressNoZone(@Nonnull ANZ addr);
-    @Nullable protected abstract A6 maybeIpv6Address(@Nonnull A addr);
-    @Nullable protected abstract A6NZ maybeIpv6AddressNoZone(@Nonnull ANZ addr);
+    protected abstract @Nullable A4 maybeIpv4Address(@NonNull A addr);
+    protected abstract @Nullable A4NZ maybeIpv4AddressNoZone(@NonNull ANZ addr);
+    protected abstract @Nullable A6 maybeIpv6Address(@NonNull A addr);
+    protected abstract @Nullable A6NZ maybeIpv6AddressNoZone(@NonNull ANZ addr);
 
-    @Nonnull protected abstract P ipv4Prefix(@Nonnull P4 addr);
-    @Nonnull protected abstract P ipv6Prefix(@Nonnull P6 addr);
-    @Nonnull protected abstract String ipv4AddressString(@Nonnull A4 addr);
-    @Nonnull protected abstract String ipv6AddressString(@Nonnull A6 addr);
-    @Nonnull protected abstract String ipv4PrefixString(@Nonnull P4 prefix);
-    @Nonnull protected abstract String ipv6PrefixString(@Nonnull P6 prefix);
+    protected abstract @NonNull P ipv4Prefix(@NonNull P4 addr);
+    protected abstract @NonNull P ipv6Prefix(@NonNull P6 addr);
+    protected abstract @NonNull String ipv4AddressString(@NonNull A4 addr);
+    protected abstract @NonNull String ipv6AddressString(@NonNull A6 addr);
+    protected abstract @NonNull String ipv4PrefixString(@NonNull P4 prefix);
+    protected abstract @NonNull String ipv6PrefixString(@NonNull P6 prefix);
 
     /**
      * Create an IpAddress by interpreting input bytes as an IPv4 or IPv6 address, based on array length.
@@ -72,7 +72,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 4 or 6
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final A ipAddressFor(@Nonnull final byte[] bytes) {
+    public final @NonNull A ipAddressFor(final byte @NonNull[] bytes) {
         switch (bytes.length) {
             case INET4_LENGTH:
                 return ipv4Address(ipv4AddressFor(bytes));
@@ -83,7 +83,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final A ipAddressFor(@Nonnull final InetAddress addr) {
+    public final @NonNull A ipAddressFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         if (addr instanceof Inet4Address) {
             return ipv4Address(ipv4AddressFor(addr));
@@ -102,7 +102,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 4 or 6
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final ANZ ipAddressNoZoneFor(@Nonnull final byte[] bytes) {
+    public final @NonNull ANZ ipAddressNoZoneFor(final byte @NonNull[] bytes) {
         switch (bytes.length) {
             case INET4_LENGTH:
                 return ipv4AddressNoZone(ipv4AddressNoZoneFor(bytes));
@@ -113,7 +113,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final ANZ ipAddressNoZoneFor(@Nonnull final InetAddress addr) {
+    public final @NonNull ANZ ipAddressNoZoneFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         if (addr instanceof Inet4Address) {
             return ipv4AddressNoZone(ipv4AddressNoZoneFor(addr));
@@ -136,7 +136,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      *         in range 0-32 or 0-128 respectively
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final P ipPrefixFor(@Nonnull final byte[] bytes, final int mask) {
+    public final @NonNull P ipPrefixFor(final byte @NonNull[] bytes, final int mask) {
         switch (bytes.length) {
             case INET4_LENGTH:
                 return ipv4Prefix(ipv4PrefixFor(bytes, mask));
@@ -147,7 +147,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final P ipPrefixFor(@Nonnull final InetAddress addr, final int mask) {
+    public final @NonNull P ipPrefixFor(final @NonNull InetAddress addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         if (addr instanceof Inet4Address) {
             return ipv4Prefix(ipv4PrefixFor(addr, mask));
@@ -158,7 +158,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final InetAddress inetAddressFor(@Nonnull final A addr) {
+    public final @NonNull InetAddress inetAddressFor(final @NonNull A addr) {
         final A4 v4 = maybeIpv4Address(addr);
         if (v4 != null) {
             return inet4AddressFor(v4);
@@ -168,7 +168,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return inet6AddressFor(v6);
     }
 
-    @Nonnull public final InetAddress inetAddressForNoZone(@Nonnull final ANZ addr) {
+    public final @NonNull InetAddress inetAddressForNoZone(final @NonNull ANZ addr) {
         final A4NZ v4 = maybeIpv4AddressNoZone(addr);
         if (v4 != null) {
             return inet4AddressForNoZone(v4);
@@ -179,7 +179,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
     }
 
 
-    @Nonnull public final Inet4Address inet4AddressFor(@Nonnull final A4 addr) {
+    public final @NonNull Inet4Address inet4AddressFor(final @NonNull A4 addr) {
         try {
             return (Inet4Address) InetAddress.getByAddress(ipv4AddressBytes(addr));
         } catch (UnknownHostException e) {
@@ -187,7 +187,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final Inet4Address inet4AddressForNoZone(@Nonnull final A4NZ addr) {
+    public final @NonNull Inet4Address inet4AddressForNoZone(final @NonNull A4NZ addr) {
         try {
             return (Inet4Address) InetAddress.getByAddress(ipv4AddressNoZoneBytes(addr));
         } catch (UnknownHostException e) {
@@ -195,7 +195,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final Inet6Address inet6AddressFor(@Nonnull final A6 addr) {
+    public final @NonNull Inet6Address inet6AddressFor(final @NonNull A6 addr) {
         try {
             return (Inet6Address) InetAddress.getByAddress(ipv6AddressBytes(addr));
         } catch (UnknownHostException e) {
@@ -203,7 +203,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    @Nonnull public final Inet6Address inet6AddressForNoZone(@Nonnull final A6NZ addr) {
+    public final @NonNull Inet6Address inet6AddressForNoZone(final @NonNull A6NZ addr) {
         try {
             return (Inet6Address) InetAddress.getByAddress(ipv6AddressNoZoneBytes(addr));
         } catch (UnknownHostException e) {
@@ -219,7 +219,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 4
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final A4 ipv4AddressFor(@Nonnull final byte[] bytes) {
+    public final @NonNull A4 ipv4AddressFor(final byte @NonNull[] bytes) {
         return address4Factory.newInstance(addressStringV4(bytes));
     }
 
@@ -231,7 +231,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an {@link Inet4Address}
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final A4 ipv4AddressFor(@Nonnull final InetAddress addr) {
+    public final @NonNull A4 ipv4AddressFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
         return address4Factory.newInstance(addr.getHostAddress());
@@ -245,7 +245,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 4
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final A4NZ ipv4AddressNoZoneFor(@Nonnull final byte[] bytes) {
+    public final @NonNull A4NZ ipv4AddressNoZoneFor(final byte @NonNull[] bytes) {
         return address4NoZoneFactory.newInstance(addressStringV4(bytes));
     }
 
@@ -257,21 +257,21 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an {@link Inet4Address}
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final A4NZ ipv4AddressNoZoneFor(@Nonnull final InetAddress addr) {
+    public final @NonNull A4NZ ipv4AddressNoZoneFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
         return address4NoZoneFactory.newInstance(addr.getHostAddress());
     }
 
-    @Nonnull public final A4 ipv4AddressFrom(@Nonnull final P4 prefix) {
+    public final @NonNull A4 ipv4AddressFrom(final @NonNull P4 prefix) {
         return prefixToAddress(address4Factory, ipv4PrefixString(prefix));
     }
 
-    @Nonnull public final A4NZ ipv4AddressNoZoneFrom(@Nonnull final P4 prefix) {
+    public final @NonNull A4NZ ipv4AddressNoZoneFrom(final @NonNull P4 prefix) {
         return prefixToAddress(address4NoZoneFactory, ipv4PrefixString(prefix));
     }
 
-    @Nonnull public final byte[] ipv4AddressBytes(@Nonnull final A4 addr) {
+    public final byte @NonNull[] ipv4AddressBytes(final @NonNull A4 addr) {
         /*
          * This implementation relies heavily on the input string having been validated to comply with
          * the Ipv4Address pattern, which may include a zone index.
@@ -281,7 +281,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return ipv4StringBytes(str, percent == -1 ? str.length() : percent);
     }
 
-    @Nonnull public final byte[] ipv4AddressNoZoneBytes(@Nonnull final A4NZ addr) {
+    public final byte @NonNull[] ipv4AddressNoZoneBytes(final @NonNull A4NZ addr) {
         /*
          * This implementation relies heavily on the input string having been validated to comply with
          * the Ipv4AddressNoZone pattern, which must not include a zone index.
@@ -290,7 +290,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return ipv4StringBytes(str, str.length());
     }
 
-    private static byte[] ipv4StringBytes(final String str, final int limit) {
+    private static byte @NonNull[] ipv4StringBytes(final String str, final int limit) {
         final byte[] bytes = new byte[INET4_LENGTH];
         Ipv4Utils.fillIpv4Bytes(bytes, 0, str, 0, limit);
         return bytes;
@@ -304,7 +304,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 4
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final P4 ipv4PrefixFor(@Nonnull final byte[] bytes) {
+    public final @NonNull P4 ipv4PrefixFor(final byte @NonNull[] bytes) {
         return prefix4Factory.newInstance(prefixStringV4(bytes));
     }
 
@@ -320,11 +320,11 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 4 or if mask is not in range 0-32
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final P4 ipv4PrefixFor(@Nonnull final byte[] address, final int mask) {
+    public final @NonNull P4 ipv4PrefixFor(final byte @NonNull[] address, final int mask) {
         return prefix4Factory.newInstance(prefixStringV4(address, mask));
     }
 
-    @Nonnull public final P4 ipv4PrefixForShort(@Nonnull final byte[] address, final int mask) {
+    public final @NonNull P4 ipv4PrefixForShort(final byte @NonNull[] address, final int mask) {
         if (mask == 0) {
             // Easy case, reuse the template
             return prefix4Factory.getTemplate();
@@ -333,7 +333,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return v4PrefixForShort(address, 0, mask / Byte.SIZE + (mask % Byte.SIZE == 0 ? 0 : 1), mask);
     }
 
-    @Nonnull public final P4 ipv4PrefixForShort(@Nonnull final byte[] array, final int startOffset, final int mask) {
+    public final @NonNull P4 ipv4PrefixForShort(final byte @NonNull[] array, final int startOffset, final int mask) {
         if (mask == 0) {
             // Easy case, reuse the template
             return prefix4Factory.getTemplate();
@@ -350,7 +350,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an Inet4Address
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final P4 ipv4PrefixFor(@Nonnull final InetAddress addr) {
+    public final @NonNull P4 ipv4PrefixFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
         return prefix4Factory.newInstance(addr.getHostAddress() + "/32");
@@ -365,28 +365,28 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an Inet4Address or if mask is not in range 0-32
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final P4 ipv4PrefixFor(@Nonnull final InetAddress addr, final int mask) {
+    public final @NonNull P4 ipv4PrefixFor(final @NonNull InetAddress addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
         return newIpv4Prefix(addr.getHostAddress(), mask);
     }
 
-    @Nonnull public final P4 ipv4PrefixFor(@Nonnull final A4 addr) {
+    public final @NonNull P4 ipv4PrefixFor(final @NonNull A4 addr) {
         requireNonNull(addr, "Address must not be null");
         return prefix4Factory.newInstance(stripZone(ipv4AddressString(addr)) + "/32");
     }
 
-    @Nonnull public final P4 ipv4PrefixFor(@Nonnull final A4 addr, final int mask) {
+    public final @NonNull P4 ipv4PrefixFor(final @NonNull A4 addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         return newIpv4Prefix(stripZone(ipv4AddressString(addr)), mask);
     }
 
-    @Nonnull public final P4 ipv4PrefixForNoZone(@Nonnull final A4NZ addr) {
+    public final @NonNull P4 ipv4PrefixForNoZone(final @NonNull A4NZ addr) {
         requireNonNull(addr, "Address must not be null");
         return prefix4Factory.newInstance(ipv4AddressString(addr) + "/32");
     }
 
-    @Nonnull public final P4 ipv4PrefixForNoZone(@Nonnull final A4NZ addr, final int mask) {
+    public final @NonNull P4 ipv4PrefixForNoZone(final @NonNull A4NZ addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         return newIpv4Prefix(ipv4AddressString(addr), mask);
     }
@@ -396,20 +396,20 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return percent == -1 ? str : str.substring(0, percent);
     }
 
-    private P4 newIpv4Prefix(final String addr, final int mask) {
+    private @NonNull P4 newIpv4Prefix(final String addr, final int mask) {
         checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
         return prefix4Factory.newInstance(addr + '/' + mask);
     }
 
-    @Nonnull public final Entry<A4, Integer> splitIpv4Prefix(@Nonnull final P4 prefix) {
+    public final @NonNull Entry<A4, Integer> splitIpv4Prefix(final @NonNull P4 prefix) {
         return splitPrefix(address4Factory, ipv4PrefixString(prefix));
     }
 
-    @Nonnull public final Entry<A4NZ, Integer> splitIpv4PrefixNoZone(@Nonnull final P4 prefix) {
+    public final @NonNull Entry<A4NZ, Integer> splitIpv4PrefixNoZone(final @NonNull P4 prefix) {
         return splitPrefix(address4NoZoneFactory, ipv4PrefixString(prefix));
     }
 
-    @Nonnull public final byte[] ipv4PrefixToBytes(@Nonnull final P4 prefix) {
+    public final byte @NonNull[] ipv4PrefixToBytes(final @NonNull P4 prefix) {
         final String str = ipv4PrefixString(prefix);
         final int slash = str.lastIndexOf('/');
 
@@ -427,7 +427,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 16
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final A6 ipv6AddressFor(@Nonnull final byte[] bytes) {
+    public final @NonNull A6 ipv6AddressFor(final byte @NonNull[] bytes) {
         return address6Factory.newInstance(addressStringV6(bytes));
     }
 
@@ -439,7 +439,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an {@link Inet6Address}
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final A6 ipv6AddressFor(@Nonnull final InetAddress addr) {
+    public final @NonNull A6 ipv6AddressFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
         return address6Factory.newInstance(addressStringV6(addr));
@@ -453,7 +453,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 16
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final A6NZ ipv6AddressNoZoneFor(@Nonnull final byte[] bytes) {
+    public final @NonNull A6NZ ipv6AddressNoZoneFor(final byte @NonNull[] bytes) {
         return address6NoZoneFactory.newInstance(addressStringV6(bytes));
     }
 
@@ -465,32 +465,32 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an {@link Inet6Address}
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final A6NZ ipv6AddressNoZoneFor(@Nonnull final InetAddress addr) {
+    public final @NonNull A6NZ ipv6AddressNoZoneFor(final @NonNull InetAddress addr) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
         return address6NoZoneFactory.newInstance(addressStringV6(addr));
     }
 
-    @Nonnull public final A6 ipv6AddressFrom(@Nonnull final P6 prefix) {
+    public final @NonNull A6 ipv6AddressFrom(final @NonNull P6 prefix) {
         return prefixToAddress(address6Factory, ipv6PrefixString(prefix));
     }
 
-    @Nonnull public final A6NZ ipv6AddressNoZoneFrom(@Nonnull final P6 prefix) {
+    public final @NonNull A6NZ ipv6AddressNoZoneFrom(final @NonNull P6 prefix) {
         return prefixToAddress(address6NoZoneFactory, ipv6PrefixString(prefix));
     }
 
-    @Nonnull public final byte[] ipv6AddressBytes(@Nonnull final A6 addr) {
+    public final byte @NonNull[] ipv6AddressBytes(final @NonNull A6 addr) {
         final String str = ipv6AddressString(addr);
         final int percent = str.indexOf('%');
         return ipv6StringBytes(str, percent == -1 ? str.length() : percent);
     }
 
-    @Nonnull public final byte[] ipv6AddressNoZoneBytes(@Nonnull final A6NZ addr) {
+    public final byte @NonNull[] ipv6AddressNoZoneBytes(final @NonNull A6NZ addr) {
         final String str = ipv6AddressString(addr);
         return ipv6StringBytes(str, str.length());
     }
 
-    private static byte[] ipv6StringBytes(final String str, final int limit) {
+    private static byte @NonNull[] ipv6StringBytes(final @NonNull String str, final int limit) {
         final byte[] bytes = new byte[INET6_LENGTH];
         Ipv6Utils.fillIpv6Bytes(bytes, str, limit);
         return bytes;
@@ -504,7 +504,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 16
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final P6 ipv6PrefixFor(@Nonnull final byte[] bytes) {
+    public final @NonNull P6 ipv6PrefixFor(final byte @NonNull[] bytes) {
         return prefix6Factory.newInstance(addressStringV6(bytes) + "/128");
     }
 
@@ -519,16 +519,16 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if bytes has length different from 16 or if mask is not in range 0-128
      * @throws NullPointerException if bytes is null
      */
-    @Nonnull public final P6 ipv6PrefixFor(@Nonnull final byte[] address, final int mask) {
+    public final @NonNull P6 ipv6PrefixFor(final byte @NonNull[] address, final int mask) {
         checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
         return prefix6Factory.newInstance(addressStringV6(address) + '/' + mask);
     }
 
-    @Nonnull public final P6 ipv6PrefixForShort(@Nonnull final byte[] address, final int mask) {
+    public final @NonNull P6 ipv6PrefixForShort(final byte @NonNull[] address, final int mask) {
         return ipv6PrefixForShort(address, 0, mask);
     }
 
-    @Nonnull public final P6 ipv6PrefixForShort(@Nonnull final byte[] array, final int startOffset, final int mask) {
+    public final @NonNull P6 ipv6PrefixForShort(final byte @NonNull[] array, final int startOffset, final int mask) {
         if (mask == 0) {
             // Easy case, reuse the template
             return prefix6Factory.getTemplate();
@@ -551,7 +551,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an Inet6Address or if mask is not in range 0-128
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final P6 ipv6PrefixFor(@Nonnull final InetAddress addr) {
+    public final @NonNull P6 ipv6PrefixFor(final @NonNull InetAddress addr) {
         return prefix6Factory.newInstance(addressStringV6(addr) + "/128");
     }
 
@@ -566,29 +566,29 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws IllegalArgumentException if addr is not an Inet6Address or if mask is not in range 0-128
      * @throws NullPointerException if addr is null
      */
-    @Nonnull public final P6 ipv6PrefixFor(@Nonnull final InetAddress addr, final int mask) {
+    public final @NonNull P6 ipv6PrefixFor(final @NonNull InetAddress addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
         checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
         return prefix6Factory.newInstance(addressStringV6(addr) + '/' + mask);
     }
 
-    @Nonnull public final P6 ipv6PrefixFor(@Nonnull final A6 addr) {
+    public final @NonNull P6 ipv6PrefixFor(final @NonNull A6 addr) {
         requireNonNull(addr, "Address must not be null");
         return prefix6Factory.newInstance(stripZone(ipv6AddressString(addr)) + "/128");
     }
 
-    @Nonnull public final P6 ipv6PrefixFor(@Nonnull final A6 addr, final int mask) {
+    public final @NonNull P6 ipv6PrefixFor(final @NonNull A6 addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         return newIpv6Prefix(stripZone(ipv6AddressString(addr)), mask);
     }
 
-    @Nonnull public final P6 ipv6PrefixForNoZone(@Nonnull final A6NZ addr) {
+    public final @NonNull P6 ipv6PrefixForNoZone(final @NonNull A6NZ addr) {
         requireNonNull(addr, "Address must not be null");
         return prefix6Factory.newInstance(ipv6AddressString(addr) + "/128");
     }
 
-    @Nonnull public final P6 ipv6PrefixForNoZone(@Nonnull final A6NZ addr, final int mask) {
+    public final @NonNull P6 ipv6PrefixForNoZone(final @NonNull A6NZ addr, final int mask) {
         requireNonNull(addr, "Address must not be null");
         return newIpv6Prefix(ipv6AddressString(addr), mask);
     }
@@ -598,25 +598,26 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return prefix6Factory.newInstance(addr + '/' + mask);
     }
 
-    @Nonnull public final Entry<A6, Integer> splitIpv6Prefix(@Nonnull final P6 prefix) {
+    public final @NonNull Entry<A6, Integer> splitIpv6Prefix(final @NonNull P6 prefix) {
         return splitPrefix(address6Factory, ipv6PrefixString(prefix));
     }
 
-    @Nonnull public final Entry<A6NZ, Integer> splitIpv6PrefixNoZone(@Nonnull final P6 prefix) {
+    public final @NonNull Entry<A6NZ, Integer> splitIpv6PrefixNoZone(final @NonNull P6 prefix) {
         return splitPrefix(address6NoZoneFactory, ipv6PrefixString(prefix));
     }
 
-    private static <T> T prefixToAddress(final StringValueObjectFactory<T> factory, final String str) {
+    private static <T> @NonNull T prefixToAddress(final StringValueObjectFactory<T> factory, final String str) {
         return factory.newInstance(str.substring(0, str.lastIndexOf('/')));
     }
 
-    private static <T> Entry<T, Integer> splitPrefix(final StringValueObjectFactory<T> factory, final String str) {
+    private static <T> @NonNull Entry<T, Integer> splitPrefix(final StringValueObjectFactory<T> factory,
+            final String str) {
         final int slash = str.lastIndexOf('/');
         return new SimpleImmutableEntry<>(factory.newInstance(str.substring(0, slash)),
                 Integer.valueOf(str.substring(slash + 1)));
     }
 
-    @Nonnull public final byte[] ipv6PrefixToBytes(@Nonnull final P6 prefix) {
+    public final byte @NonNull[] ipv6PrefixToBytes(final @NonNull P6 prefix) {
         final String str = ipv6PrefixString(prefix);
         final byte[] bytes = new byte[INET6_LENGTH + 1];
         final int slash = str.lastIndexOf('/');
@@ -625,7 +626,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return bytes;
     }
 
-    private static void appendIpv4String(final StringBuilder sb, final byte[] bytes) {
+    private static void appendIpv4String(final StringBuilder sb, final byte @NonNull[] bytes) {
         checkArgument(bytes.length == INET4_LENGTH, "IPv4 address length is 4 bytes");
 
         sb.append(Byte.toUnsignedInt(bytes[0]));
@@ -634,13 +635,13 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    private static String addressStringV4(final byte[] bytes) {
+    private static String addressStringV4(final byte @NonNull[] bytes) {
         final StringBuilder sb = new StringBuilder(15);
         appendIpv4String(sb, bytes);
         return sb.toString();
     }
 
-    private static String addressStringV6(final byte[] bytes) {
+    private static String addressStringV6(final byte @NonNull[] bytes) {
         checkArgument(bytes.length == INET6_LENGTH, "IPv6 address length is 16 bytes");
 
         try {
@@ -654,13 +655,13 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return InetAddresses.toAddrString(addr);
     }
 
-    private static String prefixStringV4(final byte[] bytes) {
+    private static String prefixStringV4(final byte @NonNull[] bytes) {
         final StringBuilder sb = new StringBuilder(18);
         appendIpv4String(sb, bytes);
         return sb.append("/32").toString();
     }
 
-    private static String prefixStringV4(final byte[] bytes, final int mask) {
+    private static String prefixStringV4(final byte @NonNull[] bytes, final int mask) {
         checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
 
         final StringBuilder sb = new StringBuilder(18);
@@ -668,7 +669,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return sb.append('/').append(mask).toString();
     }
 
-    private P4 v4PrefixForShort(@Nonnull final byte[] array, final int startOffset, final int size, final int mask) {
+    private P4 v4PrefixForShort(final byte @NonNull[] array, final int startOffset, final int size, final int mask) {
         if (startOffset == 0 && size == INET4_LENGTH && array.length == INET4_LENGTH) {
             // Easy case, fall back to non-short
             return ipv4PrefixFor(array, mask);
diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java
index e9c6f33433..6edc034c6a 100644
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java
@@ -11,7 +11,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.annotations.Beta;
 import java.util.Arrays;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.spec.reflect.StringValueObjectFactory;
 
 /**
@@ -59,7 +59,7 @@ public abstract class AbstractIetfYangUtil<M, P> {
      * @return A MacAddress containing the canonical representation.
      * @throws NullPointerException if macAddress is null
      */
-    @Nonnull public final M canonizeMacAddress(@Nonnull final M macAddress) {
+    public final @NonNull M canonizeMacAddress(final @NonNull M macAddress) {
         final char[] input = getValue(macAddress).toCharArray();
         return ensureLowerCase(input) ? macFactory.newInstance(String.valueOf(input)) : macAddress;
     }
@@ -72,7 +72,7 @@ public abstract class AbstractIetfYangUtil<M, P> {
      * @throws NullPointerException if bytes is null
      * @throws IllegalArgumentException if length of input is not 6 bytes
      */
-    @Nonnull public final M macAddressFor(@Nonnull final byte[] bytes) {
+    public final @NonNull M macAddressFor(final byte @NonNull[] bytes) {
         checkArgument(bytes.length == MAC_BYTE_LENGTH, "MAC address should have 6 bytes, not %s",
                 bytes.length);
         return macFactory.newInstance(bytesToString(bytes, 17));
@@ -85,7 +85,7 @@ public abstract class AbstractIetfYangUtil<M, P> {
      * @return A PhysAddress containing the canonical representation.
      * @throws NullPointerException if physAddress is null
      */
-    @Nonnull public final P canonizePhysAddress(@Nonnull final P physAddress) {
+    public final @NonNull P canonizePhysAddress(final @NonNull P physAddress) {
         final char[] input = getPhysValue(physAddress).toCharArray();
         return ensureLowerCase(input) ? physFactory.newInstance(String.valueOf(input)) : physAddress;
     }
@@ -98,12 +98,12 @@ public abstract class AbstractIetfYangUtil<M, P> {
      * @throws NullPointerException if bytes is null
      * @throws IllegalArgumentException if length of input is not at least 1 byte
      */
-    @Nonnull public final P physAddressFor(@Nonnull final byte[] bytes) {
+    public final @NonNull P physAddressFor(final byte @NonNull[] bytes) {
         checkArgument(bytes.length > 0, "Physical address should have at least one byte");
         return physFactory.newInstance(bytesToString(bytes, (bytes.length + 1) / 3));
     }
 
-    @Nonnull public final byte[] bytesFor(@Nonnull final M macAddress) {
+    public final byte @NonNull[] bytesFor(final @NonNull M macAddress) {
         final String mac = getValue(macAddress);
         final byte[] ret = new byte[MAC_BYTE_LENGTH];
 
@@ -144,7 +144,7 @@ public abstract class AbstractIetfYangUtil<M, P> {
      * @return True if the array has been modified
      * @throws NullPointerException if input is null
      */
-    private static boolean ensureLowerCase(@Nonnull final char[] chars) {
+    private static boolean ensureLowerCase(final char @NonNull[] chars) {
         boolean ret = false;
 
         for (int i = 0; i < chars.length; ++i) {
@@ -168,7 +168,7 @@ public abstract class AbstractIetfYangUtil<M, P> {
      * @throws NullPointerException if input is null
      * @throws IllegalArgumentException if length of input is not 6 bytes
      */
-    @Nonnull private static String bytesToString(@Nonnull final byte[] bytes, final int charHint) {
+    private static @NonNull String bytesToString(final byte @NonNull[] bytes, final int charHint) {
         final StringBuilder sb = new StringBuilder(charHint);
         appendHexByte(sb, bytes[0]);
         for (int i = 1; i < bytes.length; ++i) {
diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
index f8797a6566..13d4537386 100644
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.model.ietf.util;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 /**
  * IPv4 address parsing for ietf-inet-types ipv4-address. This is an internal implementation class, not meant to be
  * exposed in any shape or form to the outside world, as the code relies on the fact that the strings presented to it
@@ -17,7 +19,7 @@ final class Ipv4Utils {
         throw new UnsupportedOperationException();
     }
 
-    static void fillIpv4Bytes(final byte[] bytes, final int byteStart, final String str, final int strStart,
+    static void fillIpv4Bytes(final byte @NonNull[] bytes, final int byteStart, final String str, final int strStart,
             final int strLimit) {
         int out = byteStart;
         int val = 0;
@@ -27,7 +29,7 @@ final class Ipv4Utils {
                 bytes[out++] = (byte) val;
                 val = 0;
             } else {
-                val = 10 * val + (c - '0');
+                val = 10 * val + c - '0';
             }
         }
 
diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
index 5f2757083b..001921508b 100644
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
@@ -7,10 +7,11 @@
  */
 package org.opendaylight.mdsal.model.ietf.util;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+
 import java.util.Arrays;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * IPv6 address parsing for ietf-inet-types ipv6-address and ipv6-prefix. This is an internal implementation
@@ -59,12 +60,12 @@ final class Ipv6Utils {
      * @param strLimit String offset which should not be processed
      * @throws NullPointerException if ipv6address is null
      */
-    static void fillIpv6Bytes(final @Nonnull byte[] bytes, final String str, final int strLimit) {
+    static void fillIpv6Bytes(final byte @NonNull[] bytes, final String str, final int strLimit) {
        // Leading :: requires some special handling.
        int i = 0;
        if (str.charAt(i) == ':') {
            // Note ++i side-effect in check
-           Preconditions.checkArgument(str.charAt(++i) == ':', "Invalid v6 address '%s'", str);
+           checkArgument(str.charAt(++i) == ':', "Invalid v6 address '%s'", str);
        }
 
        boolean haveVal = false;
@@ -80,7 +81,7 @@ final class Ipv6Utils {
                curtok = i;
                if (haveVal) {
                    // removed overrun check - the regexp checks for valid data
-                   bytes[j++] = (byte) ((val >>> 8) & 0xff);
+                   bytes[j++] = (byte) (val >>> 8 & 0xff);
                    bytes[j++] = (byte) (val & 0xff);
                    haveVal = false;
                    val = 0;
@@ -93,7 +94,7 @@ final class Ipv6Utils {
            }
 
            // frankenstein - v4 attached to v6, mixed notation
-           if (ch == '.' && ((j + INADDR4SZ) <= INADDR6SZ)) {
+           if (ch == '.' && j + INADDR4SZ <= INADDR6SZ) {
                /*
                 * This has passed the regexp so it is fairly safe to parse it
                 * straight away. Use the Ipv4Utils for that.
@@ -111,21 +112,21 @@ final class Ipv6Utils {
             * anything bigger than 0xffff between the separators.
             */
            final int chval = AbstractIetfYangUtil.hexValue(ch);
-           val = (val << 4) | chval;
+           val = val << 4 | chval;
            haveVal = true;
        }
 
        if (haveVal) {
-           Verify.verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
-           bytes[j++] = (byte) ((val >> 8) & 0xff);
+           verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
+           bytes[j++] = (byte) (val >> 8 & 0xff);
            bytes[j++] = (byte) (val & 0xff);
        }
 
        if (colonp != -1) {
-           Verify.verify(j != INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
+           verify(j != INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
            expandZeros(bytes, colonp, j);
        } else {
-           Verify.verify(j == INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
+           verify(j == INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
        }
    }
 
diff --git a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/IpUtil.java b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/IpUtil.java
index 20326a8915..500d59c152 100644
--- a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/IpUtil.java
+++ b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/IpUtil.java
@@ -8,7 +8,6 @@
 package org.opendaylight.mdsal.model.ietf.util;
 
 import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
 import javax.annotation.RegEx;
 
 final class IpUtil extends AbstractIetfInetUtil<IpClass, IpClass, IpClass, IpClass, IpClass, IpClass, IpClass, IpClass,
@@ -23,7 +22,6 @@ final class IpUtil extends AbstractIetfInetUtil<IpClass, IpClass, IpClass, IpCla
     }
 
     @Override
-    @Nonnull
     protected IpClass ipv4Address(final IpClass addr) {
         return addr;
     }
@@ -35,7 +33,6 @@ final class IpUtil extends AbstractIetfInetUtil<IpClass, IpClass, IpClass, IpCla
     }
 
     @Override
-    @Nonnull
     protected IpClass ipv6Address(final IpClass addr) {
         return addr;
     }
@@ -46,37 +43,31 @@ final class IpUtil extends AbstractIetfInetUtil<IpClass, IpClass, IpClass, IpCla
     }
 
     @Override
-    @Nonnull
     protected IpClass ipv4Prefix(final IpClass addr) {
         return addr;
     }
 
     @Override
-    @Nonnull
     protected IpClass ipv6Prefix(final IpClass addr) {
         return addr;
     }
 
     @Override
-    @Nonnull
     protected String ipv4AddressString(final IpClass addr) {
         return addr.getValue();
     }
 
     @Override
-    @Nonnull
     protected String ipv6AddressString(final IpClass addr) {
         return addr.getValue();
     }
 
     @Override
-    @Nonnull
     protected String ipv4PrefixString(final IpClass prefix) {
         return prefix.getValue();
     }
 
     @Override
-    @Nonnull
     protected String ipv6PrefixString(final IpClass prefix) {
         return prefix.getValue();
     }
-- 
2.36.6