Formatting

pull/2035/head
Phillip Webb 10 years ago
parent d6165d97dd
commit 468db03aef

@ -75,8 +75,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
}
if (context.getResourceLoader() instanceof WebApplicationContext) {
return ConditionOutcome
.match("found web application WebApplicationContext");
return ConditionOutcome.match("found web application WebApplicationContext");
}
return ConditionOutcome.noMatch("not a web application");

@ -107,7 +107,8 @@ public class PropertySourcesPropertyValues implements PropertyValues {
PropertySourcesPropertyResolver resolver, String[] includes, String[] exacts) {
if (source.getPropertyNames().length > 0) {
for (String propertyName : source.getPropertyNames()) {
if (PropertySourcesPropertyValues.NON_ENUMERABLE_ENUMERABLES.contains(source.getName())
if (PropertySourcesPropertyValues.NON_ENUMERABLE_ENUMERABLES
.contains(source.getName())
&& !PatternMatchUtils.simpleMatch(includes, propertyName)) {
continue;
}

Loading…
Cancel
Save