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

Use static-locations properties to locate favicon 

Closes gh-5751
This commit is contained in:
Venil Noronha 2016-04-25 05:27:53 +05:30 committed by Stephane Nicoll
parent 247685e992
commit d5554e0aa1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@ -33,6 +33,7 @@ import org.springframework.core.io.ResourceLoader;
* @author Phillip Webb
* @author Brian Clozel
* @author Dave Syer
* @author Venil Noronha
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.resources", ignoreUnknownFields = false)
@ -117,10 +118,9 @@ public class ResourceProperties implements ResourceLoaderAware {
}
List<Resource> getFaviconLocations() {
List<Resource> locations = new ArrayList<Resource>(
CLASSPATH_RESOURCE_LOCATIONS.length + 1);
List<Resource> locations = new ArrayList<Resource>(staticLocations.length + 1);
if (this.resourceLoader != null) {
for (String location : CLASSPATH_RESOURCE_LOCATIONS) {
for (String location : staticLocations) {
locations.add(this.resourceLoader.getResource(location));
}
}

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

@ -412,7 +412,7 @@ public class WebMvcAutoConfigurationTests {
assertThat(this.context.getBeansOfType(SimpleUrlHandlerMapping.class)
.get("faviconHandlerMapping"), is(notNullValue()));
Map<String, List<Resource>> mappingLocations = getFaviconMappingLocations();
assertThat(mappingLocations.get("/**/favicon.ico").size(), equalTo(5));
assertThat(mappingLocations.get("/**/favicon.ico").size(), equalTo(6));
}
@Test