Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
91eb37dd
Commit
91eb37dd
authored
May 27, 2021
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.4.x'
Closes gh-26679
parents
1a101627
35f11946
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
StandardConfigDataLocationResolver.java
...ot/context/config/StandardConfigDataLocationResolver.java
+1
-1
ConfigDataEnvironmentPostProcessorIntegrationTests.java
...g/ConfigDataEnvironmentPostProcessorIntegrationTests.java
+8
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
View file @
91eb37dd
...
...
@@ -268,7 +268,7 @@ public class StandardConfigDataLocationResolver
private
Set
<
StandardConfigDataResource
>
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
);
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View file @
91eb37dd
...
...
@@ -715,7 +715,14 @@ 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
void
runWhenOptionalWildcardLocationHasNoSubdirectories
()
{
assertThatNoException
().
isThrownBy
(()
->
this
.
application
.
run
(
"--spring.config.location=optional:file:src/test/resources/config/0-empty/*/"
));
}
@Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment