root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2015-05-29 23:42:14 -07:00
parent 18d7634947
commit a0087170e0
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
View File

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

2
spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java vendored
View File

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

1
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

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