Revert "Update Spring MVC Java config for ResourceResolvers"

This reverts commit f8e1f06d08.

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java

@@ -16,12 +16,11 @@
 
 package org.springframework.web.servlet.config.annotation;
 
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Mockito;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
@@ -29,10 +28,6 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
-import org.springframework.web.servlet.resource.ResourceResolver;
-import org.springframework.web.servlet.resource.ResourceTransformer;
-
-import static org.junit.Assert.*;
 
 /**
  * Test fixture with a {@link ResourceHandlerRegistry}.
@@ -89,29 +84,6 @@ public class ResourceHandlerRegistryTests {
 		assertEquals(0, registry.getHandlerMapping().getOrder());
 	}
 
-	@Test
-	public void hasMappingForPattern() {
-		assertTrue(registry.hasMappingForPattern("/resources/**"));
-		assertFalse(registry.hasMappingForPattern("/whatever"));
-	}
-
-	@Test
-	public void resourceResolversAndTransformers() {
-		ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
-		List<ResourceResolver> resolvers = Arrays.<ResourceResolver>asList(resolver);
-		registry.setResourceResolvers(resolvers);
-
-		ResourceTransformer transformer = Mockito.mock(ResourceTransformer.class);
-		List<ResourceTransformer> transformers = Arrays.asList(transformer);
-		registry.setResourceTransformers(transformers);
-
-		SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) registry.getHandlerMapping();
-		ResourceHttpRequestHandler handler = (ResourceHttpRequestHandler) hm.getUrlMap().values().iterator().next();
-
-		assertEquals(resolvers, handler.getResourceResolvers());
-		assertEquals(transformers, handler.getResourceTransformers());
-	}
-
 	private ResourceHttpRequestHandler getHandler(String pathPattern) {
 		SimpleUrlHandlerMapping handlerMapping = (SimpleUrlHandlerMapping) registry.getHandlerMapping();
 		return (ResourceHttpRequestHandler) handlerMapping.getUrlMap().get(pathPattern);

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlGeneratorTests.java

@@ -17,6 +17,7 @@
 package org.springframework.web.servlet.resource;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 
 import static org.junit.Assert.*;
 
@@ -36,9 +38,9 @@ import static org.junit.Assert.*;
  */
 public class ResourceUrlGeneratorTests {
 
-	private ResourceHttpRequestHandler handler;
+	ResourceHttpRequestHandler handler;
 
-	private Map<String, ResourceHttpRequestHandler> handlerMap;
+	SimpleUrlHandlerMapping mapping;
 
 	ResourceUrlGenerator generator;
 
@@ -49,15 +51,18 @@ public class ResourceUrlGeneratorTests {
 		locations.add(new ClassPathResource("test/", getClass()));
 		locations.add(new ClassPathResource("testalternatepath/", getClass()));
 
-		this.handler = new ResourceHttpRequestHandler();
-		this.handler.setLocations(locations);
+		Map<String, ResourceHttpRequestHandler> urlMap = new HashMap<String, ResourceHttpRequestHandler>();
+		handler = new ResourceHttpRequestHandler();
+		handler.setLocations(locations);
+		urlMap.put("/resources/**", handler);
 
-		this.handlerMap = new HashMap<String, ResourceHttpRequestHandler>();
-		this.handlerMap.put("/resources/**", handler);
+		mapping = new SimpleUrlHandlerMapping();
+		mapping.setUrlMap(urlMap);
 	}
 
 	private void initGenerator() {
-		this.generator = new ResourceUrlGenerator(handlerMap);
+		generator = new ResourceUrlGenerator();
+		generator.setResourceHandlerMappings(Collections.singletonList(this.mapping));
 	}
 
 	@Test