Remove "Public" from the ResourceUrlProvider name

rstoyanchev · rstoyanchev · commit e24b876164e6 · 2014-04-25T16:49:32.000-04:00
Also respect HandlerMapping order in ResourceUrlProvider
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -77,8 +77,8 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
-import org.springframework.web.servlet.resource.PublicResourceUrlProvider;
-import org.springframework.web.servlet.resource.PublicResourceUrlProviderExposingInterceptor;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
+import org.springframework.web.servlet.resource.ResourceUrlProviderExposingInterceptor;
 import org.springframework.web.util.UrlPathHelper;
 
 /**
@@ -244,7 +244,7 @@ protected final Object[] getInterceptors() {
 			InterceptorRegistry registry = new InterceptorRegistry();
 			addInterceptors(registry);
 			registry.addInterceptor(new ConversionServiceExposingInterceptor(mvcConversionService()));
-			registry.addInterceptor(new PublicResourceUrlProviderExposingInterceptor(resourceUrlPathTranslator()));
+			registry.addInterceptor(new ResourceUrlProviderExposingInterceptor(resourceUrlPathTranslator()));
 			this.interceptors = registry.getInterceptors();
 		}
 		return this.interceptors.toArray();
@@ -358,8 +358,8 @@ protected void addResourceHandlers(ResourceHandlerRegistry registry) {
 	}
 
 	@Bean
-	public PublicResourceUrlProvider resourceUrlPathTranslator() {
-		PublicResourceUrlProvider translator = new PublicResourceUrlProvider();
+	public ResourceUrlProvider resourceUrlPathTranslator() {
+		ResourceUrlProvider translator = new ResourceUrlProvider();
 		UrlPathHelper pathHelper = getPathMatchConfigurer().getUrlPathHelper();
 		if (pathHelper != null) {
 			translator.setUrlPathHelper(pathHelper);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractResourceResolver.java
@@ -49,17 +49,17 @@ protected abstract Resource resolveResourceInternal(HttpServletRequest request,
 			List<? extends Resource> locations, ResourceResolverChain chain);
 
 	@Override
-	public String resolvePublicUrlPath(String resourceUrlPath, List<? extends Resource> locations,
+	public String resolveUrlPath(String resourceUrlPath, List<? extends Resource> locations,
 			ResourceResolverChain chain) {
 
 		if (logger.isTraceEnabled()) {
 			logger.trace("Resolving public URL for path=\"" + resourceUrlPath + "\"");
 		}
 
-		return resolvePublicUrlPathInternal(resourceUrlPath, locations, chain);
+		return resolveUrlPathInternal(resourceUrlPath, locations, chain);
 	}
 
-	protected abstract String resolvePublicUrlPathInternal(String resourceUrlPath,
+	protected abstract String resolveUrlPathInternal(String resourceUrlPath,
 			List<? extends Resource> locations, ResourceResolverChain chain);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceResolverChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceResolverChain.java
@@ -21,8 +21,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
@@ -65,13 +63,13 @@ public Resource resolveResource(HttpServletRequest request, String requestPath,
 	}
 
 	@Override
-	public String resolvePublicUrlPath(String resourcePath, List<? extends Resource> locations) {
+	public String resolveUrlPath(String resourcePath, List<? extends Resource> locations) {
 		ResourceResolver resolver = getNextResolver();
 		if (resolver == null) {
 			return null;
 		}
 		try {
-			return resolver.resolvePublicUrlPath(resourcePath, locations, this);
+			return resolver.resolveUrlPath(resourcePath, locations, this);
 		}
 		finally {
 			this.index--;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/FingerprintResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/FingerprintResourceResolver.java
@@ -23,8 +23,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.FileCopyUtils;
@@ -97,10 +95,10 @@ protected Resource resolveResourceInternal(HttpServletRequest request, String re
 	}
 
 	@Override
-	protected String resolvePublicUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
+	protected String resolveUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
 			ResourceResolverChain chain) {
 
-		String baseUrl = chain.resolvePublicUrlPath(resourceUrlPath, locations);
+		String baseUrl = chain.resolveUrlPath(resourceUrlPath, locations);
 		if (StringUtils.hasText(baseUrl)) {
 			if (logger.isTraceEnabled()) {
 				logger.trace("Getting the original resource to calculate hash");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
@@ -25,8 +25,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.Resource;
 
@@ -74,10 +72,10 @@ private boolean isGzipAccepted(HttpServletRequest request) {
 	}
 
 	@Override
-	protected String resolvePublicUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
+	protected String resolveUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
 			ResourceResolverChain chain) {
 
-		return chain.resolvePublicUrlPath(resourceUrlPath, locations);
+		return chain.resolveUrlPath(resourceUrlPath, locations);
 	}
 
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -48,7 +48,7 @@ protected Resource resolveResourceInternal(HttpServletRequest request, String re
 	}
 
 	@Override
-	protected String resolvePublicUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
+	protected String resolveUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
 			ResourceResolverChain chain) {
 
 		return (getResource(resourceUrlPath, locations) != null ? resourceUrlPath : null);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PrefixResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PrefixResourceResolver.java
@@ -16,8 +16,6 @@
 
 package org.springframework.web.servlet.resource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -63,10 +61,10 @@ protected Resource resolveResourceInternal(HttpServletRequest request, String re
 	}
 
 	@Override
-	protected String resolvePublicUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
+	protected String resolveUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,
 			ResourceResolverChain chain) {
 
-		String baseUrl = chain.resolvePublicUrlPath(resourceUrlPath, locations);
+		String baseUrl = chain.resolveUrlPath(resourceUrlPath, locations);
 		if (StringUtils.hasText(baseUrl)) {
 			return this.prefix + (baseUrl.startsWith("/") ? baseUrl : "/" + baseUrl);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolver.java
@@ -62,6 +62,6 @@ Resource resolveResource(HttpServletRequest request, String requestPath, List<?
 	 * @param chain the chain of resolvers to delegate to
 	 * @return the resolved public URL path or {@code null} if unresolved
 	 */
-	String resolvePublicUrlPath(String resourcePath, List<? extends Resource> locations, ResourceResolverChain chain);
+	String resolveUrlPath(String resourcePath, List<? extends Resource> locations, ResourceResolverChain chain);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolverChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolverChain.java
@@ -56,6 +56,6 @@ public interface ResourceResolverChain {
 	 * @param locations the locations to search in when looking up resources
 	 * @return the resolved public URL path or {@code null} if unresolved
 	 */
-	String resolvePublicUrlPath(String resourcePath, List<? extends Resource> locations);
+	String resolveUrlPath(String resourcePath, List<? extends Resource> locations);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
@@ -65,16 +65,16 @@ private ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServl
 
 		@Override
 		public String encodeURL(String url) {
-			String name = PublicResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR;
-			PublicResourceUrlProvider urlProvider = (PublicResourceUrlProvider) this.request.getAttribute(name);
+			String name = ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR;
+			ResourceUrlProvider urlProvider = (ResourceUrlProvider) this.request.getAttribute(name);
 			if (urlProvider != null) {
 				String translatedUrl = urlProvider.getForRequestUrl(this.request, url);
 				if (translatedUrl != null) {
 					return super.encodeURL(translatedUrl);
 				}
 			}
 			else {
-				logger.debug("Request attribute exposing PublicResourceUrlProvider not found under name: " + name);
+				logger.debug("Request attribute exposing ResourceUrlProvider not found under name: " + name);
 			}
 			return super.encodeURL(url);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -21,6 +21,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
 import org.springframework.util.PathMatcher;
@@ -29,7 +30,10 @@
 import org.springframework.web.util.UrlPathHelper;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -44,7 +48,7 @@
  * @author Rossen Stoyanchev
  * @since 4.1
  */
-public class PublicResourceUrlProvider implements ApplicationListener<ContextRefreshedEvent> {
+public class ResourceUrlProvider implements ApplicationListener<ContextRefreshedEvent> {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
@@ -130,10 +134,15 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 		}
 	}
 
-	protected void detectResourceHandlers(ApplicationContext applicationContext) {
+	protected void detectResourceHandlers(ApplicationContext appContext) {
+
 		logger.debug("Looking for resource handler mappings");
-		Map<String, SimpleUrlHandlerMapping> beans = applicationContext.getBeansOfType(SimpleUrlHandlerMapping.class);
-		for (SimpleUrlHandlerMapping hm : beans.values()) {
+
+		Map<String, SimpleUrlHandlerMapping> map = appContext.getBeansOfType(SimpleUrlHandlerMapping.class);
+		List<SimpleUrlHandlerMapping> handlerMappings = new ArrayList<SimpleUrlHandlerMapping>(map.values());
+		Collections.sort(handlerMappings, new OrderComparator());
+
+		for (SimpleUrlHandlerMapping hm : handlerMappings) {
 			for (String pattern : hm.getUrlMap().keySet()) {
 				Object handler = hm.getUrlMap().get(pattern);
 				if (handler instanceof ResourceHttpRequestHandler) {
@@ -207,7 +216,7 @@ public final String getForLookupPath(String lookupPath) {
 			}
 			ResourceHttpRequestHandler handler = this.handlerMap.get(pattern);
 			ResourceResolverChain chain = handler.createResourceResolverChain();
-			String resolved = chain.resolvePublicUrlPath(pathWithinMapping, handler.getLocations());
+			String resolved = chain.resolveUrlPath(pathWithinMapping, handler.getLocations());
 			if (resolved == null) {
 				throw new IllegalStateException("Failed to get public resource URL path for " + pathWithinMapping);
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProviderExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProviderExposingInterceptor.java
@@ -23,24 +23,24 @@
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * An interceptor that exposes the {@link PublicResourceUrlProvider} instance it
+ * An interceptor that exposes the {@link ResourceUrlProvider} instance it
  * is configured with as a request attribute.
  *
  * @author Rossen Stoyanchev
  * @since 4.1
  */
-public class PublicResourceUrlProviderExposingInterceptor extends HandlerInterceptorAdapter {
+public class ResourceUrlProviderExposingInterceptor extends HandlerInterceptorAdapter {
 
 	/**
-	 * Name of the request attribute that holds the {@link PublicResourceUrlProvider}.
+	 * Name of the request attribute that holds the {@link ResourceUrlProvider}.
 	 */
-	public static final String RESOURCE_URL_PROVIDER_ATTR = PublicResourceUrlProvider.class.getName().toString();
+	public static final String RESOURCE_URL_PROVIDER_ATTR = ResourceUrlProvider.class.getName().toString();
 
 
-	private final PublicResourceUrlProvider resourceUrlProvider;
+	private final ResourceUrlProvider resourceUrlProvider;
 
 
-	public PublicResourceUrlProviderExposingInterceptor(PublicResourceUrlProvider resourceUrlProvider) {
+	public ResourceUrlProviderExposingInterceptor(ResourceUrlProvider resourceUrlProvider) {
 		Assert.notNull(resourceUrlProvider, "'resourceUrlProvider' is required");
 		this.resourceUrlProvider = resourceUrlProvider;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -62,7 +62,7 @@
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import org.springframework.web.servlet.resource.PublicResourceUrlProviderExposingInterceptor;
+import org.springframework.web.servlet.resource.ResourceUrlProviderExposingInterceptor;
 
 /**
  * A test fixture with a sub-class of {@link WebMvcConfigurationSupport} that
@@ -98,7 +98,7 @@ public void handlerMappings() throws Exception {
 		assertEquals(3, chain.getInterceptors().length);
 		assertEquals(LocaleChangeInterceptor.class, chain.getInterceptors()[0].getClass());
 		assertEquals(ConversionServiceExposingInterceptor.class, chain.getInterceptors()[1].getClass());
-		assertEquals(PublicResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[2].getClass());
+		assertEquals(ResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[2].getClass());
 
 		AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping) webConfig.viewControllerHandlerMapping();
 		handlerMapping.setApplicationContext(webAppContext);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -55,7 +55,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
-import org.springframework.web.servlet.resource.PublicResourceUrlProviderExposingInterceptor;
+import org.springframework.web.servlet.resource.ResourceUrlProviderExposingInterceptor;
 
 import static org.junit.Assert.*;
 
@@ -119,7 +119,7 @@ public void beanNameHandlerMapping() throws Exception {
 		assertNotNull(chain.getInterceptors());
 		assertEquals(3, chain.getInterceptors().length);
 		assertEquals(ConversionServiceExposingInterceptor.class, chain.getInterceptors()[1].getClass());
-		assertEquals(PublicResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[2].getClass());
+		assertEquals(ResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[2].getClass());
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PrefixResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PrefixResourceResolverTests.java
@@ -59,10 +59,10 @@ public void resolveResource() {
 	}
 
 	@Test
-	public void resolvePublicUrlPath() {
+	public void resolveUrlPath() {
 		String resourceId = "/foo.css";
 		String url = this.shaPrefix + resourceId;
-		assertEquals(url, chain.resolvePublicUrlPath(resourceId, locations));
+		assertEquals(url, chain.resolveUrlPath(resourceId, locations));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java
@@ -35,11 +35,11 @@
 
 /**
  * Integration tests using {@link ResourceUrlEncodingFilter} and
- * {@link PublicResourceUrlProvider} with the latter configured in Spring MVC Java config.
+ * {@link ResourceUrlProvider} with the latter configured in Spring MVC Java config.
  *
  * @author Rossen Stoyanchev
  */
-public class PublicResourceUrlProviderJavaConfigTests {
+public class ResourceUrlProviderJavaConfigTests {
 
 	private final TestServlet servlet = new TestServlet();
 
@@ -59,10 +59,10 @@ public void setup() throws Exception {
 		ctx.register(WebConfig.class);
 		ctx.refresh();
 
-		PublicResourceUrlProvider urlProvider = ctx.getBean(PublicResourceUrlProvider.class);
+		ResourceUrlProvider urlProvider = ctx.getBean(ResourceUrlProvider.class);
 
 		this.request = new MockHttpServletRequest("GET", "/");
-		request.setAttribute(PublicResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, urlProvider);
+		request.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, urlProvider);
 	}
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
@@ -30,14 +30,14 @@
 
 
 /**
- * Unit tests for {@link org.springframework.web.servlet.resource.PublicResourceUrlProvider}.
+ * Unit tests for {@link ResourceUrlProvider}.
  *
  * @author Jeremy Grelle
  * @author Rossen Stoyanchev
  */
-public class PublicResourceUrlProviderTests {
+public class ResourceUrlProviderTests {
 
-	private PublicResourceUrlProvider translator;
+	private ResourceUrlProvider translator;
 
 	private ResourceHttpRequestHandler handler;
 
@@ -78,7 +78,7 @@ public void getFingerprintedResourceUrl() {
 	}
 
 	private void initTranslator() {
-		this.translator = new PublicResourceUrlProvider();
+		this.translator = new ResourceUrlProvider();
 		this.translator.setHandlerMap(this.handlerMap);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,17 +49,17 @@ protected abstract Resource resolveResourceInternal(HttpServletRequest request,`
`49`	`49`	`List<? extends Resource> locations, ResourceResolverChain chain);`
`50`	`50`
`51`	`51`	`@Override`
`52`		`- public String resolvePublicUrlPath(String resourceUrlPath, List<? extends Resource> locations,`
	`52`	`+ public String resolveUrlPath(String resourceUrlPath, List<? extends Resource> locations,`
`53`	`53`	`ResourceResolverChain chain) {`
`54`	`54`
`55`	`55`	`if (logger.isTraceEnabled()) {`
`56`	`56`	`logger.trace("Resolving public URL for path=\"" + resourceUrlPath + "\"");`
`57`	`57`	`}`
`58`	`58`
`59`		`- return resolvePublicUrlPathInternal(resourceUrlPath, locations, chain);`
	`59`	`+ return resolveUrlPathInternal(resourceUrlPath, locations, chain);`
`60`	`60`	`}`
`61`	`61`
`62`		`- protected abstract String resolvePublicUrlPathInternal(String resourceUrlPath,`
	`62`	`+ protected abstract String resolveUrlPathInternal(String resourceUrlPath,`
`63`	`63`	`List<? extends Resource> locations, ResourceResolverChain chain);`
`64`	`64`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@`
`25`	`25`
`26`	`26`	`import javax.servlet.http.HttpServletRequest;`
`27`	`27`
`28`		`-import org.apache.commons.logging.Log;`
`29`		`-import org.apache.commons.logging.LogFactory;`
`30`	`28`	`import org.springframework.core.io.AbstractResource;`
`31`	`29`	`import org.springframework.core.io.Resource;`
`32`	`30`
`@@ -74,10 +72,10 @@ private boolean isGzipAccepted(HttpServletRequest request) {`
`74`	`72`	`}`
`75`	`73`
`76`	`74`	`@Override`
`77`		`- protected String resolvePublicUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,`
	`75`	`+ protected String resolveUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,`
`78`	`76`	`ResourceResolverChain chain) {`
`79`	`77`
`80`		`- return chain.resolvePublicUrlPath(resourceUrlPath, locations);`
	`78`	`+ return chain.resolveUrlPath(resourceUrlPath, locations);`
`81`	`79`	`}`
`82`	`80`
`83`	`81`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected Resource resolveResourceInternal(HttpServletRequest request, String re`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- protected String resolvePublicUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,`
	`51`	`+ protected String resolveUrlPathInternal(String resourceUrlPath, List<? extends Resource> locations,`
`52`	`52`	`ResourceResolverChain chain) {`
`53`	`53`
`54`	`54`	`return (getResource(resourceUrlPath, locations) != null ? resourceUrlPath : null);`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ Resource resolveResource(HttpServletRequest request, String requestPath, List<?`
`62`	`62`	`* @param chain the chain of resolvers to delegate to`
`63`	`63`	`* @return the resolved public URL path or {@code null} if unresolved`
`64`	`64`	`*/`
`65`		`- String resolvePublicUrlPath(String resourcePath, List<? extends Resource> locations, ResourceResolverChain chain);`
	`65`	`+ String resolveUrlPath(String resourcePath, List<? extends Resource> locations, ResourceResolverChain chain);`
`66`	`66`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ public interface ResourceResolverChain {`
`56`	`56`	`* @param locations the locations to search in when looking up resources`
`57`	`57`	`* @return the resolved public URL path or {@code null} if unresolved`
`58`	`58`	`*/`
`59`		`- String resolvePublicUrlPath(String resourcePath, List<? extends Resource> locations);`
	`59`	`+ String resolveUrlPath(String resourcePath, List<? extends Resource> locations);`
`60`	`60`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,16 +65,16 @@ private ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServl`
`65`	`65`
`66`	`66`	`@Override`
`67`	`67`	`public String encodeURL(String url) {`
`68`		`- String name = PublicResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR;`
`69`		`- PublicResourceUrlProvider urlProvider = (PublicResourceUrlProvider) this.request.getAttribute(name);`
	`68`	`+ String name = ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR;`
	`69`	`+ ResourceUrlProvider urlProvider = (ResourceUrlProvider) this.request.getAttribute(name);`
`70`	`70`	`if (urlProvider != null) {`
`71`	`71`	`String translatedUrl = urlProvider.getForRequestUrl(this.request, url);`
`72`	`72`	`if (translatedUrl != null) {`
`73`	`73`	`return super.encodeURL(translatedUrl);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`else {`
`77`		`- logger.debug("Request attribute exposing PublicResourceUrlProvider not found under name: " + name);`
	`77`	`+ logger.debug("Request attribute exposing ResourceUrlProvider not found under name: " + name);`
`78`	`78`	`}`
`79`	`79`	`return super.encodeURL(url);`
`80`	`80`	`}`