root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into main 

Closes gh-26610
This commit is contained in:
Madhura Bhave 2021-05-19 13:21:39 -07:00
parent 8a3f835ffe 80610fa250
commit 110c36e607
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
View File

@ -148,15 +148,16 @@ public class Profiles implements Iterable<String> {
return reversed; return reversed;
} }
private List<String> asUniqueItemList(Collection<String> strings) { private List<String> asUniqueItemList(Collection<String> profiles) {
return asUniqueItemList(strings, null); return asUniqueItemList(profiles, null);
} }
private List<String> asUniqueItemList(Collection<String> strings, Collection<String> additional) { private List<String> asUniqueItemList(Collection<String> profiles, Collection<String> additional) {
LinkedHashSet<String> uniqueItems = new LinkedHashSet<>(strings); LinkedHashSet<String> uniqueItems = new LinkedHashSet<>();
if (!CollectionUtils.isEmpty(additional)) { if (!CollectionUtils.isEmpty(additional)) {
uniqueItems.addAll(additional); uniqueItems.addAll(additional);
} }
uniqueItems.addAll(profiles);
return Collections.unmodifiableList(new ArrayList<>(uniqueItems)); return Collections.unmodifiableList(new ArrayList<>(uniqueItems));
} }

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@ -592,15 +592,14 @@ class SpringApplicationTests {
} }
@Test @Test
void addProfilesOrder() { void additionalProfilesOrderedBeforeActiveProfiles() {
SpringApplication application = new SpringApplication(ExampleConfig.class); SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setWebApplicationType(WebApplicationType.NONE); application.setWebApplicationType(WebApplicationType.NONE);
application.setAdditionalProfiles("foo"); application.setAdditionalProfiles("foo");
ConfigurableEnvironment environment = new StandardEnvironment(); ConfigurableEnvironment environment = new StandardEnvironment();
application.setEnvironment(environment); application.setEnvironment(environment);
this.context = application.run("--spring.profiles.active=bar,spam"); this.context = application.run("--spring.profiles.active=bar,spam");
// Since Boot 2.4 additional should always be last assertThat(environment.getActiveProfiles()).containsExactly("foo", "bar", "spam");
assertThat(environment.getActiveProfiles()).containsExactly("bar", "spam", "foo");
} }
@Test @Test

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View File

@ -308,7 +308,7 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
void runWhenProfilesPresentBeforeConfigFileProcessingAugmentsProfileActivatedByConfigFile() { void runWhenProfilesPresentBeforeConfigFileProcessingAugmentsProfileActivatedByConfigFile() {
this.application.setAdditionalProfiles("other"); this.application.setAdditionalProfiles("other");
ConfigurableApplicationContext context = this.application.run("--spring.config.name=enableprofile"); ConfigurableApplicationContext context = this.application.run("--spring.config.name=enableprofile");
assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("myprofile", "other"); assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("other", "myprofile");
String property = context.getEnvironment().getProperty("other.property"); String property = context.getEnvironment().getProperty("other.property");
assertThat(property).isEqualTo("fromotherpropertiesfile"); assertThat(property).isEqualTo("fromotherpropertiesfile");
property = context.getEnvironment().getProperty("the.property"); property = context.getEnvironment().getProperty("the.property");

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java
View File

@ -143,9 +143,9 @@ class ProfilesTests {
@Test @Test
void getActiveWhenHasAdditionalIncludesAdditional() { void getActiveWhenHasAdditionalIncludesAdditional() {
MockEnvironment environment = new MockEnvironment(); MockEnvironment environment = new MockEnvironment();
environment.setProperty("spring.profiles.active", "a,b,c"); environment.setProperty("spring.profiles.active", "d,e,f");
Binder binder = Binder.get(environment); Binder binder = Binder.get(environment);
Profiles profiles = new Profiles(environment, binder, Arrays.asList("d", "e", "f")); Profiles profiles = new Profiles(environment, binder, Arrays.asList("a", "b", "c"));
assertThat(profiles.getActive()).containsExactly("a", "b", "c", "d", "e", "f"); assertThat(profiles.getActive()).containsExactly("a", "b", "c", "d", "e", "f");
} }