Convert functions etc. after context starts

The app deployer now has to reach into the function contexts and
extract a catalog and call its methods reflectively.

spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionAppDeployerTests.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function.deployer;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.springframework.boot.loader.thin.ArchiveUtils;
+import org.springframework.boot.loader.tools.LogbackInitializer;
+import org.springframework.cloud.deployer.spi.app.DeploymentState;
+import org.springframework.cloud.deployer.spi.core.AppDefinition;
+import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest;
+import org.springframework.cloud.deployer.thin.ThinJarAppDeployer;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Dave Syer
+ *
+ */
+@RunWith(Parameterized.class)
+public class FunctionAppDeployerTests {
+
+	static {
+		LogbackInitializer.initialize();
+	}
+
+	private static ThinJarAppDeployer deployer = new ThinJarAppDeployer();
+
+	@BeforeClass
+	public static void skip() {
+		try {
+			ArchiveUtils.getArchiveRoot(ArchiveUtils.getArchive(
+					"maven://org.springframework.cloud:spring-cloud-function-web:1.0.0.BUILD-SNAPSHOT"));
+		}
+		catch (Exception e) {
+			Assume.assumeNoException(
+					"Could not locate jar for tests. Please build spring-cloud-function locally first.",
+					e);
+		}
+	}
+
+	@Parameterized.Parameters
+	public static List<Object[]> data() {
+		// Repeat a couple of times to ensure it's consistent
+		return Arrays.asList(new Object[2][0]);
+	}
+
+	@Test
+	public void web() throws Exception {
+		String first = deploy(
+				"maven://org.springframework.cloud:spring-cloud-function-web:1.0.0.BUILD-SNAPSHOT",
+				"--web.path=/words", "--function.name=uppercase");
+		// Deployment is blocking so it either failed or succeeded.
+		assertThat(deployer.status(first).getState()).isEqualTo(DeploymentState.deployed);
+		deployer.undeploy(first);
+	}
+
+	@Test
+	public void stream() throws Exception {
+		String first = deploy(
+				"maven://org.springframework.cloud:spring-cloud-function-stream:1.0.0.BUILD-SNAPSHOT",
+				"--spring.cloud.stream.bindings.input.destination=words",
+				"--spring.cloud.stream.bindings.output.destination=uppercaseWords",
+				"--function.name=uppercase");
+		// Deployment is blocking so it either failed or succeeded.
+		assertThat(deployer.status(first).getState()).isEqualTo(DeploymentState.deployed);
+		deployer.undeploy(first);
+	}
+
+	private String deploy(String jarName, String... args) throws Exception {
+		Resource resource = new FileSystemResource(
+				ArchiveUtils.getArchiveRoot(ArchiveUtils.getArchive(jarName)));
+		AppDefinition definition = new AppDefinition(resource.getFilename(),
+				Collections.emptyMap());
+		AppDeploymentRequest request = new AppDeploymentRequest(definition, resource,
+				Collections.emptyMap(), Arrays.asList(args));
+		String deployed = deployer.deploy(request);
+		return deployed;
+	}
+
+}

spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogIntegrationTests.java

@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Dave Syer
  *
  */
-public class FunctionExtractingAppDeployerIntegrationTests {
+public class FunctionExtractingFunctionCatalogIntegrationTests {
 
 	private static ConfigurableApplicationContext context;
 	private static int port;
@@ -37,7 +37,7 @@ public class FunctionExtractingAppDeployerIntegrationTests {
 	@BeforeClass
 	public static void open() {
 		port = SocketUtils.findAvailableTcpPort();
-		System.setProperty("debug", "true");
+		// System.setProperty("debug", "true");
 		context = new ApplicationRunner().start("--server.port=" + port);
 	}
 

spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogTests.java

@@ -25,7 +25,6 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.boot.loader.thin.ArchiveUtils;
 import org.springframework.boot.loader.tools.LogbackInitializer;
-import org.springframework.cloud.deployer.spi.app.DeploymentState;
 import org.springframework.cloud.deployer.spi.core.AppDefinition;
 import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest;
 import org.springframework.core.io.FileSystemResource;
@@ -39,7 +38,7 @@ import reactor.core.publisher.Flux;
  * @author Dave Syer
  *
  */
-public class FunctionExtractingAppDeployerTests {
+public class FunctionExtractingFunctionCatalogTests {
 
 	private static String id;
 
@@ -47,7 +46,7 @@ public class FunctionExtractingAppDeployerTests {
 		LogbackInitializer.initialize();
 	}
 
-	private static FunctionExtractingAppDeployer deployer = new FunctionExtractingAppDeployer();
+	private static FunctionExtractingFunctionCatalog deployer = new FunctionExtractingFunctionCatalog();
 
 	@Rule
 	public ExpectedException expected = ExpectedException.none();
@@ -58,7 +57,6 @@ public class FunctionExtractingAppDeployerTests {
 			id = deploy("maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT");
 			// "--debug");
 		}
-		assertThat(deployer.status(id).getState()).isEqualTo(DeploymentState.deployed);
 	}
 
 	@Test