Polish SQL Server support and fix unit tests.

spring-cloud · Jul 24, 2015 · 9b4139c · 9b4139c
1 parent 9e78abe
commit 9b4139c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/...tor/src/main/java/org/springframework/cloud/cloudfoundry/SqlServerServiceInfoCreator.java b/...tor/src/main/java/org/springframework/cloud/cloudfoundry/SqlServerServiceInfoCreator.java
@@ -2,15 +2,14 @@
 
 import org.springframework.cloud.service.common.SqlServerServiceInfo;
 
-public class SqlServerServiceInfoCreator extends
-		RelationalServiceInfoCreator<SqlServerServiceInfo> {
+public class SqlServerServiceInfoCreator extends RelationalServiceInfoCreator<SqlServerServiceInfo> {
 
 	public SqlServerServiceInfoCreator() {
-		super(new Tags(), SqlServerServiceInfo.SQLSERVER_SCHEME);	}
+		super(new Tags(), SqlServerServiceInfo.SQLSERVER_SCHEME);
+	}
 
 	@Override
 	public SqlServerServiceInfo createServiceInfo(String id, String url) {
 		return new SqlServerServiceInfo(id, url);
 	}
-
 }
diff --git a/...oud-core/src/main/java/org/springframework/cloud/service/common/SqlServerServiceInfo.java b/...oud-core/src/main/java/org/springframework/cloud/service/common/SqlServerServiceInfo.java
@@ -11,12 +11,15 @@ public class SqlServerServiceInfo extends RelationalServiceInfo {
 	public SqlServerServiceInfo(String id, String url) {
 		super(id, url, JDBC_URL_TYPE);
 	}
-
-	@Override  
-	 public String getJdbcUrl()   
-	 {  
-		return String.format("jdbc:%s://%s:%d;database=%s;user=%s;password=%s;",
-				jdbcUrlDatabaseType, 
+
+	@Override
+	public String getJdbcUrl() {
+		if (getUriInfo().getUriString().startsWith(JDBC_PREFIX)) {
+			return getUriInfo().getUriString();
+		}
+
+		return String.format("jdbc:%s://%s:%d;database=%s;user=%s;password=%s",
+				jdbcUrlDatabaseType,
 				getHost(), getPort(), getPath(), getUserName(), getPassword());
-	 }  
+	}
 }