From 7a666cfd864093fbbf68e6ee6107e3cf96c2748c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 5 Apr 2024 14:59:39 +0200 Subject: [PATCH] Revert some null-safety changes This commit reverts some null-safety changes which make sense on main but are too impactful for 6.1.x for Kotlin developers using -Xjsr305=strict. See gh-32475 --- .../main/java/org/springframework/jdbc/core/JdbcTemplate.java | 2 -- .../web/context/request/ServletRequestAttributes.java | 2 -- .../springframework/web/context/request/ServletWebRequest.java | 3 --- .../org/springframework/web/filter/ForwardedHeaderFilter.java | 1 - .../springframework/web/multipart/MultipartFileResource.java | 1 - .../multipart/support/DefaultMultipartHttpServletRequest.java | 2 -- 6 files changed, 11 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java index aad9bc35428..699c15f0f04 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java @@ -907,13 +907,11 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @Deprecated @Override - @Nullable public T queryForObject(String sql, @Nullable Object[] args, Class requiredType) throws DataAccessException { return queryForObject(sql, args, getSingleColumnRowMapper(requiredType)); } @Override - @Nullable public T queryForObject(String sql, Class requiredType, @Nullable Object... args) throws DataAccessException { return queryForObject(sql, args, getSingleColumnRowMapper(requiredType)); } diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java index 52cddccba74..a767b0b98f5 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java @@ -143,7 +143,6 @@ public class ServletRequestAttributes extends AbstractRequestAttributes { @Override - @Nullable public Object getAttribute(String name, int scope) { if (scope == SCOPE_REQUEST) { if (!isRequestActive()) { @@ -243,7 +242,6 @@ public class ServletRequestAttributes extends AbstractRequestAttributes { } @Override - @Nullable public Object resolveReference(String key) { if (REFERENCE_REQUEST.equals(key)) { return this.request; diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java index f8f2b4a3bea..8545894cfff 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java @@ -98,19 +98,16 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ } @Override - @Nullable public Object getNativeResponse() { return getResponse(); } @Override - @Nullable public T getNativeRequest(@Nullable Class requiredType) { return WebUtils.getNativeRequest(getRequest(), requiredType); } @Override - @Nullable public T getNativeResponse(@Nullable Class requiredType) { HttpServletResponse response = getResponse(); return (response != null ? WebUtils.getNativeResponse(response, requiredType) : null); diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java index 49fc6d8eee1..8de8b050360 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java @@ -340,7 +340,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter { @SuppressWarnings("DataFlowIssue") @Override - @Nullable public Object getAttribute(String name) { if (name.equals(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)) { return this.forwardedPrefixExtractor.getErrorRequestUri(); diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFileResource.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFileResource.java index d710062e068..141ca407f09 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFileResource.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFileResource.java @@ -65,7 +65,6 @@ class MultipartFileResource extends AbstractResource { } @Override - @Nullable public String getFilename() { return this.multipartFile.getOriginalFilename(); } diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java index 609837234ba..f7a3ebac9a6 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java @@ -169,7 +169,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer * lazily initializing it if necessary. * @see #initializeMultipart() */ - @SuppressWarnings("NullAway") protected Map getMultipartParameters() { if (this.multipartParameters == null) { initializeMultipart(); @@ -190,7 +189,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer * lazily initializing it if necessary. * @see #initializeMultipart() */ - @SuppressWarnings("NullAway") protected Map getMultipartParameterContentTypes() { if (this.multipartParameterContentTypes == null) { initializeMultipart();