From 38b9a833bd16b12a4fe73fe3595e15e2c19c4e64 Mon Sep 17 00:00:00 2001 From: izeye Date: Thu, 27 May 2021 10:15:57 +0900 Subject: [PATCH] Fix "Allow optional directories without sub-directories" Fix the update to `resolvePatternEmptyDirectories` introduced in commit 01dd68e29edc which was incorrectly checking `isOptional`. See gh-26677 --- .../context/config/StandardConfigDataLocationResolver.java | 2 +- .../ConfigDataEnvironmentPostProcessorIntegrationTests.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java index 8d956b334cb..d00c91a24cf 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java @@ -267,7 +267,7 @@ public class StandardConfigDataLocationResolver private Set resolvePatternEmptyDirectories(StandardConfigDataReference reference) { Resource[] subdirectories = this.resourceLoader.getResources(reference.getDirectory(), ResourceType.DIRECTORY); ConfigDataLocation location = reference.getConfigDataLocation(); - if (location.isOptional() && ObjectUtils.isEmpty(subdirectories)) { + if (!location.isOptional() && ObjectUtils.isEmpty(subdirectories)) { String message = String.format("Config data location '%s' contains no subdirectories", location); throw new ConfigDataLocationNotFoundException(location, message, null); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java index d11631b0f57..4754b54f0e8 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java @@ -715,7 +715,8 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests { void runWhenMandatoryWildcardLocationHasNoSubdirectories() { assertThatExceptionOfType(ConfigDataLocationNotFoundException.class).isThrownBy( () -> this.application.run("--spring.config.location=file:src/test/resources/config/0-empty/*/")) - .withMessage("Config data location 'file:src/test/resources/config/0-empty/*/' cannot be found"); + .withMessage( + "Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories"); } @Test