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

Use getId() convenience method in Cloud Foundry ServiceInfoCreators to reduce duplication.

Browse Source
This commit is contained in:
Scott Frederick
2015-05-22 09:47:44 -05:00
parent 625040ca1a
commit 9e1277c7c2
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
View File

@@ -20,7 +20,7 @@ public class AmqpServiceInfoCreator extends CloudFoundryServiceInfoCreator<AmqpS
public AmqpServiceInfo createServiceInfo(Map<String,Object> serviceData) {
Map<String,Object> credentials = getCredentials(serviceData);
String id = (String) serviceData.get("name");
String id = getId(serviceData);
String uri = getUriFromCredentials(credentials);
String managementUri = getStringFromCredentials(credentials, "http_api_uri");

4
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
View File

@@ -70,6 +70,10 @@ public abstract class CloudFoundryServiceInfoCreator<SI extends ServiceInfo> imp
return false;
}
protected String getId(Map<String, Object> serviceData) {
return (String) serviceData.get("name");
}
@SuppressWarnings("unchecked")
protected Map<String, Object> getCredentials(Map<String, Object> serviceData) {
return (Map<String, Object>) serviceData.get("credentials");

2
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
View File

@@ -17,7 +17,7 @@ public class MongoServiceInfoCreator extends CloudFoundryServiceInfoCreator<Mong
}
public MongoServiceInfo createServiceInfo(Map<String,Object> serviceData) {
String id = (String) serviceData.get("name");
String id = getId(serviceData);
String uri = getUriFromCredentials(getCredentials(serviceData));

2
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
View File

@@ -20,7 +20,7 @@ public class MonitoringServiceInfoCreator extends CloudFoundryServiceInfoCreator
@Override
public MonitoringServiceInfo createServiceInfo(Map<String, Object> serviceData) {
String id = (String) serviceData.get("name");
String id = getId(serviceData);
return new MonitoringServiceInfo(id);
}
}

2
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
View File

@@ -17,7 +17,7 @@ public class RedisServiceInfoCreator extends CloudFoundryServiceInfoCreator<Redi
}
public RedisServiceInfo createServiceInfo(Map<String,Object> serviceData) {
String id = (String) serviceData.get("name");
String id = getId(serviceData);
Map<String, Object> credentials = getCredentials(serviceData);
String uri = getUriFromCredentials(credentials);

2
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
View File

@@ -45,7 +45,7 @@ public abstract class RelationalServiceInfoCreator<SI extends RelationalServiceI
public abstract SI createServiceInfo(String id, String uri);
public SI createServiceInfo(Map<String, Object> serviceData) {
String id = (String) serviceData.get("name");
String id = getId(serviceData);
Map<String,Object> credentials = getCredentials(serviceData);

2
spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
View File

@@ -20,7 +20,7 @@ public class SmtpServiceInfoCreator extends CloudFoundryServiceInfoCreator<SmtpS
}
public SmtpServiceInfo createServiceInfo(Map<String, Object> serviceData) {
String id = (String) serviceData.get("name");
String id = getId(serviceData);
Map<String, Object> credentials = getCredentials(serviceData);