diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java index 882504fad0f5..39370bc6a20c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java @@ -106,6 +106,7 @@ public List getContentCodings() { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -154,6 +155,7 @@ private String getContentCodingKey(HttpServletRequest request) { } @Override + @Nullable protected String resolveUrlPathInternal(String resourceUrlPath, List locations, ResourceResolverChain chain) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java index f45d41c937fb..fcb3292bb6d8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java @@ -129,6 +129,7 @@ public void registerExtension(String coding, String extension) { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -177,6 +178,7 @@ private String getExtension(String coding) { } @Override + @Nullable protected String resolveUrlPathInternal(String resourceUrlPath, List locations, ResourceResolverChain chain) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java index 1e8509f53f25..e93efc46e697 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java @@ -157,6 +157,7 @@ public VersionResourceResolver addVersionStrategy(VersionStrategy strategy, Stri @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -195,6 +196,7 @@ protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, } @Override + @Nullable protected String resolveUrlPathInternal(String resourceUrlPath, List locations, ResourceResolverChain chain) { 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 e42d9d708532..6bc2ab56ff6a 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 @@ -74,6 +74,7 @@ public WebJarsResourceResolver(WebJarAssetLocator webJarAssetLocator) { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -88,6 +89,7 @@ protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, } @Override + @Nullable protected String resolveUrlPathInternal(String resourceUrlPath, List locations, ResourceResolverChain chain) {