Adjust logging of resource locations

Author: rstoyanchev

spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java

@@ -304,11 +304,6 @@ public void setUseLastModified(boolean useLastModified) {
 	public void afterPropertiesSet() throws Exception {
 		resolveResourceLocations();
 
-		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(getLocations())) {
-			logger.warn("Locations list is empty. No resources will be served unless a " +
-					"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
-		}
-
 		if (this.resourceResolvers.isEmpty()) {
 			this.resourceResolvers.add(new PathResourceResolver());
 		}
@@ -341,6 +336,12 @@ private void resolveResourceLocations() {
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
+
+		if (logger.isInfoEnabled()) {
+			logger.info(!this.locationsToUse.isEmpty() ?
+					"Locations in use: " + locationToString(this.locationsToUse) :
+					"0 locations in use.");
+		}
 	}
 
 	/**
@@ -350,10 +351,6 @@ private void resolveResourceLocations() {
 	 */
 	protected void initAllowedLocations() {
 		if (CollectionUtils.isEmpty(getLocations())) {
-			if (logger.isInfoEnabled()) {
-				logger.info("Locations list is empty. No resources will be served unless a " +
-						"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
-			}
 			return;
 		}
 		for (int i = getResourceResolvers().size() - 1; i >= 0; i--) {
@@ -621,18 +618,13 @@ protected void setHeaders(ServerWebExchange exchange, Resource resource, @Nullab
 
 	@Override
 	public String toString() {
-		return "ResourceWebHandler " + formatLocations();
+		return "ResourceWebHandler " + locationToString(getLocations());
 	}
 
-	private Object formatLocations() {
-		if (!this.locationValues.isEmpty()) {
-			return this.locationValues.stream().collect(Collectors.joining("\", \"", "[\"", "\"]"));
-		}
-		if (!getLocations().isEmpty()) {
-			return "[" + getLocations().toString()
-					.replaceAll("class path resource", "Classpath")
-					.replaceAll("ServletContext resource", "ServletContext") + "]";
-		}
-		return Collections.emptyList();
+	private String locationToString(List<Resource> locations) {
+		return locations.toString()
+				.replaceAll("class path resource", "classpath")
+				.replaceAll("ServletContext resource", "ServletContext");
 	}
+
 }

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java

@@ -392,11 +392,6 @@ public void setUseLastModified(boolean useLastModified) {
 	public void afterPropertiesSet() throws Exception {
 		resolveResourceLocations();
 
-		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(getLocations())) {
-			logger.warn("Locations list is empty. No resources will be served unless a " +
-					"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
-		}
-
 		if (this.resourceResolvers.isEmpty()) {
 			this.resourceResolvers.add(new PathResourceResolver());
 		}
@@ -472,6 +467,12 @@ private void resolveResourceLocations() {
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
+
+		if (logger.isInfoEnabled()) {
+			logger.info(!this.locationsToUse.isEmpty() ?
+					"Locations in use: " + locationToString(this.locationsToUse) :
+					"0 locations in use.");
+		}
 	}
 
 	/**
@@ -810,10 +811,13 @@ protected void setHeaders(HttpServletResponse response, Resource resource, @Null
 
 	@Override
 	public String toString() {
-		return "ResourceHttpRequestHandler " +
-				getLocations().toString()
-						.replaceAll("class path resource", "Classpath")
-						.replaceAll("ServletContext resource", "ServletContext");
+		return "ResourceHttpRequestHandler " + locationToString(getLocations());
+	}
+
+	private String locationToString(List<Resource> locations) {
+		return locations.toString()
+				.replaceAll("class path resource", "classpath")
+				.replaceAll("ServletContext resource", "ServletContext");
 	}
 
 }