Move IPv4 string utilities

AbstractIetfYangUtil depends on AbstractIetfInetUtil, which is not nice.
Move the two methods needed to Ipv4Utils, so we break that dependency.

JIRA: MDSAL-826
Change-Id: I097738ca75c03ebe4292149f353dfa0d29a4197d
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 89c600cc09c96a3a02cf9cdec1e4f0e5241ebf72..1a1eeebe3c78a0e58d2a30d891394a136fad6bc3 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
@@ -232,7 +232,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @throws NullPointerException if bytes is null
      */
     public final @NonNull A4NZ ipv4AddressFor(final byte @NonNull[] bytes) {
-        return address4NoZoneFactory.newInstance(addressStringV4(bytes));
+        return address4NoZoneFactory.newInstance(Ipv4Utils.addressString(bytes));
     }
 
     /**
@@ -593,21 +593,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return bytes;
     }
 
-    private static void appendIpv4String(final StringBuilder sb, final byte @NonNull[] bytes) {
-        checkArgument(bytes.length == Ipv4Utils.INET4_LENGTH, "IPv4 address length is 4 bytes");
-
-        sb.append(Byte.toUnsignedInt(bytes[0]));
-        for (int i = 1; i < Ipv4Utils.INET4_LENGTH; ++i) {
-            sb.append('.').append(Byte.toUnsignedInt(bytes[i]));
-        }
-    }
-
-    static String addressStringV4(final byte @NonNull[] bytes) {
-        final StringBuilder sb = new StringBuilder(15);
-        appendIpv4String(sb, bytes);
-        return sb.toString();
-    }
-
     private static @NonNull String addressStringV4(final InetAddress addr) {
         requireAddress(addr);
         checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
@@ -636,7 +621,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
 
     private static String prefixStringV4(final byte @NonNull[] bytes) {
         final StringBuilder sb = new StringBuilder(18);
-        appendIpv4String(sb, bytes);
+        Ipv4Utils.appendIpv4String(sb, bytes);
         return sb.append("/32").toString();
     }
 
@@ -644,7 +629,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
 
         final StringBuilder sb = new StringBuilder(18);
-        appendIpv4String(sb, bytes);
+        Ipv4Utils.appendIpv4String(sb, bytes);
         return sb.append('/').append(mask).toString();
     }
 

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 5f785b1f15dc941ed166b9d991c1c79b5a0da23c..b8d08edc20e1f44685374a8a37746e207a532a91 100644 (file)
--- 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
@@ -114,7 +114,7 @@ public abstract class AbstractIetfYangUtil<M, P, H, Q, U> {
 
     public final @NonNull Q dottedQuadFor(final byte @NonNull[] bytes) {
         checkArgument(bytes.length == 4, "Dotted-quad should have 4 bytes");
-        return quadFactory.newInstance(AbstractIetfInetUtil.addressStringV4(bytes));
+        return quadFactory.newInstance(Ipv4Utils.addressString(bytes));
     }
 
     public final @NonNull Q dottedQuadFor(final int bits) {

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 9d2eb2e6b617cbee645242ddd328e4fd939c0765..c9ae02ebce2bd90711a61ca7fef3f7406b93832c 100644 (file)
--- 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 static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;
 
@@ -64,4 +66,19 @@ public final class Ipv4Utils {
     static String addressString(final int bits) {
         return (bits >>> 24) + "." + (bits >>> 16 & 0xFF) + "." + (bits >>> 8 & 0xFF) + "." + (bits & 0xFF);
     }
+
+    static String addressString(final byte @NonNull[] bytes) {
+        final StringBuilder sb = new StringBuilder(15);
+        appendIpv4String(sb, bytes);
+        return sb.toString();
+    }
+
+    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]));
+        for (int i = 1; i < INET4_LENGTH; ++i) {
+            sb.append('.').append(Byte.toUnsignedInt(bytes[i]));
+        }
+    }
 }