Add support for multiple URIs in credentials for AMQP/RabbitMQ.

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

@@ -1,5 +1,6 @@
 package org.springframework.cloud.cloudfoundry;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.cloud.service.common.AmqpServiceInfo;
@@ -15,6 +16,7 @@ public class AmqpServiceInfoCreator extends CloudFoundryServiceInfoCreator<AmqpS
 		super(new Tags("rabbitmq"), AmqpServiceInfo.AMQP_SCHEME, AmqpServiceInfo.AMQPS_SCHEME);
 	}
 
+	@SuppressWarnings("unchecked")
 	public AmqpServiceInfo createServiceInfo(Map<String,Object> serviceData) {
 		Map<String,Object> credentials = getCredentials(serviceData);
 
@@ -23,6 +25,12 @@ public class AmqpServiceInfoCreator extends CloudFoundryServiceInfoCreator<AmqpS
 		String uri = getUriFromCredentials(credentials);
 		String managementUri = getStringFromCredentials(credentials, "http_api_uri");
 
+		if (credentials.containsKey("uris")) {
+			List<String> uris = (List<String>) credentials.get("uris");
+			List<String> managementUris = (List<String>) credentials.get("http_api_uris");
+			return new AmqpServiceInfo(id, uri, managementUri, uris, managementUris);
+		}
+
 		return new AmqpServiceInfo(id, uri, managementUri);
 	}
 

spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorAmqpServiceTest.java

@@ -1,6 +1,7 @@
 package org.springframework.cloud.cloudfoundry;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
@@ -18,6 +19,8 @@ import org.springframework.cloud.service.common.AmqpServiceInfo;
  *
  */
 public class CloudFoundryConnectorAmqpServiceTest extends AbstractCloudFoundryConnectorTest {
+	protected static final String hostname2 = "11.21.31.41";
+
 	@Test
 	public void rabbitServiceCreationWithTags() {
 		when(mockEnvironment.getEnvValue("VCAP_SERVICES"))
@@ -68,6 +71,34 @@ public class CloudFoundryConnectorAmqpServiceTest extends AbstractCloudFoundryCo
 		assertServiceFoundOfType(serviceInfos, "rabbit-2", AmqpServiceInfo.class);
 	}
 
+	@Test
+	public void rabbitServiceCreationMultipleUris() {
+		when(mockEnvironment.getEnvValue("VCAP_SERVICES"))
+			.thenReturn(getServicesPayload(
+					getRabbitServicePayloadMultipleUris("rabbit-1", hostname, hostname2, port, username, password, "q-1", "vhost1"),
+					getRabbitServicePayloadMultipleUris("rabbit-2", hostname, hostname2, port, username, password, "q-2", "vhost2")));
+
+		List<ServiceInfo> serviceInfos = testCloudConnector.getServiceInfos();
+		assertServiceFoundOfType(serviceInfos, "rabbit-1", AmqpServiceInfo.class);
+		assertServiceFoundOfType(serviceInfos, "rabbit-2", AmqpServiceInfo.class);
+
+		AmqpServiceInfo amqpServiceInfo = (AmqpServiceInfo) serviceInfos.get(0);
+		assertNotNull(amqpServiceInfo.getUri());
+		assertTrue(amqpServiceInfo.getUri().contains(hostname));
+		assertNotNull(amqpServiceInfo.getManagementUri());
+		assertTrue(amqpServiceInfo.getManagementUri().contains(hostname));
+
+		assertNotNull(amqpServiceInfo.getUris());
+		assertEquals(2, amqpServiceInfo.getUris().size());
+		assertTrue(amqpServiceInfo.getUris().get(0).contains(hostname));
+		assertTrue(amqpServiceInfo.getUris().get(1).contains(hostname2));
+
+		assertNotNull(amqpServiceInfo.getManagementUris());
+		assertEquals(2, amqpServiceInfo.getManagementUris().size());
+		assertTrue(amqpServiceInfo.getManagementUris().get(0).contains(hostname));
+		assertTrue(amqpServiceInfo.getManagementUris().get(1).contains(hostname2));
+	}
+
 	@Test
 	public void rabbitServiceCreationNoLabelNoTags() {
 		when(mockEnvironment.getEnvValue("VCAP_SERVICES"))
@@ -103,6 +134,7 @@ public class CloudFoundryConnectorAmqpServiceTest extends AbstractCloudFoundryCo
 		assertServiceFoundOfType(serviceInfos, "qpid-1", AmqpServiceInfo.class);
 		assertServiceFoundOfType(serviceInfos, "qpid-2", AmqpServiceInfo.class);
 		AmqpServiceInfo serviceInfo = (AmqpServiceInfo) getServiceInfo(serviceInfos, "qpid-1");
+		assertNotNull(serviceInfo);
 		assertEquals(username, serviceInfo.getUserName());
 		assertEquals(password, serviceInfo.getPassword());
 		assertEquals("vhost1", serviceInfo.getVirtualHost());
@@ -142,6 +174,17 @@ public class CloudFoundryConnectorAmqpServiceTest extends AbstractCloudFoundryCo
 				hostname, port, user, password, name, vHost);
 	}
 
+	private String getRabbitServicePayloadMultipleUris(String serviceName,
+												   String hostname, String hostname2, int port,
+												   String user, String password, String name,
+												   String vHost) {
+		String payload = getAmqpServicePayload("test-rabbit-info-multiple-uris.json", serviceName,
+				hostname, port, user, password, name, vHost);
+		payload = payload.replace("$host1", hostname);
+		payload = payload.replace("$host2", hostname2);
+		return payload;
+	}
+
 	private String getQpidServicePayloadNoLabelNoTags(String serviceName,
 												   String hostname, int port,
 												   String user, String password, String name,

spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-multiple-uris.json

@@ -0,0 +1,12 @@
+{
+	"name":"$serviceName",
+	"label":"rabbitmq",
+	"plan":"free",
+	"tags":["amqp","rabbitmq"],
+	"credentials":{
+		"uri": "amqp://$username:$password@$hostname/$virtualHost",
+		"http_api_uri": "http://$user:$pass@$hostname/api",
+		"uris": [ "amqp://$username:$password@$host1/$virtualHost", "amqp://$username:$password@$host2/$virtualHost" ],
+		"http_api_uris": [ "http://$user:$pass@$host1/api", "http://$user:$pass@$host2/api" ]
+	}
+}