Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct code example for YamlProcessor.setDocumentMatchers

Browse Source 
Issue: SPR-16849
This commit is contained in:
Juergen Hoeller
2018-06-06 21:27:00 +02:00
parent bfcc1a1f6a
commit 7ece0e219e
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
View File

@@ -75,15 +75,16 @@ public abstract class YamlProcessor {
* name: My Cool App * name: My Cool App
* </pre> * </pre>
* when mapped with * when mapped with
* <code>documentMatchers = YamlProcessor.mapMatcher({"environment": "prod"})</code> * <pre class="code">
* setDocumentMatchers(properties ->
* ("prod".equals(properties.getProperty("environment")) ? MatchStatus.FOUND : MatchStatus.NOT_FOUND));
* </pre>
* would end up as * would end up as
* <pre class="code"> * <pre class="code">
* environment=prod * environment=prod
* url=http://foo.bar.com * url=http://foo.bar.com
* name=My Cool App * name=My Cool App
* url=http://dev.bar.com
* </pre> * </pre>
* @param matchers a map of keys to value patterns (regular expressions)
*/ */
public void setDocumentMatchers(DocumentMatcher... matchers) { public void setDocumentMatchers(DocumentMatcher... matchers) {
this.documentMatchers = Arrays.asList(matchers); this.documentMatchers = Arrays.asList(matchers);
@@ -92,8 +93,7 @@ public abstract class YamlProcessor {
/** /**
* Flag indicating that a document for which all the * Flag indicating that a document for which all the
* {@link #setDocumentMatchers(DocumentMatcher...) document matchers} abstain will * {@link #setDocumentMatchers(DocumentMatcher...) document matchers} abstain will
* nevertheless match. * nevertheless match. Default is {@code true}.
* @param matchDefault the flag to set (default true)
*/ */
public void setMatchDefault(boolean matchDefault) { public void setMatchDefault(boolean matchDefault) {
this.matchDefault = matchDefault; this.matchDefault = matchDefault;
@@ -102,9 +102,7 @@ public abstract class YamlProcessor {
/** /**
* Method to use for resolving resources. Each resource will be converted to a Map, * Method to use for resolving resources. Each resource will be converted to a Map,
* so this property is used to decide which map entries to keep in the final output * so this property is used to decide which map entries to keep in the final output
* from this factory. * from this factory. Default is {@link ResolutionMethod#OVERRIDE}.
* @param resolutionMethod the resolution method to set (defaults to
* {@link ResolutionMethod#OVERRIDE}).
*/ */
public void setResolutionMethod(ResolutionMethod resolutionMethod) { public void setResolutionMethod(ResolutionMethod resolutionMethod) {
Assert.notNull(resolutionMethod, "ResolutionMethod must not be null"); Assert.notNull(resolutionMethod, "ResolutionMethod must not be null");

6
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java
View File

@@ -107,7 +107,7 @@ public class YamlPropertiesFactoryBeanTests {
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
factory.setResources(new ByteArrayResource( factory.setResources(new ByteArrayResource(
"foo: bar\nspam: baz\n---\nfoo: bag\nspam: bad".getBytes())); "foo: bar\nspam: baz\n---\nfoo: bag\nspam: bad".getBytes()));
factory.setDocumentMatchers((DocumentMatcher) properties -> ("bag".equals(properties.getProperty("foo")) ? factory.setDocumentMatchers(properties -> ("bag".equals(properties.getProperty("foo")) ?
MatchStatus.FOUND : MatchStatus.NOT_FOUND)); MatchStatus.FOUND : MatchStatus.NOT_FOUND));
Properties properties = factory.getObject(); Properties properties = factory.getObject();
assertThat(properties.getProperty("foo"), equalTo("bag")); assertThat(properties.getProperty("foo"), equalTo("bag"));
@@ -120,7 +120,7 @@ public class YamlPropertiesFactoryBeanTests {
factory.setMatchDefault(true); factory.setMatchDefault(true);
factory.setResources(new ByteArrayResource( factory.setResources(new ByteArrayResource(
"one: two\n---\nfoo: bar\nspam: baz\n---\nfoo: bag\nspam: bad".getBytes())); "one: two\n---\nfoo: bar\nspam: baz\n---\nfoo: bag\nspam: bad".getBytes()));
factory.setDocumentMatchers((DocumentMatcher) properties -> { factory.setDocumentMatchers(properties -> {
if (!properties.containsKey("foo")) { if (!properties.containsKey("foo")) {
return MatchStatus.ABSTAIN; return MatchStatus.ABSTAIN;
} }
@@ -161,7 +161,7 @@ public class YamlPropertiesFactoryBeanTests {
factory.setMatchDefault(true); factory.setMatchDefault(true);
factory.setResources(new ByteArrayResource( factory.setResources(new ByteArrayResource(
"one: two\n---\nfoo: bag\nspam: bad\n---\nfoo: bar\nspam: baz".getBytes())); "one: two\n---\nfoo: bag\nspam: bad\n---\nfoo: bar\nspam: baz".getBytes()));
factory.setDocumentMatchers((DocumentMatcher) properties -> { factory.setDocumentMatchers(properties -> {
if (!properties.containsKey("foo")) { if (!properties.containsKey("foo")) {
return MatchStatus.ABSTAIN; return MatchStatus.ABSTAIN;
} }