From ab83972c3e9438a8d73d8c8e1ae7822bf00b1df1 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 15 Jul 2023 12:11:34 +0900 Subject: [PATCH 1/2] Add missing @Nullable annotations in AbstractResourceResolver subclasses See gh-30601 Closes gh-30893 --- .../web/servlet/resource/CachingResourceResolver.java | 2 ++ .../web/servlet/resource/EncodedResourceResolver.java | 2 ++ .../web/servlet/resource/VersionResourceResolver.java | 2 ++ .../web/servlet/resource/WebJarsResourceResolver.java | 2 ++ 4 files changed, 8 insertions(+) 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 882504fad0..39370bc6a2 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 class CachingResourceResolver extends AbstractResourceResolver { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -154,6 +155,7 @@ public class CachingResourceResolver extends AbstractResourceResolver { } @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 f45d41c937..fcb3292bb6 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 class EncodedResourceResolver extends AbstractResourceResolver { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -177,6 +178,7 @@ public class EncodedResourceResolver extends AbstractResourceResolver { } @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 1e8509f53f..e93efc46e6 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 class VersionResourceResolver extends AbstractResourceResolver { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -195,6 +196,7 @@ public class VersionResourceResolver extends AbstractResourceResolver { } @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 e42d9d7085..6bc2ab56ff 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 class WebJarsResourceResolver extends AbstractResourceResolver { @Override + @Nullable protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, List locations, ResourceResolverChain chain) { @@ -88,6 +89,7 @@ public class WebJarsResourceResolver extends AbstractResourceResolver { } @Override + @Nullable protected String resolveUrlPathInternal(String resourceUrlPath, List locations, ResourceResolverChain chain) { From 30d6ec3398ce41add7bc44d360b8fb86ac0264b1 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 15 Jul 2023 15:59:45 +0200 Subject: [PATCH 2/2] Update copyright headers --- .../beans/factory/support/BeanDefinitionValueResolver.java | 2 +- .../web/servlet/resource/CachingResourceResolver.java | 2 +- .../web/servlet/resource/WebJarsResourceResolver.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java index 11ee6eef85..d2d0d947d3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.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. 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 39370bc6a2..187dde05c8 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 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. 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 6bc2ab56ff..404ce2e358 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 @@ -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.