From 468db03aef0f3f2c18f2faff2de5cad22c796fbb Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 19 Sep 2014 22:41:10 -0700 Subject: [PATCH] Formatting --- .../autoconfigure/condition/OnWebApplicationCondition.java | 3 +-- .../boot/bind/PropertySourcesPropertyValues.java | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java index 0224181ab60..8724889b922 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java @@ -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"); diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java index d7e874d66ac..13ee4434c21 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java @@ -51,7 +51,7 @@ public class PropertySourcesPropertyValues implements PropertyValues { private static final Collection NON_ENUMERABLE_ENUMERABLES = Arrays.asList( StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME); - + /** * Create a new PropertyValues from the given PropertySources * @param propertySources a PropertySources instance @@ -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; }