From 8f2bd1afd6376bda2bf73143b8c6cb426afca92f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 19 Jul 2020 21:39:22 +0200
Subject: [PATCH 1/1] Remove deprecated ietf-type-util methods

A number of methods have been deprecated in the previous release,
remove them now.

Change-Id: If9f74b66049e1cc22492af98edccd84df4f8f83a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../model/ietf/util/AbstractIetfInetUtil.java | 68 -------------------
 .../model/ietf/util/AbstractIetfYangUtil.java |  5 --
 .../ietf/util/AbstractIetfInetUtilTest.java   |  6 --
 3 files changed, 79 deletions(-)

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 124318ae59..9a92be0677 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
@@ -257,46 +257,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return address4NoZoneFactory.newInstance(Ipv4Utils.addressString(bits));
     }
 
-    /**
-     * Create an Ipv4AddressNoZone by interpreting input bytes as an IPv4 address.
-     *
-     * @param bytes 4-byte array
-     * @return An Ipv4AddressNoZone object
-     * @throws IllegalArgumentException if bytes has length different from 4
-     * @throws NullPointerException if bytes is null
-     * @deprecated Use {@link #ipv4AddressFor(byte[])} instead.
-     */
-    @Deprecated(forRemoval = true)
-    public final @NonNull A4NZ ipv4AddressNoZoneFor(final byte @NonNull[] bytes) {
-        return ipv4AddressFor(bytes);
-    }
-
-    /**
-     * Create an Ipv4AddressNoZone by interpreting an {@link Inet4Address}.
-     *
-     * @param addr An {@link Inet4Address}
-     * @return An Ipv4AddressNoZone object
-     * @throws IllegalArgumentException if addr is not an {@link Inet4Address}
-     * @throws NullPointerException if addr is null
-     * @deprecated Use {@link #ipv4AddressFor(InetAddress)} instead.
-     */
-    @Deprecated(forRemoval = true)
-    public final @NonNull A4NZ ipv4AddressNoZoneFor(final @NonNull InetAddress addr) {
-        return ipv4AddressFor(addr);
-    }
-
-    /**
-     * Create an Ipv4AddressNoZone by interpreting input 32 bits as an IPv4 address in big-endian format.
-     *
-     * @param bits 32 bits, big endian
-     * @return An Ipv4AddressNoZone object
-     * @deprecated Use {@link #ipv4AddressFor(int)} instead.
-     */
-    @Deprecated(forRemoval = true)
-    public final @NonNull A4NZ ipv4AddressNoZoneFor(final int bits) {
-        return ipv4AddressFor(bits);
-    }
-
     /**
      * Create an Ipv4AddressNoZone by interpreting an Ipv4Address.
      *
@@ -493,34 +453,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return address6NoZoneFactory.newInstance(addressStringV6(addr));
     }
 
-    /**
-     * Create an Ipv6AddressNoZone by interpreting input bytes as an IPv6 address.
-     *
-     * @param bytes 16-byte array
-     * @return An Ipv6Address object
-     * @throws IllegalArgumentException if bytes has length different from 16
-     * @throws NullPointerException if bytes is null
-     * @deprecated Use {@link #ipv6AddressFor(byte[])} instead.
-     */
-    @Deprecated(forRemoval = true)
-    public final @NonNull A6NZ ipv6AddressNoZoneFor(final byte @NonNull[] bytes) {
-        return ipv6AddressFor(bytes);
-    }
-
-    /**
-     * Create an Ipv6AddressNoZone by interpreting an {@link Inet6Address}.
-     *
-     * @param addr An {@link Inet6Address}
-     * @return An Ipv6AddressNoZone object
-     * @throws IllegalArgumentException if addr is not an {@link Inet6Address}
-     * @throws NullPointerException if addr is null
-     * @deprecated Use {@link #ipv6AddressFor(InetAddress)} instead.
-     */
-    @Deprecated(forRemoval = true)
-    public final @NonNull A6NZ ipv6AddressNoZoneFor(final @NonNull InetAddress addr) {
-        return ipv6AddressFor(addr);
-    }
-
     /**
      * Create an Ipv6AddressNoZone by interpreting an Ipv6Address.
      *
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 db1d25893a..b0a3676baf 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
@@ -121,11 +121,6 @@ public abstract class AbstractIetfYangUtil<M, P, H, Q, U> {
         return str.isEmpty() ? EMPTY_BYTES : stringToBytes(str, str.length() / 3 + 1);
     }
 
-    @Deprecated
-    public final byte @NonNull[] bytesFor(final @NonNull M macAddress) {
-        return macAddressBytes(macAddress);
-    }
-
     public final @NonNull H hexStringFor(final byte @NonNull[] bytes) {
         checkArgument(bytes.length > 0, "Hex string should have at least one byte");
         return hexFactory.newInstance(bytesToString(bytes, bytes.length * 3 - 1));
diff --git a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java
index ab6796150c..d9a422fcc3 100644
--- a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java
+++ b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java
@@ -187,12 +187,6 @@ public class AbstractIetfInetUtilTest {
         assertEquals("255.255.255.255", UTIL.ipv4AddressFor(0xFFFFFFFF).getValue());
     }
 
-    @Test
-    public void testIpv4AddressNoZoneForBits() {
-        assertEquals("1.2.3.4", UTIL.ipv4AddressNoZoneFor(0x01020304).getValue());
-        assertEquals("255.255.255.255", UTIL.ipv4AddressNoZoneFor(0xFFFFFFFF).getValue());
-    }
-
     @Test
     public void testIpv4AddressBits() {
         assertEquals(0x01020304, UTIL.ipv4AddressBits(new IpClass("1.2.3.4")));
-- 
2.36.6