Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow recursive profile group references #24327

Closed
wants to merge 3 commits into from
Closed

Allow recursive profile group references #24327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
008ccd4
Ignore recursive reference in profile groups
dreis2211 Dec 3, 2020
3f98fc0
Ignore already expanded profiles
dreis2211 Dec 4, 2020
3c39d0d
Throw exception when profile conflict is detected
dreis2211 Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...t-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
View file
Open in desktop
Expand Up @@ -117,7 +117,9 @@ private List<String> expandProfiles(List<String> profiles) {
while (!stack.isEmpty()) {
String current = stack.pop();
expandedProfiles.add(current);
asReversedList(this.groups.get(current)).forEach(stack::push);
List<String> groupProfiles = asReversedList(this.groups.get(current));
groupProfiles.remove(current);
groupProfiles.forEach(stack::push);
}
return asUniqueItemList(StringUtils.toStringArray(expandedProfiles));
}
Expand All @@ -128,7 +130,7 @@ private List<String> asReversedList(List<String> list) {
}
List<String> reversed = new ArrayList<>(list);
Collections.reverse(reversed);
return Collections.unmodifiableList(reversed);
return reversed;
Copy link
Contributor Author

@dreis2211 dreis2211 Dec 3, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, we could do a stream/filter approach, but the unmodifiable list seemed not needed as the result is only used above and cannot be modified from the outside.

}

private List<String> asUniqueItemList(String[] array) {
Expand Down
11 changes: 11 additions & 0 deletions ...ject/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java
View file
Open in desktop
Expand Up @@ -359,4 +359,15 @@ void isAcceptedWhenNoActiveAndDefaultWithGroupsContainsProfileReturnsTrue() {
assertThat(profiles.isAccepted("x")).isTrue();
}

@Test
void recursiveReferenceInProfileGroupIsIgnored() {
MockEnvironment environment = new MockEnvironment();
environment.setProperty("spring.profiles.active", "a,b,c");
environment.setProperty("spring.profiles.group.a", "a,e,f");
environment.setProperty("spring.profiles.group.e", "x,y");
Binder binder = Binder.get(environment);
Profiles profiles = new Profiles(environment, binder, null);
assertThat(profiles).containsExactly("a", "e", "x", "y", "f", "b", "c");
}

}