Commit cf88508e authored by Stephane Nicoll's avatar Stephane Nicoll

Avoid exposing `spring.resources.favicon-locations` as a property

Closes gh-9214
parent d7ba7ecc
...@@ -117,7 +117,7 @@ public class ResourceProperties implements ResourceLoaderAware { ...@@ -117,7 +117,7 @@ public class ResourceProperties implements ResourceLoaderAware {
return result; return result;
} }
public List<Resource> getFaviconLocations() { public List<Resource> resolveFaviconLocations() {
List<Resource> locations = new ArrayList<>(this.staticLocations.length + 1); List<Resource> locations = new ArrayList<>(this.staticLocations.length + 1);
if (this.resourceLoader != null) { if (this.resourceLoader != null) {
for (String location : this.staticLocations) { for (String location : this.staticLocations) {
......
...@@ -351,7 +351,7 @@ public class WebMvcAutoConfiguration { ...@@ -351,7 +351,7 @@ public class WebMvcAutoConfiguration {
public ResourceHttpRequestHandler faviconRequestHandler() { public ResourceHttpRequestHandler faviconRequestHandler() {
ResourceHttpRequestHandler requestHandler = new ResourceHttpRequestHandler(); ResourceHttpRequestHandler requestHandler = new ResourceHttpRequestHandler();
requestHandler requestHandler
.setLocations(this.resourceProperties.getFaviconLocations()); .setLocations(this.resourceProperties.resolveFaviconLocations());
return requestHandler; return requestHandler;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment