Merge branch '2.4.x'

Closes gh-26581 Closes gh-26582 Closes gh-26583
spring-projects · May 17, 2021 · ba0fe1e · ba0fe1e
2 parents 2bbad94 + c45bb2b
commit ba0fe1e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 12 deletions.
diff --git a/...main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java b/...main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
@@ -27,6 +28,7 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 
@@ -244,19 +246,33 @@ private Collection<StandardConfigDataResource> resolveEmptyDirectories(
 			Set<StandardConfigDataReference> references) {
 		Set<StandardConfigDataResource> empty = new LinkedHashSet<>();
 		for (StandardConfigDataReference reference : references) {
-			if (reference.isMandatoryDirectory()) {
-				Resource resource = this.resourceLoader.getResource(reference.getDirectory());
-				if (resource instanceof ClassPathResource) {
-					continue;
-				}
-				StandardConfigDataResource configDataResource = new StandardConfigDataResource(reference, resource);
-				ConfigDataResourceNotFoundException.throwIfDoesNotExist(configDataResource, resource);
-				empty.add(new StandardConfigDataResource(reference, resource, true));
-			}
+			empty.addAll(resolveEmptyDirectories(reference));
 		}
 		return empty;
 	}
 
+	private Set<StandardConfigDataResource> resolveEmptyDirectories(StandardConfigDataReference reference) {
+		if (!this.resourceLoader.isPattern(reference.getResourceLocation())) {
+			return resolveNonPatternEmptyDirectories(reference);
+		}
+		return resolvePatternEmptyDirectories(reference);
+	}
+
+	private Set<StandardConfigDataResource> resolveNonPatternEmptyDirectories(StandardConfigDataReference reference) {
+		Resource resource = this.resourceLoader.getResource(reference.getDirectory());
+		return (resource instanceof ClassPathResource || !resource.exists()) ? Collections.emptySet()
+				: Collections.singleton(new StandardConfigDataResource(reference, resource, true));
+	}
+
+	private Set<StandardConfigDataResource> resolvePatternEmptyDirectories(StandardConfigDataReference reference) {
+		Resource[] resources = this.resourceLoader.getResources(reference.getDirectory(), ResourceType.DIRECTORY);
+		Assert.state(resources.length > 0,
+				"No subdirectories found for mandatory directory location '" + reference.getDirectory() + "'.");
+		return Arrays.stream(resources).filter(Resource::exists)
+				.map((resource) -> new StandardConfigDataResource(reference, resource, true))
+				.collect(Collectors.toCollection(LinkedHashSet::new));
+	}
+
 	private List<StandardConfigDataResource> resolve(StandardConfigDataReference reference) {
 		if (!this.resourceLoader.isPattern(reference.getResourceLocation())) {
 			return resolveNonPattern(reference);

diff --git a/...ringframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java b/...ringframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
@@ -547,7 +547,7 @@ void runWhenConfigLocationHasOptionalMissingDirectoryContinuesToLoad() {
 	@Test
 	void runWhenConfigLocationHasNonOptionalMissingFileDirectoryThrowsResourceNotFoundException() {
 		File location = new File(this.temp, "application.unknown");
-		assertThatExceptionOfType(ConfigDataResourceNotFoundException.class).isThrownBy(() -> this.application
+		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class).isThrownBy(() -> this.application
 				.run("--spring.config.location=" + StringUtils.cleanPath(location.getAbsolutePath()) + "/"));
 	}
 
@@ -566,6 +566,12 @@ void runWhenConfigLocationHasNonOptionalEmptyFileDirectoryDoesNotThrowException(
 				.run("--spring.config.location=" + StringUtils.cleanPath(location.getAbsolutePath()) + "/"));
 	}
 
+	@Test
+	void runWhenConfigLocationHasMandatoryDirectoryThatDoesntExistThrowsException() {
+		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class).isThrownBy(
+				() -> this.application.run("--spring.config.location=" + StringUtils.cleanPath("invalid/")));
+	}
+
 	@Test
 	void runWhenConfigLocationHasNonOptionalEmptyFileDoesNotThrowException() throws IOException {
 		File location = new File(this.temp, "application.properties");
@@ -686,13 +692,32 @@ public Object onSuccess(ConfigurationPropertyName name, Bindable<?> target, Bind
 	@Test
 	void runWhenHasWildcardLocationLoadsFromAllMatchingLocations() {
 		ConfigurableApplicationContext context = this.application.run(
-				"--spring.config.location=optional:file:src/test/resources/config/*/",
-				"--spring.config.name=testproperties");
+				"--spring.config.location=file:src/test/resources/config/*/", "--spring.config.name=testproperties");
 		ConfigurableEnvironment environment = context.getEnvironment();
 		assertThat(environment.getProperty("first.property")).isEqualTo("apple");
 		assertThat(environment.getProperty("second.property")).isEqualTo("ball");
 	}
 
+	@Test
+	void runWhenMandatoryWildcardLocationHasEmptyFileDirectory() {
+		assertThatNoException()
+				.isThrownBy(() -> this.application.run("--spring.config.location=file:src/test/resources/config/*/"));
+	}
+
+	@Test
+	void runWhenMandatoryWildcardLocationHasNoSubdirectories() {
+		assertThatIllegalStateException().isThrownBy(
+				() -> this.application.run("--spring.config.location=file:src/test/resources/config/0-empty/*/"))
+				.withMessage(
+						"No subdirectories found for mandatory directory location 'file:src/test/resources/config/0-empty/*/'.");
+	}
+
+	@Test
+	void runWhenHasMandatoryWildcardLocationThatDoesNotExist() {
+		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class)
+				.isThrownBy(() -> this.application.run("--spring.config.location=file:invalid/*/"));
+	}
+
 	@Test // gh-24990
 	void runWhenHasProfileSpecificFileWithActiveOnProfileProperty() {
 		ConfigurableApplicationContext context = this.application