Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
This commit is contained in:
Juergen Hoeller
2024-03-16 23:24:51 +01:00
parent 10e8039de8 eb8b7c4331
commit 89d563097f
7 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
View File

@@ -60,7 +60,6 @@ import org.springframework.http.converter.GenericHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.server.RequestPath;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
@@ -522,7 +521,7 @@ class DefaultServerRequest implements ServerRequest {
}
@Override
public boolean addAll(@NonNull Collection<? extends Entry<String, Object>> c) {
public boolean addAll(Collection<? extends Entry<String, Object>> c) {
throw new UnsupportedOperationException();
}
@@ -537,7 +536,7 @@ class DefaultServerRequest implements ServerRequest {
}
@Override
public boolean retainAll(@NonNull Collection<?> c) {
public boolean retainAll(Collection<?> c) {
throw new UnsupportedOperationException();
}