Migrate ietf-type-util to JDT annotations

[mdsal.git] / model / ietf / ietf-type-util / src / test / java / org / opendaylight / mdsal / model / ietf / util / IpUtil.java

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 ca4d227f7d820303c207f31c8c7c666306426888..500d59c152ad5947a428fdbab0b880906aa7e4f8 100644 (file)
--- 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
@@ -5,78 +5,90 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 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> {
+final class IpUtil extends AbstractIetfInetUtil<IpClass, IpClass, IpClass, IpClass, IpClass, IpClass, IpClass, IpClass,
+        IpClass> {
 
     @RegEx
     private static final String IP_V4_REGEX = "^\\d+\\.\\d+\\.\\d+\\.\\d+$";
     private static final Pattern IP_V4_PATTERN = Pattern.compile(IP_V4_REGEX);
 
     IpUtil() {
-        super(IpClass.class, IpClass.class, IpClass.class, IpClass.class);
+        super(IpClass.class, IpClass.class, IpClass.class, IpClass.class, IpClass.class, IpClass.class);
     }
 
     @Override
-    @Nonnull
     protected IpClass ipv4Address(final IpClass addr) {
         return addr;
     }
 
+
+    @Override
+    protected IpClass ipv4AddressNoZone(final IpClass addr) {
+        return addr;
+    }
+
     @Override
-    @Nonnull
     protected IpClass ipv6Address(final IpClass addr) {
         return addr;
     }
 
     @Override
-    @Nonnull
-    protected IpClass ipv4Prefix(IpClass addr) {
+    protected IpClass ipv6AddressNoZone(final IpClass addr) {
+        return addr;
+    }
+
+    @Override
+    protected IpClass ipv4Prefix(final IpClass addr) {
         return addr;
     }
 
     @Override
-    @Nonnull
-    protected IpClass ipv6Prefix(IpClass addr) {
+    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();
     }
 
     @Override
-    protected IpClass maybeIpv4Address(IpClass addr) {
+    protected IpClass maybeIpv4Address(final IpClass addr) {
         return IP_V4_PATTERN.matcher(addr.getValue()).matches() ? addr : null;
     }
 
     @Override
-    protected IpClass maybeIpv6Address(IpClass addr) {
+    protected IpClass maybeIpv4AddressNoZone(final IpClass addr) {
+        return maybeIpv4Address(addr);
+    }
+
+    @Override
+    protected IpClass maybeIpv6Address(final IpClass addr) {
         return addr.getValue().indexOf(':') != -1 ? addr : null;
     }
+
+    @Override
+    protected IpClass maybeIpv6AddressNoZone(final IpClass addr) {
+        return maybeIpv6Address(addr);
+    }
 }
\ No newline at end of file