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

Rename spring.favicon.enabled property

Browse Source 
Rename `spring.favicon.enabled` to `spring.mvc.favicon.enabled`.

See gh-2377
This commit is contained in:
Phillip Webb
2015-02-25 11:36:28 -08:00
parent 0a4daf0d7e
commit f7221be7c9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
View File

@@ -288,7 +288,7 @@ public class WebMvcAutoConfiguration {
}
@Configuration
@ConditionalOnProperty(value = "spring.favicon.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.mvc.favicon.enabled", matchIfMissing = true)
public static class FaviconConfiguration implements ResourceLoaderAware {
private ResourceLoader resourceLoader;

3
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
View File

@@ -374,7 +374,8 @@ public class WebMvcAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
EnvironmentTestUtils.addEnvironment(this.context, "spring.favicon.enabled:false");
EnvironmentTestUtils.addEnvironment(this.context,
"spring.mvc.favicon.enabled:false");
this.context.refresh();
assertThat(
this.context.getBeansOfType(ResourceHttpRequestHandler.class).get(