spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-10 19:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source 
Closes gh-47359
This commit is contained in:
Stéphane Nicoll
2025-09-30 07:50:09 +02:00
parent 474c9cdeb1 14791f0593
commit eb307b91ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class Profiles implements Iterable<String> {
? Collections.emptySet()
: StringUtils.commaDelimitedListToSet(StringUtils.trimAllWhitespace(environmentPropertyValue));
validator.validate(environmentPropertyProfiles,
() -> "Invalid profile property value found in Envronment under '%s'".formatted(type.getName()));
() -> "Invalid profile property value found in Environment under '%s'".formatted(type.getName()));
Set<String> environmentProfiles = new LinkedHashSet<>(Arrays.asList(type.get(environment)));
BindResult<Set<String>> boundProfiles = binder.bind(type.getName(), STRING_SET, validator);
if (hasProgrammaticallySetProfiles(type, environmentPropertyValue, environmentPropertyProfiles,
core/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java
+1 -1
View File
@@ -453,7 +453,7 @@ class ProfilesTests {
environment.setProperty("spring.profiles.active", "fa!l");
Binder binder = new Binder();
assertThatIllegalStateException().isThrownBy(() -> new Profiles(environment, binder, null))
.withMessage("Invalid profile property value found in Envronment under 'spring.profiles.active'");
.withMessage("Invalid profile property value found in Environment under 'spring.profiles.active'");
}
@Test