From d0ab8499090bce6825028f0cb322448d35d49375 Mon Sep 17 00:00:00 2001
From: Scott Frederick <scottyfred@gmail.com>
Date: Wed, 28 May 2014 13:02:58 -0500
Subject: [PATCH] Added support for "host" in addition to "hostname" in
 credentials for RedisServiceInfoCreator.

---
 .../cloud/cloudfoundry/AmqpServiceInfoCreator.java   |  9 +++------
 .../cloudfoundry/CloudFoundryServiceInfoCreator.java |  9 +++++++++
 .../cloud/cloudfoundry/MongoServiceInfoCreator.java  |  2 +-
 .../cloud/cloudfoundry/RedisServiceInfoCreator.java  |  8 +++-----
 .../cloudfoundry/RelationalServiceInfoCreator.java   | 12 ++++++------
 .../java/org/springframework/cloud/util/UriInfo.java |  5 ++++-
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
index 74f7235..1753c11 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
@@ -20,12 +20,9 @@ public class AmqpServiceInfoCreator extends CloudFoundryServiceInfoCreator<AmqpS
 		Map<String,Object> credentials = (Map<String, Object>) serviceData.get("credentials");
 		
 		String id = (String) serviceData.get("name");
-		
-		String uri = (String) credentials.get("uri");
-		if (uri == null || uri.length() == 0) {
-			uri = (String) credentials.get("url");
-		}
-			
+
+		String uri = getStringFromCredentials(credentials, "uri", "url");
+
 		return new AmqpServiceInfo(id, uri);
 	}
 
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
index deb1448..d2d95f2 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
@@ -57,6 +57,15 @@ public abstract class CloudFoundryServiceInfoCreator<SI extends ServiceInfo> imp
 		return false;
 	}
 
+	protected String getStringFromCredentials(Map<String, Object> credentials, String... keys) {
+		for (String key : keys) {
+			if (credentials.containsKey(key)) {
+				return (String) credentials.get(key);
+			}
+		}
+		return null;
+	}
+
 	public String getUriScheme() {
 		return uriScheme;
 	}
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
index 11e419a..5aeace5 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
@@ -22,7 +22,7 @@ public class MongoServiceInfoCreator extends CloudFoundryServiceInfoCreator<Mong
 
 		String id = (String) serviceData.get("name");
 
-		String uri = (String) ((credentials.get("uri") == null) ? credentials.get("url") : credentials.get("uri"));
+		String uri = getStringFromCredentials(credentials, "uri", "url");
 
 		return new MongoServiceInfo(id, uri);
 	}
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
index eddc340..75e6df1 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
@@ -21,12 +21,10 @@ public class RedisServiceInfoCreator extends CloudFoundryServiceInfoCreator<Redi
 
 		String id = (String) serviceData.get("name");
 
-		String uri = (String) credentials.get("uri");
+		String uri = getStringFromCredentials(credentials, "uri", "url");
+
 		if (uri == null) {
-			uri = (String) credentials.get("url");
-		}
-		if (uri == null) {
-			String host = (String) credentials.get("hostname");
+			String host = getStringFromCredentials(credentials, "hostname", "host");
 			Integer port = Integer.parseInt(credentials.get("port").toString());
 			String password = (String) credentials.get("password");
 
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
index 6885101..d61fcfa 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
@@ -24,20 +24,20 @@ public abstract class RelationalServiceInfoCreator<SI extends RelationalServiceI
 
 		String id = (String) serviceData.get("name");
 
-		String uri;
-		if (credentials.containsKey("uri")) {
-			uri = credentials.get("uri").toString();
-		} else {
-			String host = (String) credentials.get("host");
+		String uri = getStringFromCredentials(credentials, "uri", "url");
+
+		if (uri == null) {
+			String host = getStringFromCredentials(credentials, "hostname", "host");
 			int port = Integer.parseInt(credentials.get("port").toString()); // allows the port attribute to be quoted or plain
 
-			String username = (String) credentials.get("user");
+			String username = getStringFromCredentials(credentials, "user", "username");
 			String password = (String) credentials.get("password");
 
 			String database = (String) credentials.get("name");
 			
 			uri = new UriInfo(getUriScheme(), host, port, username, password, database).toString();
 		}
+
 		return createServiceInfo(id, uri);
 	}
 }
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfo.java
index 6e22e11..0a0310b 100644
--- a/spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfo.java
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfo.java
@@ -84,7 +84,10 @@ public class UriInfo {
 			return new URI(scheme, userInfo, host, port, cleanedPath, query, null);
 		}
 		catch (URISyntaxException e) {
-			throw new IllegalArgumentException(e);
+			String details = String.format("Error creating URI with components: " +
+							"scheme=%s, userInfo=%s, host=%s, port=%d, path=%s, query=%s",
+					scheme, userInfo, host, port, cleanedPath, query);
+			throw new IllegalArgumentException(details, e);
 		}
 	}