Merge pull request cloudfoundry#173 from scottfrederick/gradle2

Made fields optional in build plugins.

Author: scottfrederick

cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/CloudFoundryClient.java

@@ -429,6 +429,10 @@ public List<CloudDomain> getDomains() {
 		return cc.getDomains();
 	}
 
+	public CloudDomain getDefaultDomain() {
+		return cc.getDefaultDomain();
+	}
+
 	public void addDomain(String domainName) {
 		cc.addDomain(domainName);
 	}

cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/CloudFoundryOperations.java

@@ -573,6 +573,13 @@ public void createApplication(String appName, Staging staging, Integer disk, Int
 	 */
 	List<CloudDomain> getDomains();
 
+	/**
+	 * Gets the default domain for the current org, which is the first shared domain.
+	 *
+	 * @return the default domain
+	 */
+	CloudDomain getDefaultDomain();
+
 	/**
 	 * Add a private domain in the current organization.
 	 *

cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClient.java

@@ -179,6 +179,8 @@ void createApplication(String appName, Staging staging, Integer disk, Integer me
 
 	List<CloudDomain> getSharedDomains();
 
+	CloudDomain getDefaultDomain();
+
 	void addDomain(String domainName);
 
 	void deleteDomain(String domainName);

cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientImpl.java

@@ -1374,6 +1374,15 @@ public List<CloudDomain> getSharedDomains() {
 		return doGetDomains("/v2/shared_domains");
 	}
 
+	public CloudDomain getDefaultDomain() {
+		List<CloudDomain> sharedDomains = getSharedDomains();
+		if (sharedDomains.isEmpty()) {
+			return null;
+		} else {
+			return sharedDomains.get(0);
+		}
+	}
+
 	public void addDomain(String domainName) {
 		assertSpaceProvided("add domain");
 		UUID domainGuid = getDomainGuid(domainName, false);

cloudfoundry-client-lib/src/test/java/org/cloudfoundry/client/lib/CloudFoundryClientTest.java

@@ -207,7 +207,7 @@ public void setUp() throws Exception {
 		connectedClient = new CloudFoundryClient(new CloudCredentials(CCNG_USER_EMAIL, CCNG_USER_PASS),
 				cloudControllerUrl, CCNG_USER_ORG, CCNG_USER_SPACE, httpProxyConfiguration, CCNG_API_SSL);
 		connectedClient.login();
-		defaultDomainName = getDefaultDomain(connectedClient.getDomains()).getName();
+		defaultDomainName = connectedClient.getDefaultDomain().getName();
 
 		// Optimization to avoid redoing the work already done is tearDown()
 		if (!tearDownComplete) {
@@ -279,7 +279,7 @@ public void checkByteManrulesAndInJvmProxyAssertMechanisms() {
 		HttpHost proxy = new HttpHost("127.0.0.1", inJvmProxyPort);
 		commonsFactory.getHttpClient().getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
 		restTemplate.setRequestFactory(requestFactory);
-		restTemplate.execute(CCNG_API_URL + "/info", HttpMethod.GET,null, null);
+		restTemplate.execute(CCNG_API_URL + "/info", HttpMethod.GET, null, null);
 
 		//then executes fines, and the jetty proxy indeed received one request
 		assertEquals("expected network calls to make it through the inJvmProxy.", 1, nbInJvmProxyRcvReqs.get());
@@ -999,40 +999,40 @@ public void getLogs() throws Exception {
 
 	@Test
 	public void streamLogs() throws Exception {
-        String appName = namespacedAppName("simple_logs");
-        CloudApplication app = createAndUploadAndStartSimpleSpringApp(appName);
-        boolean pass = getInstanceInfosWithTimeout(appName, 1, true);
-        assertTrue("Couldn't get the right application state", pass);
-
-        AccumulatingApplicationLogListener testListener = new AccumulatingApplicationLogListener();
-        connectedClient.streamRecentLogs(appName, testListener);
-        
-        int attempt = 0;
-        do {
-            if (testListener.logs.size() > 0) {
-                break;
-            }
-            Thread.sleep(1000);    
-        } while (attempt < 20);
-        assertTrue("Failed to see recent logs", testListener.logs.size() > 0);
-        
-        testListener.logs.clear();
-        connectedClient.streamLogs(appName, testListener);
-        String appUri = "http://" + app.getUris().get(0);
-        RestTemplate appTemplate = new RestTemplate();
-        attempt = 0;
-        do {
-            // no need to sleep, visiting the app uri should be sufficient
-            try {
-                appTemplate.getForObject(appUri, String.class);
-            } catch (HttpClientErrorException ex) {
-                // ignore
-            }
-            if (testListener.logs.size() > 0) {
-                break;
-            }
-        } while(attempt < 20);
-        assertTrue("Failed to stream normal log", testListener.logs.size() > 0);
+		String appName = namespacedAppName("simple_logs");
+		CloudApplication app = createAndUploadAndStartSimpleSpringApp(appName);
+		boolean pass = getInstanceInfosWithTimeout(appName, 1, true);
+		assertTrue("Couldn't get the right application state", pass);
+
+		AccumulatingApplicationLogListener testListener = new AccumulatingApplicationLogListener();
+		connectedClient.streamRecentLogs(appName, testListener);
+
+		int attempt = 0;
+		do {
+			if (testListener.logs.size() > 0) {
+				break;
+			}
+			Thread.sleep(1000);
+		} while (attempt < 20);
+		assertTrue("Failed to see recent logs", testListener.logs.size() > 0);
+
+		testListener.logs.clear();
+		connectedClient.streamLogs(appName, testListener);
+		String appUri = "http://" + app.getUris().get(0);
+		RestTemplate appTemplate = new RestTemplate();
+		attempt = 0;
+		do {
+			// no need to sleep, visiting the app uri should be sufficient
+			try {
+				appTemplate.getForObject(appUri, String.class);
+			} catch (HttpClientErrorException ex) {
+				// ignore
+			}
+			if (testListener.logs.size() > 0) {
+				break;
+			}
+		} while (attempt < 20);
+		assertTrue("Failed to stream normal log", testListener.logs.size() > 0);
 	}
 
 	@Test
@@ -1260,8 +1260,7 @@ public void bindAndUnbindService() throws IOException {
 
 	@Test
 	public void defaultDomainFound() throws Exception {
-		List<CloudDomain> domains = connectedClient.getSharedDomains();
-		assertNotNull(getDefaultDomain(domains));
+		assertNotNull(connectedClient.getDefaultDomain());
 	}
 
 	@Test
@@ -1270,7 +1269,7 @@ public void getDomains() {
 
 		List<CloudDomain> allDomains = connectedClient.getDomains();
 
-		assertNotNull(getDefaultDomain(allDomains));
+		assertNotNull(getDomainNamed(defaultDomainName, allDomains));
 		assertNotNull(getDomainNamed(TEST_DOMAIN, allDomains));
 	}
 
@@ -1295,7 +1294,6 @@ private void assertDomainInList(List<CloudDomain> domains) {
 	}
 
 	private void assertDomainNotInList(List<CloudDomain> domains) {
-		assertTrue(domains.size() >= 1);
 		assertNull(getDomainNamed(TEST_DOMAIN, domains));
 	}
 
@@ -1351,7 +1349,7 @@ public void appsWithRoutesAreCounted() throws IOException {
 
 	@Test
 	public void infoAvailableWithoutLoggingIn() throws Exception {
-		CloudFoundryClient infoClient = new CloudFoundryClient(new URL(CCNG_API_URL), httpProxyConfiguration);
+		CloudFoundryClient infoClient = new CloudFoundryClient(new URL(CCNG_API_URL), httpProxyConfiguration, CCNG_API_SSL);
 		CloudInfo info = infoClient.getCloudInfo();
 		assertNotNull(info.getName());
 		assertNotNull(info.getSupport());
@@ -1811,15 +1809,6 @@ private CloudDomain getDomainNamed(String domainName, List<CloudDomain> domains)
 		return null;
 	}
 
-	private CloudDomain getDefaultDomain(List<CloudDomain> domains) {
-		for (CloudDomain domain : domains) {
-			if (domain.getOwner().getName().equals("none")) {
-				return domain;
-			}
-		}
-		return null;
-	}
-
 	private String computeAppUrl(String appName) {
 		return appName + "." + defaultDomainName;
 	}
@@ -1865,18 +1854,18 @@ public boolean onProgress(String status) {
 	}
 
 	private class AccumulatingApplicationLogListener implements ApplicationLogListener {
-	    private List<ApplicationLog> logs = new ArrayList<ApplicationLog>();
-	    
-        public void onMessage(ApplicationLog log) {
-            logs.add(log);
-        }
-
-        public void onError(Throwable exception) {
-            fail(exception.getMessage());
-        }
-
-        public void onComplete() {
-        }
-	    
+		private List<ApplicationLog> logs = new ArrayList<ApplicationLog>();
+
+		public void onMessage(ApplicationLog log) {
+			logs.add(log);
+		}
+
+		public void onError(Throwable exception) {
+			fail(exception.getMessage());
+		}
+
+		public void onComplete() {
+		}
+
 	}
 }

cloudfoundry-gradle-plugin/build.gradle

@@ -27,7 +27,7 @@ repositories {
 
 dependencies {
     compile gradleApi()
-    compile 'org.cloudfoundry:cloudfoundry-client-lib:1.0.2'
+    compile 'org.cloudfoundry:cloudfoundry-client-lib:1.0.3.BUILD-SNAPSHOT'
     compile 'org.codehaus.groovy:groovy:2.1.6'
     testCompile 'junit:junit:4.8.2'
 }

cloudfoundry-gradle-plugin/src/main/groovy/org/cloudfoundry/gradle/tasks/AbstractCloudFoundryTask.groovy

@@ -26,6 +26,8 @@ import org.cloudfoundry.client.lib.tokens.TokensFile
 import org.gradle.api.DefaultTask
 import org.cloudfoundry.gradle.GradlePluginRestLogCallback
 import org.gradle.api.Task
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.WarPlugin
 import org.springframework.http.HttpStatus
 import org.springframework.security.oauth2.common.OAuth2AccessToken
 import org.springframework.web.client.ResourceAccessException
@@ -289,6 +291,15 @@ abstract class AbstractCloudFoundryTask extends DefaultTask {
         String host = propertyOrExtension('host')
         List<String> hosts = project.cloudfoundry.hosts
 
+        if (!uri && !uris) {
+            if (!domain) {
+                domain = client.defaultDomain.name
+            }
+            if (!hosts && !host) {
+                host = application
+            }
+        }
+
         def allUris = []
 
         if (!currentVariantSuffix) {
@@ -310,7 +321,13 @@ abstract class AbstractCloudFoundryTask extends DefaultTask {
     }
 
     File getFile() {
-        project.cloudfoundry.file
+        ((project.cloudfoundry.file ?:
+                getDefaultArchiveForTask(WarPlugin.WAR_TASK_NAME)) ?:
+                getDefaultArchiveForTask(JavaPlugin.JAR_TASK_NAME))
+    }
+
+    File getDefaultArchiveForTask(String taskName) {
+        project.tasks.findByName(taskName)?.archivePath
     }
 
     Map<String, String> getEnv() {

cloudfoundry-maven-plugin/pom.xml

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

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

@@ -18,8 +18,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -253,44 +253,18 @@ public Map<String,String> getEnv() {
 	 * If the application name was specified via the command line ({@link SystemProperties})
 	 * then that property is used. Otherwise return the appname.
 	 *
-	 * @return Returns the Cloud Foundry application url. Returns null in case
-	 * the target url cannot be used to determine a suitable default.
+	 * @return Returns the Cloud Foundry application url.
 	 */
 	public String getUrl() {
 
 		final String property = getCommandlineProperty(SystemProperties.URL);
 
 		if (property != null) {
 			return property;
-		}
-		else if (this.url == null && this.urls == null) {
-			if (getTarget() != null) {
-
-				final URI targetUri = getTarget();
-				final String[] tokenizedTarget = targetUri.getSchemeSpecificPart().split("\\.");
-
-				if (tokenizedTarget.length >=2) {
-
-					String domain = tokenizedTarget[tokenizedTarget.length-2];
-
-					if (domain.startsWith("//")) {
-						domain = domain.substring(2);
-					}
-
-					return getAppname() + "." + domain
-											 + "." + tokenizedTarget[tokenizedTarget.length-1];
-				} else {
-					getLog().warn(String.format("Unable to derive a suitable " +
-													 "Url from the provided Target Url '%s'", targetUri.toString()));
-					return null;
-				}
-
-			} else {
-				return getAppname() + "." + "<undefined target>";
-			}
 		} else {
 			return this.url;
 		}
+
 	}
 
 	/**
@@ -754,18 +728,16 @@ private int getInstanceCount(List<InstanceInfo> instances, InstanceState state)
 	}
 
 	protected List<String> getAllUris() throws MojoExecutionException {
-		final List<String> uris = new ArrayList<String>(0);
-
 		Assert.configurationUrls(getUrl(), getUrls());
 
 		if (getUrl() != null) {
-			uris.add(getUrl());
+			return Arrays.asList(getUrl());
 		} else if (!getUrls().isEmpty()) {
-			for (String uri : getUrls()) {
-				uris.add(uri);
-			}
+			return getUrls();
+		} else {
+			String defaultUri = getAppname() + "." + getClient().getDefaultDomain().getName();
+			return Arrays.asList(defaultUri);
 		}
-		return uris;
 	}
 
 	private long getAppStartupExpiry() {