Merge branch '3.1.x' into 4.0.x

Author: ryanjbaxter

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataResource.java

@@ -123,17 +123,27 @@ private boolean urisEqual(String[] thatUris) {
 	}
 
 	private boolean uriEqual(String thisUriString, String thatUriString) {
-		UriComponents thisUri = UriComponentsBuilder.fromHttpUrl(thisUriString).build();
-		UriComponents thatUri = UriComponentsBuilder.fromHttpUrl(thatUriString).build();
-		return Objects.equals(thisUri.getHost(), thatUri.getHost())
-				&& Objects.equals(thisUri.getPort(), thatUri.getPort())
-				&& Objects.equals(thisUri.getPath(), thatUri.getPath());
+		try {
+			UriComponents thisUri = UriComponentsBuilder.fromHttpUrl(thisUriString).build();
+			UriComponents thatUri = UriComponentsBuilder.fromHttpUrl(thatUriString).build();
+			return Objects.equals(thisUri.getHost(), thatUri.getHost())
+					&& Objects.equals(thisUri.getPort(), thatUri.getPort())
+					&& Objects.equals(thisUri.getPath(), thatUri.getPath());
+		}
+		catch (Exception e) {
+			return Objects.equals(thisUriString, thatUriString);
+		}
 	}
 
 	private int urisHashCode(String[] uris) {
 		return Arrays.stream(uris).mapToInt(uriString -> {
-			UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl(uriString).build();
-			return Objects.hash(uriComponents.getHost(), uriComponents.getPath(), uriComponents.getPort());
+			try {
+				UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl(uriString).build();
+				return Objects.hash(uriComponents.getHost(), uriComponents.getPath(), uriComponents.getPort());
+			}
+			catch (Exception e) {
+				return Arrays.hashCode(uris);
+			}
 		}).sum();
 	}
 

spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataResourceTests.java

@@ -318,4 +318,15 @@ void testEqualsDifferentLabels() {
 		assertThat(r1.hashCode()).isNotEqualTo(r2.hashCode());
 	}
 
+	@Test
+	void testInvalidUri() {
+		ConfigClientProperties r1Properties = new ConfigClientProperties();
+		r1Properties.setUri(new String[] { "//" });
+		ConfigServerConfigDataResource r1 = new ConfigServerConfigDataResource(r1Properties, true, null);
+		ConfigClientProperties r2Properties = new ConfigClientProperties();
+		r2Properties.setUri(new String[] { "//" });
+		ConfigServerConfigDataResource r2 = new ConfigServerConfigDataResource(r2Properties, true, null);
+		assertThat(r1).isEqualTo(r2);
+	}
+
 }