Move ByteBufWriteUtil.IPV{4,6}_PREFIX_BYTE_LENGTH}

These constants are not used outside of the package, hide them and
move them to their respective Ipv{4,6}Util classes.

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

diff --git a/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java b/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java
index fd8e64e92f25efa91da744345397f38291cb2aaf..4ef722db2b93a89d5e3a19abbcdf3e07bed6f8ba 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java
@@ -21,9 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.
  * Utility class for ByteBuf's write methods.
  */
 public final class ByteBufWriteUtil {
-    public static final int IPV4_PREFIX_BYTE_LENGTH = Ipv4Util.IP4_LENGTH + 1;
-    public static final int IPV6_PREFIX_BYTE_LENGTH = Ipv6Util.IPV6_LENGTH + 1;
-
     private ByteBufWriteUtil() {
         // Hidden on purpose
     }
@@ -76,7 +73,7 @@ public final class ByteBufWriteUtil {
         if (ipv4Prefix != null) {
             output.writeBytes(Ipv4Util.bytesForPrefix(ipv4Prefix));
         } else {
-            output.writeZero(IPV4_PREFIX_BYTE_LENGTH);
+            output.writeZero(Ipv4Util.PREFIX_BYTE_LENGTH);
         }
     }
 
@@ -128,7 +125,7 @@ public final class ByteBufWriteUtil {
         if (ipv6Prefix != null) {
             output.writeBytes(Ipv6Util.bytesForPrefix(ipv6Prefix));
         } else {
-            output.writeZero(IPV6_PREFIX_BYTE_LENGTH);
+            output.writeZero(Ipv6Util.PREFIX_BYTE_LENGTH);
         }
     }
 

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
index 3d33bb5edb54bcd650e757fd30a357e6a7210795..8fadac84e6b171aaf0d73f368d646e71a7286d30 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
@@ -32,6 +32,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 public final class Ipv4Util {
     public static final int IP4_LENGTH = 4;
     public static final int IP4_BITS_LENGTH = 32;
+
+    static final int PREFIX_BYTE_LENGTH = IP4_LENGTH + 1;
+
     private static final Ipv4Prefix EMPTY_PREFIX = new Ipv4Prefix("0.0.0.0/0");
 
     private Ipv4Util() {

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
index c1257293964829fc12a87d062527db817d71dd31..d11fa83071e5a59f28631f80fb142a0e5597fbf1 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
@@ -27,6 +27,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 public final class Ipv6Util {
     public static final int IPV6_LENGTH = 16;
     public static final int IPV6_BITS_LENGTH = 128;
+
+    static final int PREFIX_BYTE_LENGTH = IPV6_LENGTH + 1;
+
     private static final Ipv6Prefix EMPTY_PREFIX = new Ipv6Prefix("::/0");
 
     private Ipv6Util() {

diff --git a/util/src/test/java/org/opendaylight/protocol/util/ByteBufWriteUtilTest.java b/util/src/test/java/org/opendaylight/protocol/util/ByteBufWriteUtilTest.java
index 4213e99979d048b9ed52ef94233e9a88bf770aaf..43241b7cb27c04c2b474eee951c9276213eb5a16 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/ByteBufWriteUtilTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/ByteBufWriteUtilTest.java
@@ -41,7 +41,7 @@ public class ByteBufWriteUtilTest {
     @Test
     public void testWriteIpv4Prefix() {
         final byte[] result = { 123, 122, 4, 5, 8 };
-        final ByteBuf output = Unpooled.buffer(ByteBufWriteUtil.IPV4_PREFIX_BYTE_LENGTH);
+        final ByteBuf output = Unpooled.buffer(Ipv4Util.PREFIX_BYTE_LENGTH);
         writeIpv4Prefix(new Ipv4Prefix("123.122.4.5/8"), output);
         assertArrayEquals(result, output.array());
 
@@ -69,7 +69,7 @@ public class ByteBufWriteUtilTest {
     public void testWriteIpv6Prefix() {
         final byte[] result = { 0x20, (byte) 0x01, 0x0d, (byte) 0xb8, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, 0x40 };
-        final ByteBuf output = Unpooled.buffer(ByteBufWriteUtil.IPV6_PREFIX_BYTE_LENGTH);
+        final ByteBuf output = Unpooled.buffer(Ipv6Util.PREFIX_BYTE_LENGTH);
         writeIpv6Prefix(new Ipv6Prefix("2001:db8:1:2::/64"), output);
         assertArrayEquals(result, output.array());