Repository: kafka Updated Branches: refs/heads/0.9.0 00ba8e000 -> 767de4b5d
KAFKA-3002; Allow uppercase letters in hostnames Make available to specify hostname with Uppercase at broker list Author: Sasaki Toru <[email protected]> Reviewers: Ismael Juma <[email protected]>, Grant Henke <[email protected]>, Ewen Cheslack-Postava <[email protected]> Closes #685 from sasakitoa/hostname_uppercase (cherry picked from commit ea73356905ff4663d0d085c46b348fa4e9b9568d) Signed-off-by: Ewen Cheslack-Postava <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/767de4b5 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/767de4b5 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/767de4b5 Branch: refs/heads/0.9.0 Commit: 767de4b5d1767110c097a754d697a3a762b0aaea Parents: 00ba8e0 Author: Sasaki Toru <[email protected]> Authored: Wed Dec 23 20:55:01 2015 -0800 Committer: Ewen Cheslack-Postava <[email protected]> Committed: Wed Dec 23 20:56:23 2015 -0800 ---------------------------------------------------------------------- clients/src/main/java/org/apache/kafka/common/utils/Utils.java | 2 +- .../src/test/java/org/apache/kafka/common/utils/UtilsTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/767de4b5/clients/src/main/java/org/apache/kafka/common/utils/Utils.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java index 974cf1e..b7a5070 100755 --- a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java @@ -47,7 +47,7 @@ public class Utils { // This matches URIs of formats: host:port and protocol:\\host:port // IPv6 is supported with [ip] pattern - private static final Pattern HOST_PORT_PATTERN = Pattern.compile(".*?\\[?([0-9a-z\\-.:]*)\\]?:([0-9]+)"); + private static final Pattern HOST_PORT_PATTERN = Pattern.compile(".*?\\[?([0-9a-zA-Z\\-.:]*)\\]?:([0-9]+)"); public static final String NL = System.getProperty("line.separator"); http://git-wip-us.apache.org/repos/asf/kafka/blob/767de4b5/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java ---------------------------------------------------------------------- diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java index 74ec52b..8d39cc4 100755 --- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java @@ -33,16 +33,20 @@ public class UtilsTest { public void testGetHost() { assertEquals("127.0.0.1", getHost("127.0.0.1:8000")); assertEquals("mydomain.com", getHost("PLAINTEXT://mydomain.com:8080")); + assertEquals("MyDomain.com", getHost("PLAINTEXT://MyDomain.com:8080")); assertEquals("::1", getHost("[::1]:1234")); assertEquals("2001:db8:85a3:8d3:1319:8a2e:370:7348", getHost("PLAINTEXT://[2001:db8:85a3:8d3:1319:8a2e:370:7348]:5678")); + assertEquals("2001:DB8:85A3:8D3:1319:8A2E:370:7348", getHost("PLAINTEXT://[2001:DB8:85A3:8D3:1319:8A2E:370:7348]:5678")); } @Test public void testGetPort() { assertEquals(8000, getPort("127.0.0.1:8000").intValue()); assertEquals(8080, getPort("mydomain.com:8080").intValue()); + assertEquals(8080, getPort("MyDomain.com:8080").intValue()); assertEquals(1234, getPort("[::1]:1234").intValue()); assertEquals(5678, getPort("[2001:db8:85a3:8d3:1319:8a2e:370:7348]:5678").intValue()); + assertEquals(5678, getPort("[2001:DB8:85A3:8D3:1319:8A2E:370:7348]:5678").intValue()); } @Test
