Add all resources in testjars/beanName/**

Closes gh-61

Author: rwinch

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBean.java

@@ -148,9 +148,8 @@ public Class<?> getObjectType() {
 
 	@Override
 	public void setBeanName(String beanName) {
-		defaultApplicationConfiguration(beanName, "yaml");
-		defaultApplicationConfiguration(beanName, "yml");
-		defaultApplicationConfiguration(beanName, "properties");
+		String basePath = "testjars/" + beanName;
+		this.classpath.entries(new ScanningClasspathEntry(basePath));
 	}
 
 	private void defaultApplicationConfiguration(String beanName, String extension) {

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/ScanningClasspathEntry.java

@@ -21,6 +21,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 import org.springframework.core.io.ClassPathResource;
@@ -36,12 +37,25 @@
  */
 class ScanningClasspathEntry implements ClasspathEntry {
 
-	private final Class<?> clazz;
+	private final String resourcePattern;
+
+	private final Function<String, String> renameResource;
 
 	private Path classpath;
 
+	ScanningClasspathEntry(String baseDir) {
+		this.resourcePattern = baseDir + "/**";
+		this.renameResource = (name) -> {
+			String prefix = baseDir + "/";
+			int index = name.lastIndexOf(prefix);
+			return (index > -1) ? name.substring(index + prefix.length()) : name;
+		};
+	}
+
 	ScanningClasspathEntry(Class<?> clazz) {
-		this.clazz = clazz;
+		String resourcePath = toResourceName(clazz.getPackageName());
+		this.resourcePattern = resourcePath + "/**";
+		this.renameResource = (name) -> name.substring(name.lastIndexOf(resourcePath));
 	}
 
 	Path getClasspath() {
@@ -57,16 +71,14 @@ public List<String> resolve() {
 	}
 
 	private Path createClasspath() {
-		String resourcePath = toResourceName(this.clazz.getPackageName());
-		String resourcePattern = resourcePath + "/**";
 		PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
 		try {
 			Path classpath = Files.createTempDirectory("classpath-");
-			Resource[] resources = resolver.getResources(resourcePattern);
+			Resource[] resources = resolver.getResources(this.resourcePattern);
 			for (Resource resource : resources) {
-				String path = getPath(resource);
-				if (!path.endsWith("/")) {
-					Path destination = classpath.resolve(resourcePath).resolve(resource.getFilename());
+				String path = this.renameResource.apply(getPath(resource));
+				if (!path.endsWith("/") && resource.isReadable()) {
+					Path destination = classpath.resolve(path);
 					destination.getParent().toFile().mkdirs();
 					Files.copy(resource.getInputStream(), destination);
 				}

spring-boot-testjars/src/test/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBeanTests.java

@@ -139,6 +139,7 @@ void classpathWhenPropertiesDefaults() throws Exception {
 		CommonsExecWebServerFactoryBean factory = CommonsExecWebServerFactoryBean.builder();
 		factory.setBeanName("hasProperties");
 		factory.classpath((cp) -> {
+			cp.build();
 			List<ClasspathEntry> classpath = cp.getClasspath();
 			assertClasspathContainsResourceWithContent(classpath, "application.properties", expectedContent);
 		});

spring-boot-testjars/src/test/java/org/springframework/experimental/boot/server/exec/ScanningClasspathEntryTests.java

@@ -68,4 +68,15 @@ void cleanup() {
 		assertThat(this.classpathEntry.getClasspath()).doesNotExist();
 	}
 
+	@Test
+	void configServer() {
+		this.classpathEntry = new ScanningClasspathEntry("testjars/configServer");
+		List<String> classpath = this.classpathEntry.resolve();
+		assertThat(classpath).hasSize(1);
+		File path = new File(classpath.get(0));
+		assertThat(path).exists();
+		assertThat(new File(path, "application.yml")).exists();
+		assertThat(new File(path, "configrepo/configclient.properties")).exists();
+	}
+
 }

spring-boot-testjars/src/test/resources/testjars/configServer/application.yml

@@ -0,0 +1,11 @@
+spring:
+  application.name: configserver
+  profiles:
+    active: native
+  cloud:
+    config:
+      server:
+        native:
+          searchLocations: "classpath:configrepo"
+server:
+  port: 8888

spring-boot-testjars/src/test/resources/testjars/configServer/configrepo/configclient.properties

@@ -0,0 +1 @@
+foo.prop=bar