Skip to content

Commit 7a666cf

Browse files
committed
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 spring-projectsgh-32475
1 parent 4a7c24d commit 7a666cf

File tree

6 files changed

+0
-11
lines changed

6 files changed

+0
-11
lines changed

Diff for: spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

-2
Original file line numberDiff line numberDiff line change
@@ -907,13 +907,11 @@ public <T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T>
907907

908908
@Deprecated
909909
@Override
910-
@Nullable
911910
public <T> T queryForObject(String sql, @Nullable Object[] args, Class<T> requiredType) throws DataAccessException {
912911
return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
913912
}
914913

915914
@Override
916-
@Nullable
917915
public <T> T queryForObject(String sql, Class<T> requiredType, @Nullable Object... args) throws DataAccessException {
918916
return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
919917
}

Diff for: spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java

-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ private HttpSession obtainSession() {
143143

144144

145145
@Override
146-
@Nullable
147146
public Object getAttribute(String name, int scope) {
148147
if (scope == SCOPE_REQUEST) {
149148
if (!isRequestActive()) {
@@ -243,7 +242,6 @@ public void registerDestructionCallback(String name, Runnable callback, int scop
243242
}
244243

245244
@Override
246-
@Nullable
247245
public Object resolveReference(String key) {
248246
if (REFERENCE_REQUEST.equals(key)) {
249247
return this.request;

Diff for: spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java

-3
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,16 @@ public Object getNativeRequest() {
9898
}
9999

100100
@Override
101-
@Nullable
102101
public Object getNativeResponse() {
103102
return getResponse();
104103
}
105104

106105
@Override
107-
@Nullable
108106
public <T> T getNativeRequest(@Nullable Class<T> requiredType) {
109107
return WebUtils.getNativeRequest(getRequest(), requiredType);
110108
}
111109

112110
@Override
113-
@Nullable
114111
public <T> T getNativeResponse(@Nullable Class<T> requiredType) {
115112
HttpServletResponse response = getResponse();
116113
return (response != null ? WebUtils.getNativeResponse(response, requiredType) : null);

Diff for: spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java

-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ public int getRemotePort() {
340340

341341
@SuppressWarnings("DataFlowIssue")
342342
@Override
343-
@Nullable
344343
public Object getAttribute(String name) {
345344
if (name.equals(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)) {
346345
return this.forwardedPrefixExtractor.getErrorRequestUri();

Diff for: spring-web/src/main/java/org/springframework/web/multipart/MultipartFileResource.java

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public long contentLength() {
6565
}
6666

6767
@Override
68-
@Nullable
6968
public String getFilename() {
7069
return this.multipartFile.getOriginalFilename();
7170
}

Diff for: spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java

-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ protected final void setMultipartParameters(Map<String, String[]> multipartParam
169169
* lazily initializing it if necessary.
170170
* @see #initializeMultipart()
171171
*/
172-
@SuppressWarnings("NullAway")
173172
protected Map<String, String[]> getMultipartParameters() {
174173
if (this.multipartParameters == null) {
175174
initializeMultipart();
@@ -190,7 +189,6 @@ protected final void setMultipartParameterContentTypes(Map<String, String> multi
190189
* lazily initializing it if necessary.
191190
* @see #initializeMultipart()
192191
*/
193-
@SuppressWarnings("NullAway")
194192
protected Map<String, String> getMultipartParameterContentTypes() {
195193
if (this.multipartParameterContentTypes == null) {
196194
initializeMultipart();

0 commit comments

Comments
 (0)