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

Remove deprecated MediaType entries

Browse Source 
See gh-33809
This commit is contained in:
Brian Clozel
2024-12-08 21:01:11 +01:00
parent ff28d2d47a
commit 5044b70a40
6 changed files with 4 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
View File

@@ -201,7 +201,6 @@ class ReactiveTypeHandler {
* @return the concrete streaming {@code MediaType} if one could be found or {@code null}
* if none could be found
*/
@SuppressWarnings("deprecation")
@Nullable
static MediaType findConcreteJsonStreamMediaType(Collection<MediaType> acceptedMediaTypes) {
for (MediaType acceptedType : acceptedMediaTypes) {
@@ -220,9 +219,6 @@ class ReactiveTypeHandler {
else if (MediaType.APPLICATION_NDJSON.includes(acceptedType)) {
return MediaType.APPLICATION_NDJSON;
}
else if (MediaType.APPLICATION_STREAM_JSON.includes(acceptedType)) {
return MediaType.APPLICATION_STREAM_JSON;
}
}
return null; // not a concrete streaming type
}

13
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java
View File

@@ -158,19 +158,6 @@ class ReactiveTypeHandlerTests {
.isEqualTo(MediaType.APPLICATION_NDJSON);
}
@SuppressWarnings("deprecation")
@Test
void findsConcreteStreamingMediaType_plainStreamingJsonFirst() {
final List<MediaType> accept = List.of(
MediaType.ALL,
MediaType.APPLICATION_STREAM_JSON,
MediaType.parseMediaType("application/*+x-ndjson"),
MediaType.parseMediaType("application/vnd.myapp.v1+x-ndjson"));
assertThat(ReactiveTypeHandler.findConcreteJsonStreamMediaType(accept))
.isEqualTo(MediaType.APPLICATION_STREAM_JSON);
}
@Test
void deferredResultSubscriberWithOneValue() throws Exception {