*/
package org.opendaylight.mdsal.model.ietf.util;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.Map.Entry;
import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.binding.util.StringValueObjectFactory;
+import javax.annotation.Nullable;
+import org.opendaylight.mdsal.binding.spec.reflect.StringValueObjectFactory;
/**
* A set of utility methods to efficiently instantiate various ietf-inet-types DTOs.
*/
@Beta
-public abstract class AbstractIetfInetUtil<A4, P4, A6, P6, A> {
+public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ extends A6, P6, A, ANZ, P> {
private static final int INET4_LENGTH = 4;
private static final int INET6_LENGTH = 16;
private final StringValueObjectFactory<A4> address4Factory;
+ private final StringValueObjectFactory<A4NZ> address4NoZoneFactory;
private final StringValueObjectFactory<P4> prefix4Factory;
private final StringValueObjectFactory<A6> address6Factory;
+ private final StringValueObjectFactory<A6NZ> address6NoZoneFactory;
private final StringValueObjectFactory<P6> prefix6Factory;
- protected AbstractIetfInetUtil(final Class<A4> addr4Class, final Class<P4> prefix4Class,
- final Class<A6> addr6Class, final Class<P6> prefix6Class) {
+ protected AbstractIetfInetUtil(final Class<A4> addr4Class, final Class<A4NZ> addr4nzClass,
+ final Class<P4> prefix4Class, final Class<A6> addr6Class, final Class<A6NZ> addr6nzClass,
+ final Class<P6> prefix6Class) {
this.address4Factory = StringValueObjectFactory.create(addr4Class, "0.0.0.0");
+ this.address4NoZoneFactory = StringValueObjectFactory.create(addr4nzClass, "0.0.0.0");
this.prefix4Factory = StringValueObjectFactory.create(prefix4Class, "0.0.0.0/0");
this.address6Factory = StringValueObjectFactory.create(addr6Class, "::0");
+ this.address6NoZoneFactory = StringValueObjectFactory.create(addr6nzClass, "::0");
this.prefix6Factory = StringValueObjectFactory.create(prefix6Class, "::0/0");
}
- protected abstract A ipv4Address(A4 addr);
- protected abstract A ipv6Address(A6 addr);
- protected abstract String ipv4AddressString(A4 addr);
- protected abstract String ipv6AddressString(A6 addr);
- protected abstract String ipv4PrefixString(P4 prefix);
- protected abstract String ipv6PrefixString(P6 prefix);
+ @Nonnull protected abstract A ipv4Address(@Nonnull A4 addr);
+ @Nonnull protected abstract ANZ ipv4AddressNoZone(@Nonnull A4NZ addr);
+ @Nonnull protected abstract A ipv6Address(@Nonnull A6 addr);
+ @Nonnull protected abstract ANZ ipv6AddressNoZone(@Nonnull A6NZ addr);
+
+ @Nullable protected abstract A4 maybeIpv4Address(@Nonnull A addr);
+ @Nullable protected abstract A4NZ maybeIpv4AddressNoZone(@Nonnull ANZ addr);
+ @Nullable protected abstract A6 maybeIpv6Address(@Nonnull A addr);
+ @Nullable protected abstract A6NZ maybeIpv6AddressNoZone(@Nonnull ANZ addr);
+
+ @Nonnull protected abstract P ipv4Prefix(@Nonnull P4 addr);
+ @Nonnull protected abstract P ipv6Prefix(@Nonnull P6 addr);
+ @Nonnull protected abstract String ipv4AddressString(@Nonnull A4 addr);
+ @Nonnull protected abstract String ipv6AddressString(@Nonnull A6 addr);
+ @Nonnull protected abstract String ipv4PrefixString(@Nonnull P4 prefix);
+ @Nonnull protected abstract String ipv6PrefixString(@Nonnull P6 prefix);
+ /**
+ * Create an IpAddress by interpreting input bytes as an IPv4 or IPv6 address, based on array length.
+ *
+ * @param bytes 4-byte (IPv4) or 6-byte (IPv6) array
+ * @return An IpAddress object
+ * @throws IllegalArgumentException if bytes has length different from 4 or 6
+ * @throws NullPointerException if bytes is null
+ */
@Nonnull public final A ipAddressFor(@Nonnull final byte[] bytes) {
switch (bytes.length) {
- case 4:
+ case INET4_LENGTH:
return ipv4Address(ipv4AddressFor(bytes));
- case 16:
+ case INET6_LENGTH:
return ipv6Address(ipv6AddressFor(bytes));
default:
throw new IllegalArgumentException("Invalid array length " + bytes.length);
}
@Nonnull public final A ipAddressFor(@Nonnull final InetAddress addr) {
- Preconditions.checkNotNull(addr, "Address must not be null");
+ requireNonNull(addr, "Address must not be null");
if (addr instanceof Inet4Address) {
return ipv4Address(ipv4AddressFor(addr));
} else if (addr instanceof Inet6Address) {
}
}
+ /**
+ * Create an IpAddress by interpreting input bytes as an IPv4 or IPv6 address, based on array length.
+ *
+ * @param bytes 4-byte (IPv4) or 6-byte (IPv6) array
+ * @return A no-zone IpAddress object
+ * @throws IllegalArgumentException if bytes has length different from 4 or 6
+ * @throws NullPointerException if bytes is null
+ */
+ @Nonnull public final ANZ ipAddressNoZoneFor(@Nonnull final byte[] bytes) {
+ switch (bytes.length) {
+ case INET4_LENGTH:
+ return ipv4AddressNoZone(ipv4AddressNoZoneFor(bytes));
+ case INET6_LENGTH:
+ return ipv6AddressNoZone(ipv6AddressNoZoneFor(bytes));
+ default:
+ throw new IllegalArgumentException("Invalid array length " + bytes.length);
+ }
+ }
+
+ @Nonnull public final ANZ ipAddressNoZoneFor(@Nonnull final InetAddress addr) {
+ requireNonNull(addr, "Address must not be null");
+ if (addr instanceof Inet4Address) {
+ return ipv4AddressNoZone(ipv4AddressNoZoneFor(addr));
+ } else if (addr instanceof Inet6Address) {
+ return ipv6AddressNoZone(ipv6AddressNoZoneFor(addr));
+ } else {
+ throw new IllegalArgumentException("Unhandled address " + addr);
+ }
+ }
+
+ /**
+ * Create an IpPrefix by combining the address with a mask. The address
+ * bytes are interpreted as an address and the specified mask is concatenated to
+ * it. The address bytes are not masked.
+ *
+ * @param bytes Input address as a 4-byte (IPv4) or 16-byte (IPv6) array
+ * @param mask Prefix mask
+ * @return An IpPrefix object
+ * @throws IllegalArgumentException if bytes has length different from 4 or 16 or if mask is not
+ * in range 0-32 or 0-128 respectively
+ * @throws NullPointerException if bytes is null
+ */
+ @Nonnull public final P ipPrefixFor(@Nonnull final byte[] bytes, final int mask) {
+ switch (bytes.length) {
+ case INET4_LENGTH:
+ return ipv4Prefix(ipv4PrefixFor(bytes, mask));
+ case INET6_LENGTH:
+ return ipv6Prefix(ipv6PrefixFor(bytes, mask));
+ default:
+ throw new IllegalArgumentException("Invalid array length " + bytes.length);
+ }
+ }
+
+ @Nonnull public final P ipPrefixFor(@Nonnull final InetAddress addr, final int mask) {
+ requireNonNull(addr, "Address must not be null");
+ if (addr instanceof Inet4Address) {
+ return ipv4Prefix(ipv4PrefixFor(addr, mask));
+ } else if (addr instanceof Inet6Address) {
+ return ipv6Prefix(ipv6PrefixFor(addr, mask));
+ } else {
+ throw new IllegalArgumentException("Unhandled address " + addr);
+ }
+ }
+
+ @Nonnull public final InetAddress inetAddressFor(@Nonnull final A addr) {
+ final A4 v4 = maybeIpv4Address(addr);
+ if (v4 != null) {
+ return inet4AddressFor(v4);
+ }
+ final A6 v6 = maybeIpv6Address(addr);
+ checkArgument(v6 != null, "Address %s is neither IPv4 nor IPv6", addr);
+ return inet6AddressFor(v6);
+ }
+
+ @Nonnull public final InetAddress inetAddressForNoZone(@Nonnull final ANZ addr) {
+ final A4NZ v4 = maybeIpv4AddressNoZone(addr);
+ if (v4 != null) {
+ return inet4AddressForNoZone(v4);
+ }
+ final A6NZ v6 = maybeIpv6AddressNoZone(addr);
+ checkArgument(v6 != null, "Address %s is neither IPv4 nor IPv6", addr);
+ return inet6AddressForNoZone(v6);
+ }
+
+
+ @Nonnull public final Inet4Address inet4AddressFor(@Nonnull final A4 addr) {
+ try {
+ return (Inet4Address) InetAddress.getByAddress(ipv4AddressBytes(addr));
+ } catch (UnknownHostException e) {
+ throw new IllegalArgumentException("Invalid address " + addr, e);
+ }
+ }
+
+ @Nonnull public final Inet4Address inet4AddressForNoZone(@Nonnull final A4NZ addr) {
+ try {
+ return (Inet4Address) InetAddress.getByAddress(ipv4AddressNoZoneBytes(addr));
+ } catch (UnknownHostException e) {
+ throw new IllegalArgumentException("Invalid address " + addr, e);
+ }
+ }
+
+ @Nonnull public final Inet6Address inet6AddressFor(@Nonnull final A6 addr) {
+ try {
+ return (Inet6Address) InetAddress.getByAddress(ipv6AddressBytes(addr));
+ } catch (UnknownHostException e) {
+ throw new IllegalArgumentException("Invalid address " + addr, e);
+ }
+ }
+
+ @Nonnull public final Inet6Address inet6AddressForNoZone(@Nonnull final A6NZ addr) {
+ try {
+ return (Inet6Address) InetAddress.getByAddress(ipv6AddressNoZoneBytes(addr));
+ } catch (UnknownHostException e) {
+ throw new IllegalArgumentException("Invalid address " + addr, e);
+ }
+ }
+
/**
* Create an Ipv4Address by interpreting input bytes as an IPv4 address.
*
* @throws NullPointerException if addr is null
*/
@Nonnull public final A4 ipv4AddressFor(@Nonnull final InetAddress addr) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
return address4Factory.newInstance(addr.getHostAddress());
}
+ /**
+ * 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
+ */
+ @Nonnull public final A4NZ ipv4AddressNoZoneFor(@Nonnull final byte[] bytes) {
+ return address4NoZoneFactory.newInstance(addressStringV4(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
+ */
+ @Nonnull public final A4NZ ipv4AddressNoZoneFor(@Nonnull final InetAddress addr) {
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
+ return address4NoZoneFactory.newInstance(addr.getHostAddress());
+ }
+
@Nonnull public final A4 ipv4AddressFrom(@Nonnull final P4 prefix) {
return prefixToAddress(address4Factory, ipv4PrefixString(prefix));
}
+ @Nonnull public final A4NZ ipv4AddressNoZoneFrom(@Nonnull final P4 prefix) {
+ return prefixToAddress(address4NoZoneFactory, ipv4PrefixString(prefix));
+ }
+
@Nonnull public final byte[] ipv4AddressBytes(@Nonnull final A4 addr) {
/*
* This implementation relies heavily on the input string having been validated to comply with
* the Ipv4Address pattern, which may include a zone index.
*/
final String str = ipv4AddressString(addr);
- final byte[] bytes = new byte[INET4_LENGTH];
final int percent = str.indexOf('%');
- Ipv4Utils.fillIpv4Bytes(bytes, 0, str, 0, percent == -1 ? str.length() : percent);
+ return ipv4StringBytes(str, percent == -1 ? str.length() : percent);
+ }
+
+ @Nonnull public final byte[] ipv4AddressNoZoneBytes(@Nonnull final A4NZ addr) {
+ /*
+ * This implementation relies heavily on the input string having been validated to comply with
+ * the Ipv4AddressNoZone pattern, which must not include a zone index.
+ */
+ final String str = ipv4AddressString(addr);
+ return ipv4StringBytes(str, str.length());
+ }
+
+ private static byte[] ipv4StringBytes(final String str, final int limit) {
+ final byte[] bytes = new byte[INET4_LENGTH];
+ Ipv4Utils.fillIpv4Bytes(bytes, 0, str, 0, limit);
return bytes;
}
return prefix4Factory.getTemplate();
}
- return v4PrefixForShort(address, 0, (mask / Byte.SIZE) + ((mask % Byte.SIZE == 0) ? 0 : 1), mask);
+ return v4PrefixForShort(address, 0, mask / Byte.SIZE + (mask % Byte.SIZE == 0 ? 0 : 1), mask);
}
@Nonnull public final P4 ipv4PrefixForShort(@Nonnull final byte[] array, final int startOffset, final int mask) {
return prefix4Factory.getTemplate();
}
- return v4PrefixForShort(array, startOffset, (mask / Byte.SIZE) + ((mask % Byte.SIZE == 0) ? 0 : 1), mask);
+ return v4PrefixForShort(array, startOffset, mask / Byte.SIZE + (mask % Byte.SIZE == 0 ? 0 : 1), mask);
}
/**
* @param addr An {@link Inet4Address}
* @return An Ipv4Prefix object
* @throws IllegalArgumentException if addr is not an Inet4Address
- * @throws NullPointerException if adds is null
+ * @throws NullPointerException if addr is null
*/
@Nonnull public final P4 ipv4PrefixFor(@Nonnull final InetAddress addr) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
return prefix4Factory.newInstance(addr.getHostAddress() + "/32");
}
* @throws NullPointerException if addr is null
*/
@Nonnull public final P4 ipv4PrefixFor(@Nonnull final InetAddress addr, final int mask) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
- Preconditions.checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
- return prefix4Factory.newInstance(addr.getHostAddress() + '/' + mask);
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet4Address, "Address has to be an Inet4Address");
+ return newIpv4Prefix(addr.getHostAddress(), mask);
}
@Nonnull public final P4 ipv4PrefixFor(@Nonnull final A4 addr) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- return prefix4Factory.newInstance(ipv4AddressString(addr) + "/32");
+ requireNonNull(addr, "Address must not be null");
+ return prefix4Factory.newInstance(stripZone(ipv4AddressString(addr)) + "/32");
}
@Nonnull public final P4 ipv4PrefixFor(@Nonnull final A4 addr, final int mask) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
- return prefix4Factory.newInstance(ipv4AddressString(addr) + '/' + mask);
+ requireNonNull(addr, "Address must not be null");
+ return newIpv4Prefix(stripZone(ipv4AddressString(addr)), mask);
+ }
+
+ @Nonnull public final P4 ipv4PrefixForNoZone(@Nonnull final A4NZ addr) {
+ requireNonNull(addr, "Address must not be null");
+ return prefix4Factory.newInstance(ipv4AddressString(addr) + "/32");
+ }
+
+ @Nonnull public final P4 ipv4PrefixForNoZone(@Nonnull final A4NZ addr, final int mask) {
+ requireNonNull(addr, "Address must not be null");
+ return newIpv4Prefix(ipv4AddressString(addr), mask);
+ }
+
+ private static String stripZone(final String str) {
+ final int percent = str.indexOf('%');
+ return percent == -1 ? str : str.substring(0, percent);
+ }
+
+ private P4 newIpv4Prefix(final String addr, final int mask) {
+ checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
+ return prefix4Factory.newInstance(addr + '/' + mask);
}
@Nonnull public final Entry<A4, Integer> splitIpv4Prefix(@Nonnull final P4 prefix) {
return splitPrefix(address4Factory, ipv4PrefixString(prefix));
}
+ @Nonnull public final Entry<A4NZ, Integer> splitIpv4PrefixNoZone(@Nonnull final P4 prefix) {
+ return splitPrefix(address4NoZoneFactory, ipv4PrefixString(prefix));
+ }
+
@Nonnull public final byte[] ipv4PrefixToBytes(@Nonnull final P4 prefix) {
final String str = ipv4PrefixString(prefix);
final int slash = str.lastIndexOf('/');
* @throws NullPointerException if addr is null
*/
@Nonnull public final A6 ipv6AddressFor(@Nonnull final InetAddress addr) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
return address6Factory.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
+ */
+ @Nonnull public final A6NZ ipv6AddressNoZoneFor(@Nonnull final byte[] bytes) {
+ return address6NoZoneFactory.newInstance(addressStringV6(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
+ */
+ @Nonnull public final A6NZ ipv6AddressNoZoneFor(@Nonnull final InetAddress addr) {
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
+ return address6NoZoneFactory.newInstance(addressStringV6(addr));
+ }
+
@Nonnull public final A6 ipv6AddressFrom(@Nonnull final P6 prefix) {
return prefixToAddress(address6Factory, ipv6PrefixString(prefix));
}
+ @Nonnull public final A6NZ ipv6AddressNoZoneFrom(@Nonnull final P6 prefix) {
+ return prefixToAddress(address6NoZoneFactory, ipv6PrefixString(prefix));
+ }
+
@Nonnull public final byte[] ipv6AddressBytes(@Nonnull final A6 addr) {
- String str = ipv6AddressString(addr);
+ final String str = ipv6AddressString(addr);
final int percent = str.indexOf('%');
- if (percent != -1) {
- str = str.substring(0, percent);
- }
+ return ipv6StringBytes(str, percent == -1 ? str.length() : percent);
+ }
- return InetAddresses.forString(str).getAddress();
+ @Nonnull public final byte[] ipv6AddressNoZoneBytes(@Nonnull final A6NZ addr) {
+ final String str = ipv6AddressString(addr);
+ return ipv6StringBytes(str, str.length());
+ }
+
+ private static byte[] ipv6StringBytes(final String str, final int limit) {
+ final byte[] bytes = new byte[INET6_LENGTH];
+ Ipv6Utils.fillIpv6Bytes(bytes, str, limit);
+ return bytes;
}
/**
* bytes are interpreted as an address and the specified mask is concatenated to
* it. The address bytes are not masked.
*
- * @param address Input address as a 4-byte array
+ * @param address Input address as a 16-byte array
* @param mask Prefix mask
* @return An Ipv6Prefix object
* @throws IllegalArgumentException if bytes has length different from 16 or if mask is not in range 0-128
* @throws NullPointerException if bytes is null
*/
@Nonnull public final P6 ipv6PrefixFor(@Nonnull final byte[] address, final int mask) {
- Preconditions.checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
+ checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
return prefix6Factory.newInstance(addressStringV6(address) + '/' + mask);
}
return prefix6Factory.getTemplate();
}
- Preconditions.checkArgument(mask > 0 && mask <= 128, "Invalid mask %s", mask);
- final int size = (mask / Byte.SIZE) + ((mask % Byte.SIZE == 0) ? 0 : 1);
+ checkArgument(mask > 0 && mask <= 128, "Invalid mask %s", mask);
+ final int size = mask / Byte.SIZE + (mask % Byte.SIZE == 0 ? 0 : 1);
// Until we can instantiate an IPv6 address for a partial array, use a temporary buffer
byte[] tmp = new byte[INET6_LENGTH];
* @throws NullPointerException if addr is null
*/
@Nonnull public final P6 ipv6PrefixFor(@Nonnull final InetAddress addr, final int mask) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
- Preconditions.checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
+ requireNonNull(addr, "Address must not be null");
+ checkArgument(addr instanceof Inet6Address, "Address has to be an Inet6Address");
+ checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
return prefix6Factory.newInstance(addressStringV6(addr) + '/' + mask);
}
@Nonnull public final P6 ipv6PrefixFor(@Nonnull final A6 addr) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- return prefix6Factory.newInstance(ipv6AddressString(addr) + "/128");
+ requireNonNull(addr, "Address must not be null");
+ return prefix6Factory.newInstance(stripZone(ipv6AddressString(addr)) + "/128");
}
@Nonnull public final P6 ipv6PrefixFor(@Nonnull final A6 addr, final int mask) {
- Preconditions.checkNotNull(addr, "Address must not be null");
- Preconditions.checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
- return prefix6Factory.newInstance(ipv6AddressString(addr) + '/' + mask);
+ requireNonNull(addr, "Address must not be null");
+ return newIpv6Prefix(stripZone(ipv6AddressString(addr)), mask);
+ }
+
+ @Nonnull public final P6 ipv6PrefixForNoZone(@Nonnull final A6NZ addr) {
+ requireNonNull(addr, "Address must not be null");
+ return prefix6Factory.newInstance(ipv6AddressString(addr) + "/128");
+ }
+
+ @Nonnull public final P6 ipv6PrefixForNoZone(@Nonnull final A6NZ addr, final int mask) {
+ requireNonNull(addr, "Address must not be null");
+ return newIpv6Prefix(ipv6AddressString(addr), mask);
+ }
+
+ private P6 newIpv6Prefix(final String addr, final int mask) {
+ checkArgument(mask >= 0 && mask <= 128, "Invalid mask %s", mask);
+ return prefix6Factory.newInstance(addr + '/' + mask);
}
@Nonnull public final Entry<A6, Integer> splitIpv6Prefix(@Nonnull final P6 prefix) {
return splitPrefix(address6Factory, ipv6PrefixString(prefix));
}
+ @Nonnull public final Entry<A6NZ, Integer> splitIpv6PrefixNoZone(@Nonnull final P6 prefix) {
+ return splitPrefix(address6NoZoneFactory, ipv6PrefixString(prefix));
+ }
+
private static <T> T prefixToAddress(final StringValueObjectFactory<T> factory, final String str) {
return factory.newInstance(str.substring(0, str.lastIndexOf('/')));
}
@Nonnull public final byte[] ipv6PrefixToBytes(@Nonnull final P6 prefix) {
final String str = ipv6PrefixString(prefix);
- final int slash = str.lastIndexOf('/');
-
final byte[] bytes = new byte[INET6_LENGTH + 1];
- System.arraycopy(InetAddresses.forString(str.substring(0, slash)).getAddress(), 0, bytes, 0, INET6_LENGTH);
+ final int slash = str.lastIndexOf('/');
+ Ipv6Utils.fillIpv6Bytes(bytes, str, slash);
bytes[INET6_LENGTH] = (byte)Integer.parseInt(str.substring(slash + 1), 10);
return bytes;
}
private static void appendIpv4String(final StringBuilder sb, final byte[] bytes) {
- Preconditions.checkArgument(bytes.length == INET4_LENGTH, "IPv4 address length is 4 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('.');
- sb.append(Byte.toUnsignedInt(bytes[i]));
+ sb.append('.').append(Byte.toUnsignedInt(bytes[i]));
}
}
}
private static String addressStringV6(final byte[] bytes) {
- Preconditions.checkArgument(bytes.length == INET6_LENGTH, "IPv6 address length is 16 bytes");
+ checkArgument(bytes.length == INET6_LENGTH, "IPv6 address length is 16 bytes");
try {
return addressStringV6(Inet6Address.getByAddress(bytes));
private static String prefixStringV4(final byte[] bytes) {
final StringBuilder sb = new StringBuilder(18);
appendIpv4String(sb, bytes);
- sb.append("/32");
- return sb.toString();
+ return sb.append("/32").toString();
}
private static String prefixStringV4(final byte[] bytes, final int mask) {
- Preconditions.checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
+ checkArgument(mask >= 0 && mask <= 32, "Invalid mask %s", mask);
final StringBuilder sb = new StringBuilder(18);
appendIpv4String(sb, bytes);
- sb.append('/');
- sb.append(mask);
- return sb.toString();
+ return sb.append('/').append(mask).toString();
}
private P4 v4PrefixForShort(@Nonnull final byte[] array, final int startOffset, final int size, final int mask) {
// Add from address
sb.append(Byte.toUnsignedInt(array[startOffset]));
for (int i = 1; i < size; i++) {
- sb.append('.');
- sb.append(Byte.toUnsignedInt(array[startOffset + i]));
+ sb.append('.').append(Byte.toUnsignedInt(array[startOffset + i]));
}
// Add zeros
for (int i = size; i < INET4_LENGTH; i++) {
- sb.append('.');
- sb.append(0);
+ sb.append(".0");
}
// Add mask
- Preconditions.checkArgument(mask > 0 && mask <= 32, "Invalid mask %s", mask);
- sb.append('/');
- sb.append(mask);
+ checkArgument(mask > 0 && mask <= 32, "Invalid mask %s", mask);
+ sb.append('/').append(mask);
return prefix4Factory.newInstance(sb.toString());
}
Code Review / mdsal.git / blobdiff