Skip to content

was returning found anytime negated profile was not found, even if th… #5747

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

was returning found anytime negated profile was not found, even if th… #5747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36c7105
was returning found anytime negated profile was not found, even if th…
mbenson Apr 20, 2016
a0b5aa8
checkstyle
mbenson Apr 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public MatchStatus matches(Properties properties) {
if (StringUtils.hasLength(negative)) {
properties = new Properties(properties);
properties.setProperty(SPRING_PROFILES, negative);
switch (activeProfilesMatcher.matches(properties)) {
case FOUND:
if (activeProfilesMatcher.matches(properties) == MatchStatus.FOUND) {
return MatchStatus.NOT_FOUND;
case NOT_FOUND:
}
if (StringUtils.isEmpty(positive)) {
return MatchStatus.FOUND;
}
properties.setProperty(SPRING_PROFILES, positive);
Expand Down
6 changes: 4 additions & 2 deletions ...g-boot/src/test/java/org/springframework/boot/yaml/SpringProfileDocumentMatcherTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ public void testInverseMatchMulti() throws IOException {
@Test
public void negatedAndNonNegated() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar", "blah");
Properties properties = getProperties("spring.profiles: !baz,blah");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.FOUND);
Properties expectFound = getProperties("spring.profiles: !baz,blah");
assertThat(matcher.matches(expectFound)).isEqualTo(MatchStatus.FOUND);
Properties expectNotFound = getProperties("spring.profiles: !baz,another");
assertThat(matcher.matches(expectNotFound)).isEqualTo(MatchStatus.NOT_FOUND);
}

@Test
Expand Down