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
00a358b4
Commit
00a358b4
authored
Feb 17, 2021
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Throw or warn for invalid config properties with list syntax
Fixes gh-25309
parent
6c0ec10f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
3 deletions
+23
-3
InvalidConfigDataPropertyException.java
...ot/context/config/InvalidConfigDataPropertyException.java
+5
-0
ConfigDataEnvironmentPostProcessorIntegrationTests.java
...g/ConfigDataEnvironmentPostProcessorIntegrationTests.java
+4
-3
InvalidConfigDataPropertyExceptionTests.java
...ntext/config/InvalidConfigDataPropertyExceptionTests.java
+10
-0
application-include-profiles-list-in-profile-specific-file-test.yml
...n-include-profiles-list-in-profile-specific-file-test.yml
+4
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InvalidConfigDataPropertyException.java
View file @
00a358b4
...
...
@@ -43,6 +43,8 @@ public class InvalidConfigDataPropertyException extends ConfigDataException {
Map
<
ConfigurationPropertyName
,
ConfigurationPropertyName
>
warnings
=
new
LinkedHashMap
<>();
warnings
.
put
(
ConfigurationPropertyName
.
of
(
"spring.profiles"
),
ConfigurationPropertyName
.
of
(
"spring.config.activate.on-profile"
));
warnings
.
put
(
ConfigurationPropertyName
.
of
(
"spring.profiles[0]"
),
ConfigurationPropertyName
.
of
(
"spring.config.activate.on-profile"
));
WARNINGS
=
Collections
.
unmodifiableMap
(
warnings
);
}
...
...
@@ -50,8 +52,11 @@ public class InvalidConfigDataPropertyException extends ConfigDataException {
static
{
Set
<
ConfigurationPropertyName
>
errors
=
new
LinkedHashSet
<>();
errors
.
add
(
Profiles
.
INCLUDE_PROFILES
);
errors
.
add
(
Profiles
.
INCLUDE_PROFILES
.
append
(
"[0]"
));
errors
.
add
(
ConfigurationPropertyName
.
of
(
AbstractEnvironment
.
ACTIVE_PROFILES_PROPERTY_NAME
));
errors
.
add
(
ConfigurationPropertyName
.
of
(
AbstractEnvironment
.
ACTIVE_PROFILES_PROPERTY_NAME
+
"[0]"
));
errors
.
add
(
ConfigurationPropertyName
.
of
(
AbstractEnvironment
.
DEFAULT_PROFILES_PROPERTY_NAME
));
errors
.
add
(
ConfigurationPropertyName
.
of
(
AbstractEnvironment
.
DEFAULT_PROFILES_PROPERTY_NAME
+
"[0]"
));
PROFILE_SPECIFIC_ERRORS
=
Collections
.
unmodifiableSet
(
errors
);
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View file @
00a358b4
...
...
@@ -642,9 +642,10 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
}
@Test
void
runWhenHasIncludedProfilesWithProfileSpecificFileThrowsException
()
{
assertThatExceptionOfType
(
InvalidConfigDataPropertyException
.
class
).
isThrownBy
(()
->
this
.
application
.
run
(
"--spring.config.name=application-include-profiles-in-profile-specific-file"
));
void
runWhenHasIncludedProfilesWithListSyntaxWithProfileSpecificDocumentThrowsException
()
{
assertThatExceptionOfType
(
InvalidConfigDataPropertyException
.
class
).
isThrownBy
(()
->
this
.
application
.
run
(
"--spring.config.name=application-include-profiles-list-in-profile-specific-file"
,
"--spring.profiles.active=test"
));
}
@Test
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/InvalidConfigDataPropertyExceptionTests.java
View file @
00a358b4
...
...
@@ -169,6 +169,16 @@ class InvalidConfigDataPropertyExceptionTests {
+
"'spring.config.activate.on-profile' [origin: \"spring.profiles\" from property source \"mockProperties\"]"
);
}
@Test
void
throwOrWarnWhenHasWarningPropertyWithListSyntaxLogsWarning
()
{
MockPropertySource
propertySource
=
new
MockPropertySource
();
propertySource
.
setProperty
(
"spring.profiles[0]"
,
"a"
);
ConfigDataEnvironmentContributor
contributor
=
ConfigDataEnvironmentContributor
.
ofExisting
(
propertySource
);
InvalidConfigDataPropertyException
.
throwOrWarn
(
this
.
logger
,
contributor
);
verify
(
this
.
logger
).
warn
(
"Property 'spring.profiles[0]' is invalid and should be replaced with "
+
"'spring.config.activate.on-profile' [origin: \"spring.profiles[0]\" from property source \"mockProperties\"]"
);
}
private
static
class
TestConfigDataResource
extends
ConfigDataResource
{
@Override
...
...
spring-boot-project/spring-boot/src/test/resources/application-include-profiles-list-in-profile-specific-file-test.yml
0 → 100644
View file @
00a358b4
spring
:
profiles
:
include
:
-
p
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