From 072a86149d6b754c01cbdb1d8bbc47632f4b6817 Mon Sep 17 00:00:00 2001 From: cwatzl <49339714+cwatzl@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:09:19 +0200 Subject: [PATCH 1/2] Flag PathResourceResolver#resolve*Internal as @Nullable See gh-30601 --- .../web/servlet/resource/PathResourceResolver.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java index d46394e9d01..bcce0d6379b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java @@ -133,6 +133,7 @@ public class PathResourceResolver extends AbstractResourceResolver { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -140,6 +141,7 @@ public class PathResourceResolver extends AbstractResourceResolver { } @Override + @Nullable protected String resolveUrlPathInternal(String resourcePath, List locations, ResourceResolverChain chain) { From 294cdba80c937780b75973743256914aa6610075 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 19 Jun 2023 15:44:04 +0200 Subject: [PATCH 2/2] Update copyright year of changed file See gh-30601 --- .../web/servlet/resource/PathResourceResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java index bcce0d6379b..6704b98d503 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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.