[prev in list] [next in list] [prev in thread] [next in thread]
List: httpcomponents-commits
Subject: (httpcomponents-core) branch master updated: Update the method parameter of InetAddressUtils from St
From: olegk () apache ! org
Date: 2024-03-22 8:02:26
Message-ID: 171109454652.4091765.2913886239325144837 () gitbox2-he-fi ! apache ! org
[Download RAW message or body]
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/master by this push:
new 6b5de8cc0 Update the method parameter of InetAddressUtils from String to \
CharSequence. 6b5de8cc0 is described below
commit 6b5de8cc0079ac5357e37899df6a35bd7bace9ca
Author: wangkai <wangkaicloud@163.com>
AuthorDate: Wed Mar 20 17:10:11 2024 +0800
Update the method parameter of InetAddressUtils from String to CharSequence.
---
.../main/java/org/apache/hc/core5/net/Host.java | 4 +-
.../org/apache/hc/core5/net/InetAddressUtils.java | 111 ++++++++++---
.../java/org/apache/hc/core5/net/URIBuilder.java | 4 +-
.../apache/hc/core5/net/TestInetAddressUtils.java | 182 ++++++++++-----------
4 files changed, 186 insertions(+), 115 deletions(-)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java \
b/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java index \
3231a30a9..52b8b796e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
@@ -81,7 +81,7 @@ public final class Host implements NamedEndpoint, Serializable {
throw URISupport.createException(s, cursor, "Expected an IPv6 \
closing bracket ']'"); }
cursor.updatePos(cursor.getPos() + 1);
- if (!InetAddressUtils.isIPv6Address(hostName)) {
+ if (!InetAddressUtils.isIPv6(hostName)) {
throw URISupport.createException(s, cursor, "Expected an IPv6 \
address"); }
} else {
@@ -115,7 +115,7 @@ public final class Host implements NamedEndpoint, Serializable {
static void format(final StringBuilder buf, final NamedEndpoint endpoint) {
final String hostName = endpoint.getHostName();
- if (InetAddressUtils.isIPv6Address(hostName)) {
+ if (InetAddressUtils.isIPv6(hostName)) {
buf.append('[').append(hostName).append(']');
} else {
if (TextUtils.isAllASCII(hostName)) {
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java \
b/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java index \
565b62b64..f82876472 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java
@@ -88,7 +88,7 @@ public class InetAddressUtils {
/**
* Delimiter used to separate an IPv6 address from its scope ID.
*/
- private static final String SCOPE_ID_DELIMITER = "%";
+ private static final char SCOPE_ID_DELIMITER = '%';
@@ -100,21 +100,45 @@ public class InetAddressUtils {
// Must not have more than 7 colons (i.e. 8 fields)
private static final int MAX_COLON_COUNT = 7;
+ /**
+ * @deprecated Use {@link #isIPv4(CharSequence)}
+ */
+ @Deprecated
+ public static boolean isIPv4Address(final String input) {
+ return isIPv4(input);
+ }
+
/**
* Checks whether the parameter is a valid IPv4 address
*
- * @param input the address string to check for validity
+ * @param input the address character sequence to check for validity
* @return true if the input parameter is a valid IPv4 address
+ * @since 5.3
*/
- public static boolean isIPv4Address(final String input) {
+ public static boolean isIPv4(final CharSequence input) {
return IPV4_PATTERN.matcher(input).matches();
}
+ /**
+ * @deprecated Use {@link #isIPv4MappedIPv6(CharSequence)}
+ */
+ @Deprecated
public static boolean isIPv4MappedIPv64Address(final String input) {
+ return isIPv4MappedIPv6(input);
+ }
+
+ /**
+ * Check if an IPv6 address is an IPv4-mapped IPv6 address.
+ *
+ * @param input the IPv6 address to be checked
+ * @return true if the IPv6 address is an IPv4-mapped IPv6 address, false \
otherwise. + * @since 5.3
+ */
+ public static boolean isIPv4MappedIPv6(final CharSequence input) {
return IPV4_MAPPED_IPV6_PATTERN.matcher(input).matches();
}
- static boolean hasValidIPv6ColonCount(final String input) {
+ static boolean hasValidIPv6ColonCount(final CharSequence input) {
int colonCount = 0;
for (int i = 0; i < input.length(); i++) {
if (input.charAt(i) == COLON_CHAR) {
@@ -125,58 +149,105 @@ public class InetAddressUtils {
return colonCount >= 2 && colonCount <= MAX_COLON_COUNT;
}
+ /**
+ * @deprecated Use {@link #isIPv6Std(CharSequence)}
+ */
+ @Deprecated
+ public static boolean isIPv6StdAddress(final String input) {
+ return isIPv6Std(input);
+ }
+
/**
* Checks whether the parameter is a valid standard (non-compressed) IPv6 \
address
*
- * @param input the address string to check for validity
+ * @param input the address character sequence to check for validity
* @return true if the input parameter is a valid standard (non-compressed) IPv6 \
address + * @since 5.3
*/
- public static boolean isIPv6StdAddress(final String input) {
+ public static boolean isIPv6Std(final CharSequence input) {
return hasValidIPv6ColonCount(input) && \
IPV6_STD_PATTERN.matcher(input).matches(); }
+ /**
+ * @deprecated Use {@link #isIPv6HexCompressed(CharSequence)}
+ */
+ @Deprecated
+ public static boolean isIPv6HexCompressedAddress(final String input) {
+ return isIPv6HexCompressed(input);
+ }
+
/**
* Checks whether the parameter is a valid compressed IPv6 address
*
- * @param input the address string to check for validity
+ * @param input the address character sequence to check for validity
* @return true if the input parameter is a valid compressed IPv6 address
+ * @since 5.3
*/
- public static boolean isIPv6HexCompressedAddress(final String input) {
+ public static boolean isIPv6HexCompressed(final CharSequence input) {
return hasValidIPv6ColonCount(input) && \
IPV6_HEX_COMPRESSED_PATTERN.matcher(input).matches(); }
+ /**
+ * @deprecated Use {@link #isIPv6(CharSequence)}
+ */
+ @Deprecated
+ public static boolean isIPv6Address(final String input) {
+ return isIPv6(input);
+ }
+
/**
* Checks whether the parameter is a valid IPv6 address (including compressed).
*
- * @param input the address string to check for validity
+ * @param input the address character sequence to check for validity
* @return true if the input parameter is a valid standard or compressed IPv6 \
address + * @since 5.3
*/
- public static boolean isIPv6Address(final String input) {
- final int index = input.indexOf(SCOPE_ID_DELIMITER);
+ public static boolean isIPv6(final CharSequence input) {
+ int index = -1;
+ for (int i = 0; i < input.length(); i++) {
+ if (input.charAt(i) == SCOPE_ID_DELIMITER) {
+ index = i;
+ break;
+ }
+ }
if (index == -1) {
- return isIPv6StdAddress(input) || isIPv6HexCompressedAddress(input);
+ return isIPv6Std(input) || isIPv6HexCompressed(input);
} else {
- final String address = input.substring(0, index);
- if (isIPv6StdAddress(address) || isIPv6HexCompressedAddress(address)) {
+ final CharSequence address = input.subSequence(0, index);
+ if (isIPv6Std(address) || isIPv6HexCompressed(address)) {
// Check if the scope ID is valid
- final String scopeId = input.substring(index + 1);
- // Scope ID should be a non-empty string consisting of only \
alphanumeric characters or "-"
- return !scopeId.isEmpty() && \
SCOPE_ID_PATTERN.matcher(scopeId).matches(); + final CharSequence \
scopeId = input.subSequence(index + 1, input.length()); + // Scope ID \
should be a non-empty character sequence consisting of only alphanumeric characters \
or "-" + return scopeId.length() != 0 && \
SCOPE_ID_PATTERN.matcher(scopeId).matches(); } else {
return false;
}
}
}
+ /**
+ * @deprecated Use {@link #isIPv6URLBracketed(CharSequence)}
+ */
+ @Deprecated
+ public static boolean isIPv6URLBracketedAddress(final String input) {
+ return isIPv6URLBracketed(input);
+ }
+
/**
* Checks whether the parameter is a valid URL formatted bracketed IPv6 address \
(including compressed).
* This matches only bracketed values e.g. {@code [::1]}.
*
- * @param input the address string to check for validity
+ * @param input the address character sequence to check for validity
* @return true if the input parameter is a valid URL-formatted bracketed IPv6 \
address + * @since 5.3
*/
- public static boolean isIPv6URLBracketedAddress(final String input) {
- return input.startsWith("[") && input.endsWith("]") && \
isIPv6Address(input.substring(1, input.length() - 1)); + public static boolean \
isIPv6URLBracketed(final CharSequence input) { + if (input.length() == 0) {
+ return false;
+ }
+ return input.charAt(0) == '['
+ && input.charAt(input.length() - 1) == ']'
+ && isIPv6(input.subSequence(1, input.length() - 1));
}
/**
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java \
b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java index \
d9d374499..59c4f3b64 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
@@ -335,7 +335,7 @@ public class URIBuilder {
}
sb.append("@");
}
- if (InetAddressUtils.isIPv6Address(this.host)) {
+ if (InetAddressUtils.isIPv6(this.host)) {
sb.append("[").append(this.host).append("]");
} else {
sb.append(PercentCodec.encode(this.host, this.charset));
@@ -381,7 +381,7 @@ public class URIBuilder {
final String uriHost = uri.getHost();
// URI.getHost incorrectly returns bracketed (encoded) IPv6 values. Brackets \
are an // encoding detail of the URI and not part of the host string.
- this.host = uriHost != null && \
InetAddressUtils.isIPv6URLBracketedAddress(uriHost) + this.host = uriHost != \
null && InetAddressUtils.isIPv6URLBracketed(uriHost) ? uriHost.substring(1, \
uriHost.length() - 1) : uriHost;
this.port = uri.getPort();
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java \
b/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java index \
10969c0b0..0d01536ea 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java
@@ -37,132 +37,132 @@ public class TestInetAddressUtils {
@Test
public void testValidIPv4Address() {
- Assertions.assertTrue(InetAddressUtils.isIPv4Address("127.0.0.1"));
- Assertions.assertTrue(InetAddressUtils.isIPv4Address("192.168.0.0"));
- Assertions.assertTrue(InetAddressUtils.isIPv4Address("255.255.255.255"));
+ Assertions.assertTrue(InetAddressUtils.isIPv4("127.0.0.1"));
+ Assertions.assertTrue(InetAddressUtils.isIPv4("192.168.0.0"));
+ Assertions.assertTrue(InetAddressUtils.isIPv4("255.255.255.255"));
}
@Test
public void testInvalidIPv4Address() {
- Assertions.assertFalse(InetAddressUtils.isIPv4Address(" 127.0.0.1 ")); // \
Blanks not allowed
- Assertions.assertFalse(InetAddressUtils.isIPv4Address("g.ar.ba.ge"));
- Assertions.assertFalse(InetAddressUtils.isIPv4Address("192.168.0"));
- Assertions.assertFalse(InetAddressUtils.isIPv4Address("256.255.255.255"));
- Assertions.assertFalse(InetAddressUtils.isIPv4Address("0.168.0.0")); //IP \
address that starts with zero not allowed + \
Assertions.assertFalse(InetAddressUtils.isIPv4(" 127.0.0.1 ")); // Blanks not \
allowed + Assertions.assertFalse(InetAddressUtils.isIPv4("g.ar.ba.ge"));
+ Assertions.assertFalse(InetAddressUtils.isIPv4("192.168.0"));
+ Assertions.assertFalse(InetAddressUtils.isIPv4("256.255.255.255"));
+ Assertions.assertFalse(InetAddressUtils.isIPv4("0.168.0.0")); //IP \
address that starts with zero not allowed }
@Test
public void testValidIPv6Address() {
- Assertions.assertTrue(InetAddressUtils.isIPv6StdAddress("2001:0db8:0000:0000:0000:0000:1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6StdAddress("2001:db8:0:0:0:0:1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6StdAddress("0:0:0:0:0:0:0:0"));
- Assertions.assertTrue(InetAddressUtils.isIPv6StdAddress("0:0:0:0:0:0:0:1"));
-
- Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressedAddress("2001:0db8:0:0::1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressedAddress("2001:0db8::1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressedAddress("2001:db8::1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressedAddress("::1"));
- Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressedAddress("::")); // \
http://tools.ietf.org/html/rfc4291#section-2.2
-
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("2001:0db8:0000:0000:0000:0000:1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("2001:db8:0:0:0:0:1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("0:0:0:0:0:0:0:0"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("0:0:0:0:0:0:0:1"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("2001:0db8:0:0::1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("2001:0db8::1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("2001:db8::1428:57ab"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("::1"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("::")); // \
http://tools.ietf.org/html/rfc4291#section-2.2 + \
Assertions.assertTrue(InetAddressUtils.isIPv6Std("2001:0db8:0000:0000:0000:0000:1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6Std("2001:db8:0:0:0:0:1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6Std("0:0:0:0:0:0:0:0"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6Std("0:0:0:0:0:0:0:1"));
+
+ Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressed("2001:0db8:0:0::1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressed("2001:0db8::1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressed("2001:db8::1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressed("::1"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6HexCompressed("::")); // \
http://tools.ietf.org/html/rfc4291#section-2.2 +
+ Assertions.assertTrue(InetAddressUtils.isIPv6("2001:0db8:0000:0000:0000:0000:1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("2001:db8:0:0:0:0:1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("0:0:0:0:0:0:0:0"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("0:0:0:0:0:0:0:1"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("2001:0db8:0:0::1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("2001:0db8::1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("2001:db8::1428:57ab"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("::1"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("::")); // \
http://tools.ietf.org/html/rfc4291#section-2.2
//HTTPCORE-674 InetAddressUtils scoped ID support
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%eth2"));
- Assertions.assertTrue(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%3"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%eth2"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%3"));
}
@Test
public void testInvalidIPv6Address() {
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0db8:0000:garb:age0:0000:1428:57ab"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0gb8:0000:0000:0000:0000:1428:57ab"));
- Assertions.assertFalse(InetAddressUtils.isIPv6StdAddress("0:0:0:0:0:0:0:0:0")); \
// Too many
- Assertions.assertFalse(InetAddressUtils.isIPv6StdAddress("0:0:0:0:0:0:0")); \
// Too few
- Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressedAddress(":1"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address(":1"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0db8::0000::57ab")); \
// Cannot have two contractions
- Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressedAddress("1:2:3:4:5:6:7::9")); \
// too many fields before ::
- Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressedAddress("1::3:4:5:6:7:8:9")); \
// too many fields after ::
- Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressedAddress("::3:4:5:6:7:8:9")); \
// too many fields after ::
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("")); // empty
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0db8:0000:garb:age0:0000:1428:57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0gb8:0000:0000:0000:0000:1428:57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6Std("0:0:0:0:0:0:0:0:0")); // \
Too many + Assertions.assertFalse(InetAddressUtils.isIPv6Std("0:0:0:0:0:0:0")); \
// Too few + Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressed(":1"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6(":1"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0db8::0000::57ab")); // \
Cannot have two contractions + \
Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressed("1:2:3:4:5:6:7::9")); // \
too many fields before :: + \
Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressed("1::3:4:5:6:7:8:9")); // \
too many fields after :: + \
Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressed("::3:4:5:6:7:8:9")); // \
too many fields after :: + \
Assertions.assertFalse(InetAddressUtils.isIPv6("")); // empty
//Invalid scoped IDs
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%eth2#"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%3@"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a#eth2"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%eth2!"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0db8:0:0::1428:57ab%"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0db8:0:0::1428:57ab%eth2#"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%eth2#3"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0db8:0:0::1428:57ab%eth2#3"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("fe80::1ff:fe23:4567:890a%3#eth2"));
- Assertions.assertFalse(InetAddressUtils.isIPv6Address("2001:0db8:0:0::1428:57ab%3#eth2"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%eth2#"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%3@"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a#eth2"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%eth2!"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0db8:0:0::1428:57ab%"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0db8:0:0::1428:57ab%eth2#"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%eth2#3"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0db8:0:0::1428:57ab%eth2#3"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("fe80::1ff:fe23:4567:890a%3#eth2"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6("2001:0db8:0:0::1428:57ab%3#eth2"));
}
@Test
public void testValidIPv6BracketAddress() {
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[2001:0db8:0000:0000:0000:0000:1428:57ab]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[2001:db8:0:0:0:0:1428:57ab]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[0:0:0:0:0:0:0:0]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[0:0:0:0:0:0:0:1]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[2001:0db8:0:0::1428:57ab]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[2001:0db8::1428:57ab]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[2001:db8::1428:57ab]"));
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[::1]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[2001:0db8:0000:0000:0000:0000:1428:57ab]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[2001:db8:0:0:0:0:1428:57ab]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[0:0:0:0:0:0:0:0]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[0:0:0:0:0:0:0:1]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[2001:0db8:0:0::1428:57ab]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[2001:0db8::1428:57ab]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[2001:db8::1428:57ab]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[::1]"));
// http://tools.ietf.org/html/rfc4291#section-2.2
- Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketedAddress("[::]"));
+ Assertions.assertTrue(InetAddressUtils.isIPv6URLBracketed("[::]"));
}
@Test
public void testInvalidIPv6BracketAddress() {
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("2001:0db8:0000:garb:age0:0000:1428:57ab"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[2001:0db8:0000:garb:age0:0000:1428:57ab]"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("2001:0gb8:0000:0000:0000:0000:1428:57ab"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[2001:0gb8:0000:0000:0000:0000:1428:57ab]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("2001:0db8:0000:garb:age0:0000:1428:57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[2001:0db8:0000:garb:age0:0000:1428:57ab]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("2001:0gb8:0000:0000:0000:0000:1428:57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[2001:0gb8:0000:0000:0000:0000:1428:57ab]"));
// Too many
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("0:0:0:0:0:0:0:0:0"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[0:0:0:0:0:0:0:0:0]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("0:0:0:0:0:0:0:0:0"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[0:0:0:0:0:0:0:0:0]"));
// Too few
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("0:0:0:0:0:0:0"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[0:0:0:0:0:0:0]"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress(":1"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[:1]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("0:0:0:0:0:0:0"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[0:0:0:0:0:0:0]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed(":1"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[:1]"));
// Cannot have two contractions
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("2001:0db8::0000::57ab"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[2001:0db8::0000::57ab]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("2001:0db8::0000::57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[2001:0db8::0000::57ab]"));
// too many fields before ::
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("1:2:3:4:5:6:7::9"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[1:2:3:4:5:6:7::9]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("1:2:3:4:5:6:7::9"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[1:2:3:4:5:6:7::9]"));
// too many fields after ::
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("1::3:4:5:6:7:8:9"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[1::3:4:5:6:7:8:9]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("1::3:4:5:6:7:8:9"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[1::3:4:5:6:7:8:9]"));
// too many fields after ::
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("::3:4:5:6:7:8:9"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[::3:4:5:6:7:8:9]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("::3:4:5:6:7:8:9"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[::3:4:5:6:7:8:9]"));
// empty
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress(""));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("[]"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed(""));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("[]"));
// missing brackets
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("::"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("::1"));
- Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketedAddress("2001:db8::1428:57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("::"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("::1"));
+ Assertions.assertFalse(InetAddressUtils.isIPv6URLBracketed("2001:db8::1428:57ab"));
}
@Test
// Test HTTPCLIENT-1319
public void testInvalidIPv6AddressIncorrectGroupCount() {
- Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressedAddress("1:2::4:5:6:7:8:9")); \
// too many fields in total
- Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressedAddress("1:2:3:4:5:6::8:9")); \
// too many fields in total + \
Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressed("1:2::4:5:6:7:8:9")); // \
too many fields in total + \
Assertions.assertFalse(InetAddressUtils.isIPv6HexCompressed("1:2:3:4:5:6::8:9")); // \
too many fields in total }
@Test
@@ -188,14 +188,14 @@ public class TestInetAddressUtils {
@Test
public void testValidIPv4MappedIPv6Address() {
- Assertions.assertTrue(InetAddressUtils.isIPv4MappedIPv64Address("::FFFF:1.2.3.4"));
- Assertions.assertTrue(InetAddressUtils.isIPv4MappedIPv64Address("::ffff:255.255.255.255"));
+ Assertions.assertTrue(InetAddressUtils.isIPv4MappedIPv6("::FFFF:1.2.3.4"));
+ Assertions.assertTrue(InetAddressUtils.isIPv4MappedIPv6("::ffff:255.255.255.255"));
}
@Test
public void testInValidIPv4MappedIPv6Address() {
- Assertions.assertFalse(InetAddressUtils.isIPv4MappedIPv64Address("2001:0db8:0000:0000:0000:0000:1428:57ab"));
- Assertions.assertFalse(InetAddressUtils.isIPv4MappedIPv64Address("::ffff:1:2:3:4"));
+ Assertions.assertFalse(InetAddressUtils.isIPv4MappedIPv6("2001:0db8:0000:0000:0000:0000:1428:57ab"));
+ Assertions.assertFalse(InetAddressUtils.isIPv4MappedIPv6("::ffff:1:2:3:4"));
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic