From be37ee199b3fc0a71c69ebfce2d88a4344da530e Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Fri, 13 Dec 2019 12:32:15 -0800
Subject: [PATCH] DATAGEODE-283 - Polish.

Resolves gh-32.
---
 .../gemfire/support/ConnectionEndpoint.java    | 14 +++++++-------
 .../support/ConnectionEndpointUnitTests.java   | 18 +++++++++++++-----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java
index 87922268..5c572efb 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/ConnectionEndpoint.java
@@ -27,6 +27,7 @@ import org.springframework.util.StringUtils;
  * where hostname is the network name or IP address of the host.
  *
  * @author John Blum
+ * @author Jacob Barret
  * @see java.lang.Cloneable
  * @see java.lang.Comparable
  * @since 1.6.3
@@ -37,6 +38,8 @@ public class ConnectionEndpoint implements Cloneable, Comparable<ConnectionEndpo
 	protected static final int DEFAULT_PORT = 0; // ephemeral port
 
 	protected static final String DEFAULT_HOST = "localhost";
+	protected static final String GEMFIRE_HOST_PORT_SEPARATOR = "[";
+	protected static final String STANDARD_HOST_PORT_SEPARATOR = ":";
 
 	private final int port;
 	private final String host;
@@ -93,13 +96,10 @@ public class ConnectionEndpoint implements Cloneable, Comparable<ConnectionEndpo
 	}
 
 	static int indexOfPort(String host) {
-		for (int i = 0; i < host.length(); ++i) {
-			char c = host.charAt(i);
-			if (':' == c || '[' == c) {
-				return i;
-			}
-		}
-		return -1;
+
+		int indexOfPort = host.indexOf(GEMFIRE_HOST_PORT_SEPARATOR);
+
+		return indexOfPort > -1 ? indexOfPort : host.indexOf(STANDARD_HOST_PORT_SEPARATOR);
 	}
 
 	static String parseDigits(String value) {
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java
index 3e8915cc..67ec89db 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/ConnectionEndpointUnitTests.java
@@ -26,6 +26,7 @@ import org.junit.Test;
  * Unit Tests for {@link ConnectionEndpoint}.
  *
  * @author John Blum
+ * @author Jacob Barret
  * @see java.net.InetSocketAddress
  * @see org.junit.Test
  * @see org.springframework.data.gemfire.support.ConnectionEndpoint
@@ -100,7 +101,7 @@ public class ConnectionEndpointUnitTests {
 	}
 
 	@Test
-	public void parseWithHostPortWithColon() {
+	public void parseWithHostPortSeparatedByColon() {
 
 		ConnectionEndpoint connectionEndpoint = ConnectionEndpoint.parse("skullbox:12345", 80);
 
@@ -132,7 +133,7 @@ public class ConnectionEndpointUnitTests {
 	}
 
 	@Test
-	public void parseWithHostPortHavingSpacingWithColon() {
+	public void parseWithHostPortHavingSpacingSeparatedByColon() {
 
 		ConnectionEndpoint connectionEndpoint = ConnectionEndpoint.parse(" saturn  :1  23 4 ");
 
@@ -189,10 +190,10 @@ public class ConnectionEndpointUnitTests {
 	}
 
 	@Test
-	public void parseWithHostUsingDefaultPortWithColon() {
+	public void parseWithHostUsingDefaultPortSeparatedByColon() {
 
 		ConnectionEndpoint connectionEndpoint =
-				ConnectionEndpoint.parse("mercury:oneTwoThreeFourFive", 80);
+			ConnectionEndpoint.parse("mercury:oneTwoThreeFourFive", 80);
 
 		assertThat(connectionEndpoint).isNotNull();
 		assertThat(connectionEndpoint.getHost()).isEqualTo("mercury");
@@ -246,7 +247,7 @@ public class ConnectionEndpointUnitTests {
 	}
 
 	@Test
-	public void parseWithPortUsingDefaultHostWithColon() {
+	public void parseWithPortUsingDefaultHostSeparatedByColon() {
 
 		ConnectionEndpoint connectionEndpoint = ConnectionEndpoint.parse(":12345", 80);
 
@@ -317,7 +318,9 @@ public class ConnectionEndpointUnitTests {
 
 	@Test
 	public void indexOfPort() {
+
 		assertThat(ConnectionEndpoint.indexOfPort("")).isEqualTo(-1);
+		assertThat(ConnectionEndpoint.indexOfPort("  ")).isEqualTo(-1);
 		assertThat(ConnectionEndpoint.indexOfPort("a")).isEqualTo(-1);
 		assertThat(ConnectionEndpoint.indexOfPort(":")).isEqualTo(0);
 		assertThat(ConnectionEndpoint.indexOfPort("a:")).isEqualTo(1);
@@ -325,6 +328,11 @@ public class ConnectionEndpointUnitTests {
 		assertThat(ConnectionEndpoint.indexOfPort("a:b")).isEqualTo(1);
 		assertThat(ConnectionEndpoint.indexOfPort("ab:")).isEqualTo(2);
 		assertThat(ConnectionEndpoint.indexOfPort("ab:c")).isEqualTo(2);
+	}
+
+	@Test
+	@SuppressWarnings("all")
+	public void indexOfPortWithNull() {
 		assertThatThrownBy(() -> ConnectionEndpoint.indexOfPort(null)).isInstanceOf(NullPointerException.class);
 	}