From ba9496de6c1e9532588a3d8abbdd849410ee3db7 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran@vedranpavic.com>
Date: Thu, 5 Sep 2024 21:51:11 +0200
Subject: [PATCH] Simplify WebJars support

---
 .../annotation/ResourceChainRegistration.java |  10 +-
 .../resource/LiteWebJarsResourceResolver.java | 112 --------------
 .../resource/WebJarsResourceResolver.java     |  32 ++--
 .../ResourceHandlerRegistryTests.java         |  10 +-
 .../LiteWebJarsResourceResolverTests.java     | 138 ------------------
 .../WebJarsResourceResolverTests.java         |  66 +++++----
 6 files changed, 68 insertions(+), 300 deletions(-)
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolver.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolverTests.java

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceChainRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceChainRegistration.java
index 51fcf349486c..9c2a73fafd6e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceChainRegistration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceChainRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
 import org.springframework.web.servlet.resource.CachingResourceResolver;
 import org.springframework.web.servlet.resource.CachingResourceTransformer;
 import org.springframework.web.servlet.resource.CssLinkResourceTransformer;
-import org.springframework.web.servlet.resource.LiteWebJarsResourceResolver;
 import org.springframework.web.servlet.resource.PathResourceResolver;
 import org.springframework.web.servlet.resource.ResourceResolver;
 import org.springframework.web.servlet.resource.ResourceTransformer;
@@ -83,7 +82,6 @@ public ResourceChainRegistration(boolean cacheResources, @Nullable Cache cache)
 	 * @param resolver the resolver to add
 	 * @return the current instance for chained method invocation
 	 */
-	@SuppressWarnings("removal")
 	public ResourceChainRegistration addResolver(ResourceResolver resolver) {
 		Assert.notNull(resolver, "The provided ResourceResolver should not be null");
 		this.resolvers.add(resolver);
@@ -93,7 +91,7 @@ public ResourceChainRegistration addResolver(ResourceResolver resolver) {
 		else if (resolver instanceof PathResourceResolver) {
 			this.hasPathResolver = true;
 		}
-		else if (resolver instanceof WebJarsResourceResolver || resolver instanceof LiteWebJarsResourceResolver) {
+		else if (resolver instanceof WebJarsResourceResolver) {
 			this.hasWebjarsResolver = true;
 		}
 		return this;
@@ -118,10 +116,10 @@ protected List<ResourceResolver> getResourceResolvers() {
 		if (!this.hasPathResolver) {
 			List<ResourceResolver> result = new ArrayList<>(this.resolvers);
 			if (isWebJarVersionLocatorPresent && !this.hasWebjarsResolver) {
-				result.add(new LiteWebJarsResourceResolver());
+				result.add(new WebJarsResourceResolver());
 			}
 			else if (isWebJarAssetLocatorPresent && !this.hasWebjarsResolver) {
-				result.add(new WebJarsResourceResolver());
+				result.add(new WebJarsResourceResolver(new org.webjars.WebJarAssetLocator()));
 			}
 			result.add(new PathResourceResolver());
 			return result;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolver.java
deleted file mode 100644
index 99af509a440e..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolver.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.resource;
-
-import java.util.List;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.webjars.WebJarVersionLocator;
-
-import org.springframework.core.io.Resource;
-import org.springframework.lang.Nullable;
-
-/**
- * A {@code ResourceResolver} that delegates to the chain to locate a resource and then
- * attempts to find a matching versioned resource contained in a WebJar JAR file.
- *
- * <p>This allows WebJars.org users to write version agnostic paths in their templates,
- * like {@code <script src="/webjars/jquery/jquery.min.js"/>}.
- * This path will be resolved to the unique version {@code <script src="/webjars/jquery/1.2.0/jquery.min.js"/>},
- * which is a better fit for HTTP caching and version management in applications.
- *
- * <p>This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}.
- *
- * <p>This resolver requires the {@code org.webjars:webjars-locator-lite} library
- * on the classpath and is automatically registered if that library is present.
- *
- * @author Sebastien Deleuze
- * @since 6.2
- * @see org.springframework.web.servlet.config.annotation.ResourceChainRegistration
- * @see <a href="https://www.webjars.org">webjars.org</a>
- */
-public class LiteWebJarsResourceResolver extends AbstractResourceResolver {
-
-	private static final int WEBJARS_LOCATION_LENGTH = WebJarVersionLocator.WEBJARS_PATH_PREFIX.length() + 1;
-
-	private final WebJarVersionLocator webJarVersionLocator;
-
-	/**
-	 * Create a {@code LiteWebJarsResourceResolver} with a default {@code WebJarVersionLocator} instance.
-	 */
-	public LiteWebJarsResourceResolver() {
-		this.webJarVersionLocator = new WebJarVersionLocator();
-	}
-
-	/**
-	 * Create a {@code LiteWebJarsResourceResolver} with a custom {@code WebJarVersionLocator} instance,
-	 * e.g. with a custom cache implementation.
-	 */
-	public LiteWebJarsResourceResolver(WebJarVersionLocator webJarVersionLocator) {
-		this.webJarVersionLocator = webJarVersionLocator;
-	}
-
-	@Override
-	@Nullable
-	protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
-			List<? extends Resource> locations, ResourceResolverChain chain) {
-
-		Resource resolved = chain.resolveResource(request, requestPath, locations);
-		if (resolved == null) {
-			String webJarResourcePath = findWebJarResourcePath(requestPath);
-			if (webJarResourcePath != null) {
-				return chain.resolveResource(request, webJarResourcePath, locations);
-			}
-		}
-		return resolved;
-	}
-
-	@Override
-	@Nullable
-	protected String resolveUrlPathInternal(String resourceUrlPath,
-			List<? extends Resource> locations, ResourceResolverChain chain) {
-
-		String path = chain.resolveUrlPath(resourceUrlPath, locations);
-		if (path == null) {
-			String webJarResourcePath = findWebJarResourcePath(resourceUrlPath);
-			if (webJarResourcePath != null) {
-				return chain.resolveUrlPath(webJarResourcePath, locations);
-			}
-		}
-		return path;
-	}
-
-	@Nullable
-	protected String findWebJarResourcePath(String path) {
-		int endOffset = path.indexOf('/', 1);
-		if (endOffset != -1) {
-			int startOffset = (path.startsWith("/") ? 1 : 0);
-			String webjar = path.substring(startOffset, endOffset);
-			String partialPath = path.substring(endOffset + 1);
-			String webJarPath = this.webJarVersionLocator.fullPath(webjar, partialPath);
-			if (webJarPath != null) {
-				return webJarPath.substring(WEBJARS_LOCATION_LENGTH);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
index bf6ef3680d56..ec3769040a6e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
@@ -17,9 +17,11 @@
 package org.springframework.web.servlet.resource;
 
 import java.util.List;
+import java.util.function.BiFunction;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.webjars.WebJarAssetLocator;
+import org.webjars.WebJarVersionLocator;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
@@ -46,34 +48,38 @@
  * @since 4.2
  * @see org.springframework.web.servlet.config.annotation.ResourceChainRegistration
  * @see <a href="https://www.webjars.org">webjars.org</a>
- * @see LiteWebJarsResourceResolver
- * @deprecated as of Spring Framework 6.2 in favor of {@link LiteWebJarsResourceResolver}
  */
-@Deprecated(forRemoval = true)
 public class WebJarsResourceResolver extends AbstractResourceResolver {
 
-	private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/";
+	private static final int WEBJARS_LOCATION_LENGTH = "META-INF/resources/webjars/".length();
 
-	private static final int WEBJARS_LOCATION_LENGTH = WEBJARS_LOCATION.length();
-
-
-	private final WebJarAssetLocator webJarAssetLocator;
+	private final BiFunction<String, String, String> webJarVersionLocator;
 
 
 	/**
-	 * Create a {@code WebJarsResourceResolver} with a default {@code WebJarAssetLocator} instance.
+	 * Create a {@code WebJarsResourceResolver} with a default {@code WebJarVersionLocator} instance.
 	 */
 	public WebJarsResourceResolver() {
-		this(new WebJarAssetLocator());
+		this(new WebJarVersionLocator());
+	}
+
+	/**
+	 * Create a {@code WebJarsResourceResolver} with a custom {@code WebJarVersionLocator} instance,
+	 * e.g. with a custom cache implementation.
+	 */
+	public WebJarsResourceResolver(WebJarVersionLocator webJarVersionLocator) {
+		this.webJarVersionLocator = webJarVersionLocator::fullPath;
 	}
 
 	/**
 	 * Create a {@code WebJarsResourceResolver} with a custom {@code WebJarAssetLocator} instance,
 	 * e.g. with a custom index.
 	 * @since 4.3
+	 * @deprecated as of Spring Framework 6.2
 	 */
+	@Deprecated(forRemoval = true)
 	public WebJarsResourceResolver(WebJarAssetLocator webJarAssetLocator) {
-		this.webJarAssetLocator = webJarAssetLocator;
+		this.webJarVersionLocator = webJarAssetLocator::getFullPathExact;
 	}
 
 
@@ -109,12 +115,12 @@ protected String resolveUrlPathInternal(String resourceUrlPath,
 
 	@Nullable
 	protected String findWebJarResourcePath(String path) {
-		int startOffset = (path.startsWith("/") ? 1 : 0);
 		int endOffset = path.indexOf('/', 1);
 		if (endOffset != -1) {
+			int startOffset = (path.startsWith("/") ? 1 : 0);
 			String webjar = path.substring(startOffset, endOffset);
 			String partialPath = path.substring(endOffset + 1);
-			String webJarPath = this.webJarAssetLocator.getFullPathExact(webjar, partialPath);
+			String webJarPath = this.webJarVersionLocator.apply(webjar, partialPath);
 			if (webJarPath != null) {
 				return webJarPath.substring(WEBJARS_LOCATION_LENGTH);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
index 0cadc15f58d7..9af05b73064b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
@@ -31,12 +31,12 @@
 import org.springframework.web.servlet.resource.CachingResourceResolver;
 import org.springframework.web.servlet.resource.CachingResourceTransformer;
 import org.springframework.web.servlet.resource.CssLinkResourceTransformer;
-import org.springframework.web.servlet.resource.LiteWebJarsResourceResolver;
 import org.springframework.web.servlet.resource.PathResourceResolver;
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 import org.springframework.web.servlet.resource.ResourceResolver;
 import org.springframework.web.servlet.resource.ResourceTransformer;
 import org.springframework.web.servlet.resource.VersionResourceResolver;
+import org.springframework.web.servlet.resource.WebJarsResourceResolver;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 import org.springframework.web.testfixture.servlet.MockServletContext;
@@ -140,7 +140,7 @@ void resourceChain() {
 				zero -> assertThat(zero).isInstanceOfSatisfying(CachingResourceResolver.class,
 						cachingResolver -> assertThat(cachingResolver.getCache()).isInstanceOf(ConcurrentMapCache.class)),
 				one -> assertThat(one).isEqualTo(mockResolver),
-				two -> assertThat(two).isInstanceOf(LiteWebJarsResourceResolver.class),
+				two -> assertThat(two).isInstanceOf(WebJarsResourceResolver.class),
 				three -> assertThat(three).isInstanceOf(PathResourceResolver.class));
 		assertThat(handler.getResourceTransformers()).satisfiesExactly(
 				zero -> assertThat(zero).isInstanceOf(CachingResourceTransformer.class),
@@ -153,7 +153,7 @@ void resourceChainWithoutCaching() {
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
 		assertThat(handler.getResourceResolvers()).hasExactlyElementsOfTypes(
-				LiteWebJarsResourceResolver.class, PathResourceResolver.class);
+				WebJarsResourceResolver.class, PathResourceResolver.class);
 		assertThat(handler.getResourceTransformers()).isEmpty();
 	}
 
@@ -169,7 +169,7 @@ void resourceChainWithVersionResolver() {
 		assertThat(handler.getResourceResolvers()).satisfiesExactly(
 				zero -> assertThat(zero).isInstanceOf(CachingResourceResolver.class),
 				one -> assertThat(one).isSameAs(versionResolver),
-				two -> assertThat(two).isInstanceOf(LiteWebJarsResourceResolver.class),
+				two -> assertThat(two).isInstanceOf(WebJarsResourceResolver.class),
 				three -> assertThat(three).isInstanceOf(PathResourceResolver.class));
 		assertThat(handler.getResourceTransformers()).hasExactlyElementsOfTypes(
 				CachingResourceTransformer.class, CssLinkResourceTransformer.class);
@@ -179,7 +179,7 @@ void resourceChainWithVersionResolver() {
 	void resourceChainWithOverrides() {
 		CachingResourceResolver cachingResolver = mock();
 		VersionResourceResolver versionResolver = mock();
-		LiteWebJarsResourceResolver webjarsResolver = mock();
+		WebJarsResourceResolver webjarsResolver = mock();
 		PathResourceResolver pathResourceResolver = new PathResourceResolver();
 		CachingResourceTransformer cachingTransformer = mock();
 		CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolverTests.java
deleted file mode 100644
index 66d18b5ed08e..000000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/LiteWebJarsResourceResolverTests.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.resource;
-
-import java.util.List;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * Tests for {@link LiteWebJarsResourceResolver}.
- *
- * @author Sebastien Deleuze
- */
-class LiteWebJarsResourceResolverTests {
-
-	private List<Resource> locations = List.of(new ClassPathResource("/META-INF/resources/webjars"));
-
-	// for this to work, an actual WebJar must be on the test classpath
-	private LiteWebJarsResourceResolver resolver = new LiteWebJarsResourceResolver();
-
-	private ResourceResolverChain chain = mock();
-
-	private HttpServletRequest request = new MockHttpServletRequest();
-
-
-	@Test
-	void resolveUrlExisting() {
-		String file = "/foo/2.3/foo.txt";
-		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(file);
-
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
-
-		assertThat(actual).isEqualTo(file);
-		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
-	}
-
-	@Test
-	void resolveUrlExistingNotInJarFile() {
-		String file = "foo/foo.txt";
-		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
-
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
-
-		assertThat(actual).isNull();
-		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
-		verify(this.chain, never()).resolveUrlPath("foo/2.3/foo.txt", this.locations);
-	}
-
-	@Test
-	void resolveUrlWebJarResource() {
-		String file = "underscorejs/underscore.js";
-		String expected = "underscorejs/1.8.3/underscore.js";
-		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
-		given(this.chain.resolveUrlPath(expected, this.locations)).willReturn(expected);
-
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
-
-		assertThat(actual).isEqualTo(expected);
-		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
-		verify(this.chain, times(1)).resolveUrlPath(expected, this.locations);
-	}
-
-	@Test
-	void resolveUrlWebJarResourceNotFound() {
-		String file = "something/something.js";
-		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
-
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
-
-		assertThat(actual).isNull();
-		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
-		verify(this.chain, never()).resolveUrlPath(null, this.locations);
-	}
-
-	@Test
-	void resolveResourceExisting() {
-		Resource expected = mock();
-		String file = "foo/2.3/foo.txt";
-		given(this.chain.resolveResource(this.request, file, this.locations)).willReturn(expected);
-
-		Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain);
-
-		assertThat(actual).isEqualTo(expected);
-		verify(this.chain, times(1)).resolveResource(this.request, file, this.locations);
-	}
-
-	@Test
-	void resolveResourceNotFound() {
-		String file = "something/something.js";
-		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
-
-		Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain);
-
-		assertThat(actual).isNull();
-		verify(this.chain, times(1)).resolveResource(this.request, file, this.locations);
-		verify(this.chain, never()).resolveResource(this.request, null, this.locations);
-	}
-
-	@Test
-	void resolveResourceWebJar() {
-		Resource expected = mock();
-		String file = "underscorejs/underscore.js";
-		String expectedPath = "underscorejs/1.8.3/underscore.js";
-		given(this.chain.resolveResource(this.request, expectedPath, this.locations)).willReturn(expected);
-
-		Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain);
-
-		assertThat(actual).isEqualTo(expected);
-		verify(this.chain, times(1)).resolveResource(this.request, file, this.locations);
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
index 373647e9d485..2ffcc0cf6506 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
@@ -17,9 +17,12 @@
 package org.springframework.web.servlet.resource;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.webjars.WebJarAssetLocator;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -38,100 +41,111 @@
  * @author Brian Clozel
  * @author Sam Brannen
  */
-@SuppressWarnings("removal")
 class WebJarsResourceResolverTests {
 
 	private List<Resource> locations = List.of(new ClassPathResource("/META-INF/resources/webjars"));
 
-	// for this to work, an actual WebJar must be on the test classpath
-	private WebJarsResourceResolver resolver = new WebJarsResourceResolver();
-
 	private ResourceResolverChain chain = mock();
 
 	private HttpServletRequest request = new MockHttpServletRequest();
 
 
-	@Test
-	void resolveUrlExisting() {
+	@SuppressWarnings("removal")
+	private static Stream<WebJarsResourceResolver> webJarsResourceResolvers() {
+		return Stream.of(
+				new WebJarsResourceResolver(),
+				new WebJarsResourceResolver(new WebJarAssetLocator())
+		);
+	}
+
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveUrlExisting(WebJarsResourceResolver resolver) {
 		String file = "/foo/2.3/foo.txt";
 		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(file);
 
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
+		String actual = resolver.resolveUrlPath(file, this.locations, this.chain);
 
 		assertThat(actual).isEqualTo(file);
 		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
 	}
 
-	@Test
-	void resolveUrlExistingNotInJarFile() {
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveUrlExistingNotInJarFile(WebJarsResourceResolver resolver) {
 		String file = "foo/foo.txt";
 		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
 
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
+		String actual = resolver.resolveUrlPath(file, this.locations, this.chain);
 
 		assertThat(actual).isNull();
 		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
 		verify(this.chain, never()).resolveUrlPath("foo/2.3/foo.txt", this.locations);
 	}
 
-	@Test
-	void resolveUrlWebJarResource() {
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveUrlWebJarResource(WebJarsResourceResolver resolver) {
 		String file = "underscorejs/underscore.js";
 		String expected = "underscorejs/1.8.3/underscore.js";
 		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
 		given(this.chain.resolveUrlPath(expected, this.locations)).willReturn(expected);
 
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
+		String actual = resolver.resolveUrlPath(file, this.locations, this.chain);
 
 		assertThat(actual).isEqualTo(expected);
 		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
 		verify(this.chain, times(1)).resolveUrlPath(expected, this.locations);
 	}
 
-	@Test
-	void resolveUrlWebJarResourceNotFound() {
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveUrlWebJarResourceNotFound(WebJarsResourceResolver resolver) {
 		String file = "something/something.js";
 		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
 
-		String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain);
+		String actual = resolver.resolveUrlPath(file, this.locations, this.chain);
 
 		assertThat(actual).isNull();
 		verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
 		verify(this.chain, never()).resolveUrlPath(null, this.locations);
 	}
 
-	@Test
-	void resolveResourceExisting() {
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveResourceExisting(WebJarsResourceResolver resolver) {
 		Resource expected = mock();
 		String file = "foo/2.3/foo.txt";
 		given(this.chain.resolveResource(this.request, file, this.locations)).willReturn(expected);
 
-		Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain);
+		Resource actual = resolver.resolveResource(this.request, file, this.locations, this.chain);
 
 		assertThat(actual).isEqualTo(expected);
 		verify(this.chain, times(1)).resolveResource(this.request, file, this.locations);
 	}
 
-	@Test
-	void resolveResourceNotFound() {
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveResourceNotFound(WebJarsResourceResolver resolver) {
 		String file = "something/something.js";
 		given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null);
 
-		Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain);
+		Resource actual = resolver.resolveResource(this.request, file, this.locations, this.chain);
 
 		assertThat(actual).isNull();
 		verify(this.chain, times(1)).resolveResource(this.request, file, this.locations);
 		verify(this.chain, never()).resolveResource(this.request, null, this.locations);
 	}
 
-	@Test
-	void resolveResourceWebJar() {
+	@ParameterizedTest
+	@MethodSource("webJarsResourceResolvers")
+	void resolveResourceWebJar(WebJarsResourceResolver resolver) {
 		Resource expected = mock();
 		String file = "underscorejs/underscore.js";
 		String expectedPath = "underscorejs/1.8.3/underscore.js";
 		given(this.chain.resolveResource(this.request, expectedPath, this.locations)).willReturn(expected);
 
-		Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain);
+		Resource actual = resolver.resolveResource(this.request, file, this.locations, this.chain);
 
 		assertThat(actual).isEqualTo(expected);
 		verify(this.chain, times(1)).resolveResource(this.request, file, this.locations);