root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sébastien Deleuze 2024-04-05 14:59:39 +02:00
parent 4a7c24d90f
commit 7a666cfd86
6 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
View File

@ -907,13 +907,11 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
@Deprecated @Deprecated
@Override @Override
@Nullable
public <T> T queryForObject(String sql, @Nullable Object[] args, Class<T> requiredType) throws DataAccessException { public <T> T queryForObject(String sql, @Nullable Object[] args, Class<T> requiredType) throws DataAccessException {
return queryForObject(sql, args, getSingleColumnRowMapper(requiredType)); return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
} }
@Override @Override
@Nullable
public <T> T queryForObject(String sql, Class<T> requiredType, @Nullable Object... args) throws DataAccessException { public <T> T queryForObject(String sql, Class<T> requiredType, @Nullable Object... args) throws DataAccessException {
return queryForObject(sql, args, getSingleColumnRowMapper(requiredType)); return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
} }

2
spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
View File

@ -143,7 +143,6 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
@Override @Override
@Nullable
public Object getAttribute(String name, int scope) { public Object getAttribute(String name, int scope) {
if (scope == SCOPE_REQUEST) { if (scope == SCOPE_REQUEST) {
if (!isRequestActive()) { if (!isRequestActive()) {
@ -243,7 +242,6 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
} }
@Override @Override
@Nullable
public Object resolveReference(String key) { public Object resolveReference(String key) {
if (REFERENCE_REQUEST.equals(key)) { if (REFERENCE_REQUEST.equals(key)) {
return this.request; return this.request;

3
spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
View File

@ -98,19 +98,16 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
} }
@Override @Override
@Nullable
public Object getNativeResponse() { public Object getNativeResponse() {
return getResponse(); return getResponse();
} }
@Override @Override
@Nullable
public <T> T getNativeRequest(@Nullable Class<T> requiredType) { public <T> T getNativeRequest(@Nullable Class<T> requiredType) {
return WebUtils.getNativeRequest(getRequest(), requiredType); return WebUtils.getNativeRequest(getRequest(), requiredType);
} }
@Override @Override
@Nullable
public <T> T getNativeResponse(@Nullable Class<T> requiredType) { public <T> T getNativeResponse(@Nullable Class<T> requiredType) {
HttpServletResponse response = getResponse(); HttpServletResponse response = getResponse();
return (response != null ? WebUtils.getNativeResponse(response, requiredType) : null); return (response != null ? WebUtils.getNativeResponse(response, requiredType) : null);

1
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
View File

@ -340,7 +340,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
@SuppressWarnings("DataFlowIssue") @SuppressWarnings("DataFlowIssue")
@Override @Override
@Nullable
public Object getAttribute(String name) { public Object getAttribute(String name) {
if (name.equals(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)) { if (name.equals(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)) {
return this.forwardedPrefixExtractor.getErrorRequestUri(); return this.forwardedPrefixExtractor.getErrorRequestUri();

1
spring-web/src/main/java/org/springframework/web/multipart/MultipartFileResource.java
View File

@ -65,7 +65,6 @@ class MultipartFileResource extends AbstractResource {
} }
@Override @Override
@Nullable
public String getFilename() { public String getFilename() {
return this.multipartFile.getOriginalFilename(); return this.multipartFile.getOriginalFilename();
} }

2
spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
View File

@ -169,7 +169,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
* lazily initializing it if necessary. * lazily initializing it if necessary.
* @see #initializeMultipart() * @see #initializeMultipart()
*/ */
@SuppressWarnings("NullAway")
protected Map<String, String[]> getMultipartParameters() { protected Map<String, String[]> getMultipartParameters() {
if (this.multipartParameters == null) { if (this.multipartParameters == null) {
initializeMultipart(); initializeMultipart();
@ -190,7 +189,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
* lazily initializing it if necessary. * lazily initializing it if necessary.
* @see #initializeMultipart() * @see #initializeMultipart()
*/ */
@SuppressWarnings("NullAway")
protected Map<String, String> getMultipartParameterContentTypes() { protected Map<String, String> getMultipartParameterContentTypes() {
if (this.multipartParameterContentTypes == null) { if (this.multipartParameterContentTypes == null) {
initializeMultipart(); initializeMultipart();