Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@@ -87,7 +87,7 @@ public class ThymeleafAutoConfiguration {
 		}
 
 		@Bean
-		public ITemplateResolver defaultTemplateResolver() {
+		public TemplateResolver defaultTemplateResolver() {
 			TemplateResolver resolver = new TemplateResolver();
 			resolver.setResourceResolver(thymeleafResourceResolver());
 			resolver.setPrefix(this.properties.getPrefix());

spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java

@@ -54,8 +54,6 @@ import org.springframework.util.StringUtils;
  */
 class BeanDefinitionLoader {
 
-	private static final ResourceLoader DEFAULT_RESOURCE_LOADER = new PathMatchingResourcePatternResolver();
-
 	private final Object[] sources;
 
 	private final AnnotatedBeanDefinitionReader annotatedReader;
@@ -228,8 +226,8 @@ class BeanDefinitionLoader {
 	}
 
 	private Resource[] findResources(String source) {
-		ResourceLoader loader = this.resourceLoader != null ? this.resourceLoader
-				: DEFAULT_RESOURCE_LOADER;
+		ResourceLoader loader = (this.resourceLoader != null ? this.resourceLoader
+				: new PathMatchingResourcePatternResolver());
 		try {
 			if (loader instanceof ResourcePatternResolver) {
 				return ((ResourcePatternResolver) loader).getResources(source);

spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java

@@ -62,7 +62,7 @@ public class PropertySourcesLoader {
 		Assert.notNull(propertySources, "PropertySources must not be null");
 		this.propertySources = propertySources;
 		this.loaders = SpringFactoriesLoader.loadFactories(PropertySourceLoader.class,
-				null);
+				getClass().getClassLoader());
 	}
 
 	/**

spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@@ -767,4 +767,5 @@ public class SpringApplicationTests {
 		}
 
 	}
+
 }