Skip to content

Commit ab83972

Browse files
izeyesbrannen
authored andcommitted
Add missing @nullable annotations in AbstractResourceResolver subclasses
See gh-30601 Closes gh-30893
1 parent 9e3f3be commit ab83972

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public List<String> getContentCodings() {
106106

107107

108108
@Override
109+
@Nullable
109110
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
110111
List<? extends Resource> locations, ResourceResolverChain chain) {
111112

@@ -154,6 +155,7 @@ private String getContentCodingKey(HttpServletRequest request) {
154155
}
155156

156157
@Override
158+
@Nullable
157159
protected String resolveUrlPathInternal(String resourceUrlPath,
158160
List<? extends Resource> locations, ResourceResolverChain chain) {
159161

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public void registerExtension(String coding, String extension) {
129129

130130

131131
@Override
132+
@Nullable
132133
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
133134
List<? extends Resource> locations, ResourceResolverChain chain) {
134135

@@ -177,6 +178,7 @@ private String getExtension(String coding) {
177178
}
178179

179180
@Override
181+
@Nullable
180182
protected String resolveUrlPathInternal(String resourceUrlPath,
181183
List<? extends Resource> locations, ResourceResolverChain chain) {
182184

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ public VersionResourceResolver addVersionStrategy(VersionStrategy strategy, Stri
157157

158158

159159
@Override
160+
@Nullable
160161
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
161162
List<? extends Resource> locations, ResourceResolverChain chain) {
162163

@@ -195,6 +196,7 @@ protected Resource resolveResourceInternal(@Nullable HttpServletRequest request,
195196
}
196197

197198
@Override
199+
@Nullable
198200
protected String resolveUrlPathInternal(String resourceUrlPath,
199201
List<? extends Resource> locations, ResourceResolverChain chain) {
200202

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public WebJarsResourceResolver(WebJarAssetLocator webJarAssetLocator) {
7474

7575

7676
@Override
77+
@Nullable
7778
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
7879
List<? extends Resource> locations, ResourceResolverChain chain) {
7980

@@ -88,6 +89,7 @@ protected Resource resolveResourceInternal(@Nullable HttpServletRequest request,
8889
}
8990

9091
@Override
92+
@Nullable
9193
protected String resolveUrlPathInternal(String resourceUrlPath,
9294
List<? extends Resource> locations, ResourceResolverChain chain) {
9395

0 commit comments

Comments
 (0)