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:
parent
4a7c24d90f
commit
7a666cfd86
|
@ -907,13 +907,11 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
|
|||
|
||||
@Deprecated
|
||||
@Override
|
||||
@Nullable
|
||||
public <T> T queryForObject(String sql, @Nullable Object[] args, Class<T> requiredType) throws DataAccessException {
|
||||
return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public <T> T queryForObject(String sql, Class<T> requiredType, @Nullable Object... args) throws DataAccessException {
|
||||
return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -98,19 +98,16 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
|
|||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public Object getNativeResponse() {
|
||||
return getResponse();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public <T> T getNativeRequest(@Nullable Class<T> requiredType) {
|
||||
return WebUtils.getNativeRequest(getRequest(), requiredType);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public <T> T getNativeResponse(@Nullable Class<T> requiredType) {
|
||||
HttpServletResponse response = getResponse();
|
||||
return (response != null ? WebUtils.getNativeResponse(response, requiredType) : null);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -65,7 +65,6 @@ class MultipartFileResource extends AbstractResource {
|
|||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public String getFilename() {
|
||||
return this.multipartFile.getOriginalFilename();
|
||||
}
|
||||
|
|
|
@ -169,7 +169,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
|
|||
* lazily initializing it if necessary.
|
||||
* @see #initializeMultipart()
|
||||
*/
|
||||
@SuppressWarnings("NullAway")
|
||||
protected Map<String, String[]> 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<String, String> getMultipartParameterContentTypes() {
|
||||
if (this.multipartParameterContentTypes == null) {
|
||||
initializeMultipart();
|
||||
|
|
Loading…
Reference in New Issue