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

Remove "Public" from the ResourceUrlProvider name

Browse Source 
Also respect HandlerMapping order in ResourceUrlProvider
This commit is contained in:
Rossen Stoyanchev
2014-04-25 16:00:53 -04:00
parent 70fd33236f
commit e24b876164
17 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
View File

@@ -62,7 +62,7 @@ import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
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 class WebMvcConfigurationSupportExtensionTests {
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);

4
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
View File

@@ -55,7 +55,7 @@ import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBui
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 class WebMvcConfigurationSupportTests {
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

4
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PrefixResourceResolverTests.java
View File

@@ -59,10 +59,10 @@ public class PrefixResourceResolverTests {
}
@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)

8
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PublicResourceUrlProviderJavaConfigTests.java → spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java
View File

@@ -35,11 +35,11 @@ import static org.junit.Assert.*;
/**
* 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 class PublicResourceUrlProviderJavaConfigTests {
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);
}

8
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PublicResourceUrlProviderTests.java → spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
View File

@@ -30,14 +30,14 @@ import static org.junit.Assert.*;
/**
* 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 class PublicResourceUrlProviderTests {
}
private void initTranslator() {
this.translator = new PublicResourceUrlProvider();
this.translator = new ResourceUrlProvider();
this.translator.setHandlerMap(this.handlerMap);
}