Perform NullAway build-time checks in spring-webmvc

See spring-projectsgh-32475
sdeleuze · Mar 22, 2024 · 0e7aba4 · 0e7aba4
1 parent cf88100
commit 0e7aba4
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 5 deletions.
diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle
@@ -118,7 +118,7 @@ tasks.withType(JavaCompile).configureEach {
     	disableAllChecks = true
         option("NullAway:CustomContractAnnotations", "org.springframework.lang.Contract")
         option("NullAway:AnnotatedPackages", "org.springframework.core,org.springframework.expression," +
-        		"org.springframework.web.reactive")
+        		"org.springframework.web.reactive,org.springframework.web.servlet")
         option("NullAway:UnannotatedSubPackages", "org.springframework.instrument,org.springframework.context.index," +
 				"org.springframework.asm,org.springframework.cglib,org.springframework.objenesis," +
 				"org.springframework.javapoet,org.springframework.aot.nativex.substitution")

diff --git a/...ain/java/org/springframework/web/servlet/config/annotation/ResourceChainRegistration.java b/...ain/java/org/springframework/web/servlet/config/annotation/ResourceChainRegistration.java
@@ -64,6 +64,7 @@ public ResourceChainRegistration(boolean cacheResources) {
 		this(cacheResources, (cacheResources ? new ConcurrentMapCache(DEFAULT_CACHE_NAME) : null));
 	}
 
+	@SuppressWarnings("NullAway")
 	public ResourceChainRegistration(boolean cacheResources, @Nullable Cache cache) {
 		Assert.isTrue(!cacheResources || cache != null, "'cache' is required when cacheResources=true");
 		if (cacheResources) {

diff --git a/...c/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/...c/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -442,6 +442,7 @@ protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletReques
 		}
 	}
 
+	@SuppressWarnings("NullAway")
 	private void addMatchingMappings(Collection<T> mappings, List<Match> matches, HttpServletRequest request) {
 		for (T mapping : mappings) {
 			T match = getMatchingMapping(mapping, request);

diff --git a/...bmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/...bmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
@@ -186,6 +186,7 @@ protected Object getHandlerInternal(HttpServletRequest request) throws Exception
 	 * @since 5.3
 	 */
 	@Nullable
+	@SuppressWarnings("NullAway")
 	protected Object lookupHandler(
 			RequestPath path, String lookupPath, HttpServletRequest request) throws Exception {
 

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/RequestMatchResult.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/RequestMatchResult.java
@@ -94,7 +94,7 @@ public RequestMatchResult(String pattern, String lookupPath, PathMatcher pathMat
 	 * {@link PathMatcher#extractUriTemplateVariables}.
 	 * @return a map with URI template variables
 	 */
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({"ConstantConditions", "NullAway"})
 	public Map<String, String> extractUriTemplateVariables() {
 		return (this.pathPattern != null ?
 				this.pathPattern.matchAndExtract(this.lookupPathContainer).getUriVariables() :

diff --git a/...g-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/...g-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -490,7 +490,7 @@ public int hashCode() {
 		return this.hashCode;
 	}
 
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({"ConstantConditions", "NullAway"})
 	private static int calculateHashCode(
 			@Nullable PathPatternsRequestCondition pathPatterns, @Nullable PatternsRequestCondition patterns,
 			RequestMethodsRequestCondition methods, ParamsRequestCondition params, HeadersRequestCondition headers,

diff --git a/.../org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/.../org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -215,6 +215,7 @@ private class ConcurrentResultHandlerMethod extends ServletInvocableHandlerMetho
 
 		private final MethodParameter returnType;
 
+		@SuppressWarnings("NullAway")
 		public ConcurrentResultHandlerMethod(@Nullable Object result, ConcurrentResultMethodParameter returnType) {
 			super((Callable<Object>) () -> {
 				if (result instanceof Exception exception) {

diff --git a/...ng-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/...ng-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -219,6 +219,7 @@ private int getEndPathIndex(String lookupPath) {
 	 * @return the resolved public URL path, or {@code null} if unresolved
 	 */
 	@Nullable
+	@SuppressWarnings("NullAway")
 	public final String getForLookupPath(String lookupPath) {
 		// Clean duplicate slashes or pathWithinPattern won't match lookupPath
 		String previous;

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
@@ -328,11 +328,11 @@ protected final String createTargetUrl(Map<String, Object> model, HttpServletReq
 		String url = getUrl();
 		Assert.state(url != null, "'url' not set");
 
-		if (this.contextRelative && getUrl().startsWith("/")) {
+		if (this.contextRelative && url.startsWith("/")) {
 			// Do not apply context path to relative URLs.
 			targetUrl.append(getContextPath(request));
 		}
-		targetUrl.append(getUrl());
+		targetUrl.append(url);
 
 		String enc = this.encodingScheme;
 		if (enc == null) {