Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing @Nullable annotations in AbstractResourceResolver subclasses in Spring MVC #30893

Closed
wants to merge 1 commit into from
Closed

Add missing @Nullable annotations in AbstractResourceResolver subclasses in Spring MVC #30893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ebmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java
View file
Open in desktop
Expand Up @@ -106,6 +106,7 @@ public List<String> getContentCodings() {


@Override
@Nullable
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down Expand Up @@ -154,6 +155,7 @@ private String getContentCodingKey(HttpServletRequest request) {
}

@Override
@Nullable
protected String resolveUrlPathInternal(String resourceUrlPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down
2 changes: 2 additions & 0 deletions ...ebmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java
View file
Open in desktop
Expand Up @@ -129,6 +129,7 @@ public void registerExtension(String coding, String extension) {


@Override
@Nullable
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down Expand Up @@ -177,6 +178,7 @@ private String getExtension(String coding) {
}

@Override
@Nullable
protected String resolveUrlPathInternal(String resourceUrlPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down
2 changes: 2 additions & 0 deletions ...ebmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
View file
Open in desktop
Expand Up @@ -157,6 +157,7 @@ public VersionResourceResolver addVersionStrategy(VersionStrategy strategy, Stri


@Override
@Nullable
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down Expand Up @@ -195,6 +196,7 @@ protected Resource resolveResourceInternal(@Nullable HttpServletRequest request,
}

@Override
@Nullable
protected String resolveUrlPathInternal(String resourceUrlPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down
2 changes: 2 additions & 0 deletions ...ebmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
View file
Open in desktop
Expand Up @@ -74,6 +74,7 @@ public WebJarsResourceResolver(WebJarAssetLocator webJarAssetLocator) {


@Override
@Nullable
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

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

@Override
@Nullable
protected String resolveUrlPathInternal(String resourceUrlPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

Expand Down