Move ipv4/ipv6 ByteBuf utilities to Ipv{4,6}Util

[bgpcep.git] / util / src / main / java / org / opendaylight / protocol / util / ByteBufWriteUtil.java

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 4ef722db2b93a89d5e3a19abbcdf3e07bed6f8ba..53dedcb8f8bd59b5bd55b0469ef94daf3a00090e 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java
@@ -8,13 +8,6 @@
 package org.opendaylight.protocol.util;
 
 import io.netty.buffer.ByteBuf;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Float32;
 
 /**
@@ -25,125 +18,6 @@ public final class ByteBufWriteUtil {
         // Hidden on purpose
     }
 
-    /**
-     * Writes IPv4 address if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 4.
-     *
-     * @param ipv4Address
-     *            IPv4 address to be written to the output.
-     * @param output
-     *            ByteBuf, where ipv4Address or zeros are written.
-     */
-    public static void writeIpv4Address(final Ipv4Address ipv4Address, final ByteBuf output) {
-        if (ipv4Address != null) {
-            output.writeBytes(Ipv4Util.bytesForAddress(ipv4Address));
-        } else {
-            output.writeInt(0);
-        }
-    }
-
-    /**
-     * Writes IPv4 address if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 4.
-     *
-     * @param ipv4Address
-     *            IPv4 address to be written to the output.
-     * @param output
-     *            ByteBuf, where ipv4Address or zeros are written.
-     */
-    public static void writeIpv4Address(final Ipv4AddressNoZone ipv4Address, final ByteBuf output) {
-        if (ipv4Address != null) {
-            output.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressNoZoneBytes(ipv4Address));
-        } else {
-            output.writeInt(0);
-        }
-    }
-
-    /**
-     * Writes IPv4 prefix if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 5.
-     *
-     * @param ipv4Prefix
-     *            IPv4 prefix value to be written to the output. Prefix is
-     *            written in the last byte.
-     * @param output
-     *            ByteBuf, where ipv4Prefix or zeros are written.
-     */
-    public static void writeIpv4Prefix(final Ipv4Prefix ipv4Prefix, final ByteBuf output) {
-        if (ipv4Prefix != null) {
-            output.writeBytes(Ipv4Util.bytesForPrefix(ipv4Prefix));
-        } else {
-            output.writeZero(Ipv4Util.PREFIX_BYTE_LENGTH);
-        }
-    }
-
-    /**
-     * Writes IPv6 address if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 16.
-     *
-     * @param ipv6Address
-     *            IPv6 address to be written to the output.
-     * @param output
-     *            ByteBuf, where ipv6Address or zeros are written.
-     */
-    public static void writeIpv6Address(final Ipv6Address ipv6Address, final ByteBuf output) {
-        if (ipv6Address != null) {
-            output.writeBytes(Ipv6Util.bytesForAddress(ipv6Address));
-        } else {
-            output.writeZero(Ipv6Util.IPV6_LENGTH);
-        }
-    }
-
-    /**
-     * Writes IPv6 address if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 16.
-     *
-     * @param ipv6Address
-     *            IPv6 address to be written to the output.
-     * @param output
-     *            ByteBuf, where ipv6Address or zeros are written.
-     */
-    public static void writeIpv6Address(final Ipv6AddressNoZone ipv6Address, final ByteBuf output) {
-        if (ipv6Address != null) {
-            output.writeBytes(IetfInetUtil.INSTANCE.ipv6AddressNoZoneBytes(ipv6Address));
-        } else {
-            output.writeZero(Ipv6Util.IPV6_LENGTH);
-        }
-    }
-
-    /**
-     * Writes IPv6 prefix if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 17.
-     *
-     * @param ipv6Prefix
-     *            IPv6 prefix to be written to the output. Prefix is written in
-     *            the last byte.
-     * @param output
-     *            ByteBuf, where ipv6Prefix or zeros are written.
-     */
-    public static void writeIpv6Prefix(final Ipv6Prefix ipv6Prefix, final ByteBuf output) {
-        if (ipv6Prefix != null) {
-            output.writeBytes(Ipv6Util.bytesForPrefix(ipv6Prefix));
-        } else {
-            output.writeZero(Ipv6Util.PREFIX_BYTE_LENGTH);
-        }
-    }
-
-    public static void writeMinimalPrefix(final Ipv4Prefix ipv4Prefix, final ByteBuf output) {
-        final byte[] bytes = IetfInetUtil.INSTANCE.ipv4PrefixToBytes(ipv4Prefix);
-        writeMinimalPrefix(output, bytes, bytes[Ipv4Util.IP4_LENGTH]);
-    }
-
-    public static void writeMinimalPrefix(final Ipv6Prefix ipv6Prefix, final ByteBuf output) {
-        final byte[] bytes = IetfInetUtil.INSTANCE.ipv6PrefixToBytes(ipv6Prefix);
-        writeMinimalPrefix(output, bytes, bytes[Ipv6Util.IPV6_LENGTH]);
-    }
-
-    private static void writeMinimalPrefix(final ByteBuf output, final byte[] bytes, final byte prefixBits) {
-        output.writeByte(prefixBits);
-        output.writeBytes(bytes, 0, Ipv4Util.prefixBitsToBytes(Byte.toUnsignedInt(prefixBits)));
-    }
-
     /**
      * Writes Float32 <code>value</code> if not null, otherwise writes zeros to
      * the <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 4.