Skip to content

S
spring-boot
Commit a39d351e authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Polish profile negation in YAML sub-documents 

Closes gh-4953
parent bd010494
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 102 deletions
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @ a39d351e
......@@ -678,10 +678,11 @@ profile, and it would have to be explicitly reset in all other profiles as neces
password: weak
----
Spring profiles designated using the "spring.profiles" element may optionally be
negated using the {@code !} character. If both negated and non-negated profiles
are specified for a single document, at least one non-negated profile must match
and no negated profiles may match.
Spring profiles designated using the "spring.profiles" element may optionally be negated
using the {@code !} character. If both negated and non-negated profiles are specified for
a single document, at least one non-negated profile must match and no negated profiles
may match.
[[boot-features-external-config-yaml-shortcomings]]
......
spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
View file @ a39d351e
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -18,12 +18,8 @@ package org.springframework.boot.yaml;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.springframework.beans.factory.config.YamlProcessor.DocumentMatcher;
import org.springframework.beans.factory.config.YamlProcessor.MatchStatus;
......@@ -39,10 +35,12 @@ import org.springframework.util.StringUtils;
*
* @author Dave Syer
* @author Matt Benson
* @author Phillip Webb
*/
public class SpringProfileDocumentMatcher implements DocumentMatcher {
private static final String[] DEFAULT_PROFILES = new String[] { "^\\s*$" };
private static final String SPRING_PROFILES = "spring.profiles";
private String[] activeProfiles = new String[0];
......@@ -63,62 +61,52 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
@Override
public MatchStatus matches(Properties properties) {
String[] profiles = this.activeProfiles;
if (profiles.length == 0) {
profiles = DEFAULT_PROFILES;
}
ArrayDocumentMatcher next = new ArrayDocumentMatcher(SPRING_PROFILES, profiles);
if (properties.containsKey(SPRING_PROFILES)) {
DocumentMatcher activeProfilesMatcher = getActiveProfilesDocumentMatcher();
String profiles = properties.getProperty(SPRING_PROFILES);
String negative = extractProfiles(profiles, ProfileType.NEGATIVE);
String positive = extractProfiles(profiles, ProfileType.POSITIVE);
if (StringUtils.hasLength(negative)) {
properties = new Properties(properties);
Map<Boolean, String> sortedProfiles = sortProfiles(
properties.getProperty(SPRING_PROFILES));
// handle negated profiles:
if (sortedProfiles.containsKey(Boolean.FALSE)) {
properties.setProperty(SPRING_PROFILES,
sortedProfiles.get(Boolean.FALSE));
MatchStatus matchStatus = next.matches(properties);
switch (matchStatus) {
properties.setProperty(SPRING_PROFILES, negative);
switch (activeProfilesMatcher.matches(properties)) {
case FOUND:
return MatchStatus.NOT_FOUND;
case NOT_FOUND:
return MatchStatus.FOUND;
default:
break;
}
}
properties.setProperty(SPRING_PROFILES, sortedProfiles.get(Boolean.TRUE));
properties.setProperty(SPRING_PROFILES, positive);
}
return next.matches(properties);
return activeProfilesMatcher.matches(properties);
}
private Map<Boolean, String> sortProfiles(String value) {
if (value.indexOf('!') >= 0) {
Set<String> positive = new HashSet<String>();
Set<String> negative = new HashSet<String>();
for (String s : StringUtils.commaDelimitedListToSet(value)) {
if (s.charAt(0) == '!') {
negative.add(s.substring(1));
private DocumentMatcher getActiveProfilesDocumentMatcher() {
String[] profiles = this.activeProfiles;
if (profiles.length == 0) {
profiles = DEFAULT_PROFILES;
}
return new ArrayDocumentMatcher(SPRING_PROFILES, profiles);
}
else {
positive.add(s);
private String extractProfiles(String profiles, ProfileType type) {
if (profiles == null) {
return null;
}
StringBuilder result = new StringBuilder();
for (String candidate : StringUtils.commaDelimitedListToSet(profiles)) {
ProfileType candidateType = ProfileType.POSITIVE;
if (candidate.startsWith("!")) {
candidateType = ProfileType.NEGATIVE;
}
if (!negative.isEmpty()) {
Map<Boolean, String> result = new HashMap<Boolean, String>();
result.put(Boolean.FALSE,
StringUtils.collectionToCommaDelimitedString(negative));
if (!positive.isEmpty()) {
result.put(Boolean.TRUE,
StringUtils.collectionToCommaDelimitedString(positive));
if (candidateType == type) {
result.append(result.length() > 0 ? "," : "");
result.append(candidate.substring(type == ProfileType.POSITIVE ? 0 : 1));
}
return result;
}
return result.toString();
}
return Collections.singletonMap(Boolean.TRUE, value);
enum ProfileType {
POSITIVE, NEGATIVE
}
}
spring-boot/src/test/java/org/springframework/boot/yaml/SpringProfileDocumentMatcherTests.java
View file @ a39d351e
......@@ -19,13 +19,15 @@ package org.springframework.boot.yaml;
import java.io.IOException;
import java.util.Properties;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.config.YamlProcessor.DocumentMatcher;
import org.springframework.beans.factory.config.YamlProcessor.MatchStatus;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link SpringProfileDocumentMatcher}.
*
......@@ -34,79 +36,71 @@ import org.springframework.core.io.support.PropertiesLoaderUtils;
public class SpringProfileDocumentMatcherTests {
@Test
public void testMatchesSingleProfile() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar");
Assert.assertSame(MatchStatus.FOUND,
matcher.matches(getProperties("spring.profiles: foo")));
public void matchesSingleProfile() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar");
Properties properties = getProperties("spring.profiles: foo");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.FOUND);
}
@Test
public void testAbstainNoConfiguredProfiles() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar");
Assert.assertSame(MatchStatus.ABSTAIN,
matcher.matches(getProperties("some.property: spam")));
public void abstainNoConfiguredProfiles() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar");
Properties properties = getProperties("some.property: spam");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.ABSTAIN);
}
@Test
public void testNoActiveProfiles() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher();
Assert.assertSame(MatchStatus.NOT_FOUND,
matcher.matches(getProperties("spring.profiles: bar,spam")));
public void noActiveProfiles() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher();
Properties properties = getProperties("spring.profiles: bar,spam");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.NOT_FOUND);
}
@Test
public void testMatchesCommaSeparatedArray() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar");
Assert.assertSame(MatchStatus.FOUND,
matcher.matches(getProperties("spring.profiles: bar,spam")));
public void matchesCommaSeparatedArray() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar");
Properties properties = getProperties("spring.profiles: bar,spam");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.FOUND);
}
@Test
public void testNoMatchingProfiles() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar");
Assert.assertSame(MatchStatus.NOT_FOUND,
matcher.matches(getProperties("spring.profiles: baz,blah")));
public void noMatchingProfiles() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar");
Properties properties = getProperties("spring.profiles: baz,blah");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.NOT_FOUND);
}
@Test
public void testInverseMatchSingle() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar");
Assert.assertSame(MatchStatus.FOUND,
matcher.matches(getProperties("spring.profiles: !baz")));
public void inverseMatchSingle() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar");
Properties properties = getProperties("spring.profiles: !baz");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.FOUND);
}
@Test
public void testInverseMatchMulti() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar");
Assert.assertSame(MatchStatus.FOUND,
matcher.matches(getProperties("spring.profiles: !baz,!blah")));
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar");
Properties properties = getProperties("spring.profiles: !baz,!blah");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.FOUND);
}
@Test
public void testNegatedAndNonNegated() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"bar", "blah");
Assert.assertSame(MatchStatus.FOUND,
matcher.matches(getProperties("spring.profiles: !baz,blah")));
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);
}
@Test
public void testNegatedTrumpsMatching() throws IOException {
SpringProfileDocumentMatcher matcher = new SpringProfileDocumentMatcher("foo",
"baz", "blah");
Assert.assertSame(MatchStatus.NOT_FOUND,
matcher.matches(getProperties("spring.profiles: !baz,blah")));
public void negatedTrumpsMatching() throws IOException {
DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "baz", "blah");
Properties properties = getProperties("spring.profiles: !baz,blah");
assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.NOT_FOUND);
}
private Properties getProperties(String values) throws IOException {
return PropertiesLoaderUtils
.loadProperties(new ByteArrayResource(values.getBytes()));
ByteArrayResource resource = new ByteArrayResource(values.getBytes());
return PropertiesLoaderUtils.loadProperties(resource);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment