Remove deprecated AbstractIetfInetUtil methods

We have a few deprecations here, remove these methods.

Change-Id: Idfd53d34c8892f7eb23f16c2be55fcfda4a0179c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 9a92be06772a3701f453e70ae35d0bd89134909c..ae330d4eabdeb171da62359153ecf66a6546c9ad 100644 (file)
--- 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
@@ -274,11 +274,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return prefixToAddress(address4NoZoneFactory, ipv4PrefixString(prefix));
     }
 
-    @Deprecated(forRemoval = true)
-    public final @NonNull A4NZ ipv4AddressNoZoneFrom(final @NonNull P4 prefix) {
-        return ipv4AddressFrom(prefix);
-    }
-
     public final byte @NonNull[] ipv4AddressBytes(final @NonNull A4 addr) {
         /*
          * This implementation relies heavily on the input string having been validated to comply with
@@ -414,11 +409,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return splitPrefix(address4NoZoneFactory, ipv4PrefixString(prefix));
     }
 
-    @Deprecated(forRemoval = true)
-    public final @NonNull Entry<A4NZ, Integer> splitIpv4PrefixNoZone(final @NonNull P4 prefix) {
-        return splitIpv4Prefix(prefix);
-    }
-
     public final byte @NonNull[] ipv4PrefixToBytes(final @NonNull P4 prefix) {
         final String str = ipv4PrefixString(prefix);
         final int slash = str.lastIndexOf('/');
@@ -470,11 +460,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return prefixToAddress(address6NoZoneFactory, ipv6PrefixString(prefix));
     }
 
-    @Deprecated(forRemoval = true)
-    public final @NonNull A6NZ ipv6AddressNoZoneFrom(final @NonNull P6 prefix) {
-        return ipv6AddressFrom(prefix);
-    }
-
     public final byte @NonNull[] ipv6AddressBytes(final @NonNull A6 addr) {
         final String str = ipv6AddressString(addr);
         final int percent = str.indexOf('%');
@@ -596,11 +581,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return splitPrefix(address6NoZoneFactory, ipv6PrefixString(prefix));
     }
 
-    @Deprecated(forRemoval = true)
-    public final @NonNull Entry<A6NZ, Integer> splitIpv6PrefixNoZone(final @NonNull P6 prefix) {
-        return splitIpv6Prefix(prefix);
-    }
-
     private static <T> @NonNull T prefixToAddress(final StringValueObjectFactory<T> factory, final String str) {
         return factory.newInstance(str.substring(0, str.lastIndexOf('/')));
     }