SpringCloud/spring-cloud-connectors
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Credentials Encoding

Browse Source
This commit is contained in:
pidoubleyou
2018-12-14 23:13:37 +01:00
parent a0bf3f11ca
commit a8eef2bdcb
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorDB2ServiceTest.java
View File

@@ -5,7 +5,6 @@ import org.springframework.cloud.service.ServiceInfo;
import org.springframework.cloud.service.common.DB2ServiceInfo;
import org.springframework.cloud.service.common.MysqlServiceInfo;
import org.springframework.cloud.service.common.RelationalServiceInfo;
import org.springframework.cloud.util.UriInfo;
import java.util.List;
@@ -85,11 +84,11 @@ public class CloudFoundryConnectorDB2ServiceTest extends AbstractUserProvidedSer
protected String getJdbcUrl(String scheme, String name) {
return String.format("%s%s://%s:%d/%s:user=%s;password=%s;", JDBC_PREFIX, scheme, hostname, port, name,
UriInfo.urlEncode(username), UriInfo.urlEncode(password));
username, password);
}
private String getJdbcUrl(String scheme, String hostname, int port, String name, String user, String password) {
return String.format("%s%s://%s:%d/%s:user=%s;password=%s;", JDBC_PREFIX, scheme, hostname, port, name,
UriInfo.urlEncode(user), UriInfo.urlEncode(password));
user, password);
}
}

3
spring-cloud-core/src/main/java/org/springframework/cloud/service/common/DB2ServiceInfo.java
View File

@@ -1,7 +1,6 @@
package org.springframework.cloud.service.common;
import org.springframework.cloud.service.ServiceInfo;
import org.springframework.cloud.util.UriInfo;
@ServiceInfo.ServiceLabel("db2")
public class DB2ServiceInfo extends RelationalServiceInfo {
@@ -19,6 +18,6 @@ public class DB2ServiceInfo extends RelationalServiceInfo {
protected String buildJdbcUrl() {
return String.format("jdbc:%s://%s:%d/%s:user=%s;password=%s;",
jdbcUrlDatabaseType,
getHost(), getPort(), getPath(), UriInfo.urlEncode(getUserName()), UriInfo.urlEncode(getPassword()));
getHost(), getPort(), getPath(), getUserName(), getPassword());
}
}