Added support for user-provided service instances in Maven plugin.

Author: scottfrederick

cloudfoundry-maven-plugin/pom.xml

@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.cloudfoundry</groupId>
 			<artifactId>cloudfoundry-client-lib</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

cloudfoundry-maven-plugin/src/main/java/org/cloudfoundry/maven/AbstractApplicationAwareCloudFoundryMojo.java

@@ -133,7 +133,7 @@ abstract class AbstractApplicationAwareCloudFoundryMojo extends AbstractCloudFou
 	 *
 	 * @parameter expression="${services}"
 	 */
-	private List<CloudService> services;
+	private List<CloudServiceWithUserProvided> services;
 
 	/**
 	 * list of domains to use by the application.
@@ -466,9 +466,9 @@ public Integer getInstances() {
 	 *
 	 * @return Never null
 	 */
-	public List<CloudService> getServices() {
+	public List<CloudServiceWithUserProvided> getServices() {
 		if (this.services == null) {
-			return new ArrayList<CloudService>(0);
+			return new ArrayList<CloudServiceWithUserProvided>(0);
 		} else {
 			return this.services;
 		}
@@ -528,7 +528,7 @@ public void createServices() throws MojoExecutionException {
 			currentServicesNames.add(currentService.getName());
 		}
 
-		for (CloudService service: getServices()) {
+		for (CloudServiceWithUserProvided service: getServices()) {
 			if (currentServicesNames.contains(service.getName())) {
 				getLog().debug(String.format("Service '%s' already exists", service.getName()));
 			}
@@ -537,7 +537,12 @@ public void createServices() throws MojoExecutionException {
 				Assert.configurationServiceNotNull(service, null);
 
 				try {
-					client.createService(service);
+					if (service.getLabel().equals("user-provided")) {
+						service.setLabel(null);
+						client.createUserProvidedService(service, service.getUserProvidedCredentials());
+					} else {
+						client.createService(service);
+					}
 				} catch (CloudFoundryException e) {
 					throw new MojoExecutionException(String.format("Not able to create service '%s'.", service.getName()));
 				}

cloudfoundry-maven-plugin/src/main/java/org/cloudfoundry/maven/AbstractPush.java

@@ -31,7 +31,6 @@
 import org.cloudfoundry.client.lib.domain.CloudService;
 import org.cloudfoundry.client.lib.domain.Staging;
 
-import org.cloudfoundry.maven.common.Assert;
 import org.cloudfoundry.maven.common.CommonUtils;
 
 import org.springframework.http.HttpStatus;
@@ -160,7 +159,7 @@ private void createApplication(String appname, String command, String buildpack,
 	}
 
 	private List<String> getServiceNames() {
-		final List<CloudService> services = getServices();
+		final List<? extends CloudService> services = getServices();
 		List<String> serviceNames = new ArrayList<String>();
 
 		for (CloudService service : services) {

cloudfoundry-maven-plugin/src/main/java/org/cloudfoundry/maven/CloudServiceWithUserProvided.java

@@ -0,0 +1,21 @@
+package org.cloudfoundry.maven;
+
+import org.cloudfoundry.client.lib.domain.CloudService;
+
+import java.util.Map;
+
+public class CloudServiceWithUserProvided extends CloudService {
+	private Map<String, Object> userProvidedCredentials;
+
+	public CloudServiceWithUserProvided() {
+		super();
+	}
+
+	public Map<String, Object> getUserProvidedCredentials() {
+		return userProvidedCredentials;
+	}
+
+	public void setUserProvidedCredentials(Map<String, Object> userProvidedCredentials) {
+		this.userProvidedCredentials = userProvidedCredentials;
+	}
+}

cloudfoundry-maven-plugin/src/main/java/org/cloudfoundry/maven/common/CommonUtils.java

@@ -106,7 +106,7 @@ public static String collectionToCommaDelimitedString(Collection<String> list, S
 	 * @return Returns the List as a comma delimited String. Returns an empty
 	 *         String for a Null or empty list.
 	 */
-	public static String collectionServicesToCommaDelimitedString(Collection<CloudService> list) {
+	public static String collectionServicesToCommaDelimitedString(Collection<? extends CloudService> list) {
 		if (list == null || list.isEmpty()) {
 			return "";
 		}

cloudfoundry-maven-plugin/src/main/java/org/cloudfoundry/maven/common/UiUtils.java

@@ -251,32 +251,43 @@ public int compare(CloudService a, CloudService b) {
 		table.getHeaders().put(COLUMN_1, new TableHeader("name"));
 		table.getHeaders().put(COLUMN_2, new TableHeader("service"));
 		table.getHeaders().put(COLUMN_3, new TableHeader("provider"));
-		table.getHeaders().put(COLUMN_4, new TableHeader("version"));
-		table.getHeaders().put(COLUMN_5, new TableHeader("plan"));
-		table.getHeaders().put(COLUMN_6, new TableHeader("bound apps"));
+		table.getHeaders().put(COLUMN_4, new TableHeader("plan"));
+		table.getHeaders().put(COLUMN_5, new TableHeader("bound apps"));
 
 		for (CloudService service : services) {
 			TableRow tableRow = new TableRow();
 
-			table.getHeaders().get(COLUMN_1).updateWidth(service.getName().length());
-			tableRow.addValue(COLUMN_1, service.getName());
+			String name = service.getName();
 
-			table.getHeaders().get(COLUMN_2).updateWidth(service.getLabel().length());
-			tableRow.addValue(COLUMN_2, service.getLabel());
+			String label;
+			String provider;
+			String plan;
+			if (service.isUserProvided()) {
+				label = "user-provided";
+				provider = "";
+				plan = "";
+			} else {
+				label = service.getLabel();
+				provider = service.getProvider();
+				plan = service.getPlan();
+			}
+
+			table.getHeaders().get(COLUMN_1).updateWidth(name.length());
+			tableRow.addValue(COLUMN_1, name);
 
-			table.getHeaders().get(COLUMN_3).updateWidth(service.getProvider().length());
-			tableRow.addValue(COLUMN_3, service.getProvider());
+			table.getHeaders().get(COLUMN_2).updateWidth(label.length());
+			tableRow.addValue(COLUMN_2, label);
 
-			table.getHeaders().get(COLUMN_4).updateWidth(service.getVersion().length());
-			tableRow.addValue(COLUMN_4, service.getVersion());
+			table.getHeaders().get(COLUMN_3).updateWidth(provider.length());
+			tableRow.addValue(COLUMN_3, provider);
 
-			table.getHeaders().get(COLUMN_5).updateWidth(service.getPlan().length());
-			tableRow.addValue(COLUMN_5, service.getPlan());
+			table.getHeaders().get(COLUMN_4).updateWidth(plan.length());
+			tableRow.addValue(COLUMN_4, plan);
 
-			final List<String> appNames = servicesToApps.get(service.getName());
+			final List<String> appNames = servicesToApps.get(name);
 			final String appNamesString = CommonUtils.collectionToCommaDelimitedString(appNames);
-			table.getHeaders().get(COLUMN_6).updateWidth(appNamesString.length());
-			tableRow.addValue(COLUMN_6, appNamesString);
+			table.getHeaders().get(COLUMN_5).updateWidth(appNamesString.length());
+			tableRow.addValue(COLUMN_5, appNamesString);
 
 			table.getRows().add(tableRow);
 		}