Skip to content

Add support for vendor-suffixed x-ndjson media types in Jackson JSON … #36169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
catturtle123 wants to merge 1 commit into from
+21 −4
Closed

Add support for vendor-suffixed x-ndjson media types in Jackson JSON … #36169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ public abstract class Jackson2CodecSupport {
private static final List<MimeType> defaultMimeTypes = List.of(
MediaType.APPLICATION_JSON,
new MediaType("application", "*+json"),
MediaType.APPLICATION_NDJSON);
MediaType.APPLICATION_NDJSON,
new MediaType("application", "*+x-ndjson")
);


protected final Log logger = HttpLogging.forLogName(getClass());
Expand Down
3 changes: 2 additions & 1 deletion spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public class JacksonJsonDecoder extends AbstractJacksonDecoder<JsonMapper> {
private static final MimeType[] DEFAULT_JSON_MIME_TYPES = new MimeType[] {
MediaType.APPLICATION_JSON,
new MediaType("application", "*+json"),
MediaType.APPLICATION_NDJSON
MediaType.APPLICATION_NDJSON,
new MediaType("application", "*+x-ndjson")
};


Expand Down
3 changes: 2 additions & 1 deletion spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public class JacksonJsonEncoder extends AbstractJacksonEncoder<JsonMapper> {
private static final MimeType[] DEFAULT_JSON_MIME_TYPES = new MimeType[] {
MediaType.APPLICATION_JSON,
new MediaType("application", "*+json"),
MediaType.APPLICATION_NDJSON
MediaType.APPLICATION_NDJSON,
new MediaType("application", "*+x-ndjson")
};


Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/org/springframework/http/converter/json/JacksonJsonHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public class JacksonJsonHttpMessageConverter extends AbstractJacksonHttpMessageC
Collections.singletonList(MediaType.APPLICATION_PROBLEM_JSON);

private static final MediaType[] DEFAULT_JSON_MIME_TYPES = new MediaType[] {
MediaType.APPLICATION_JSON, new MediaType("application", "*+json") };
MediaType.APPLICATION_JSON, new MediaType("application", "*+json"),
MediaType.APPLICATION_NDJSON, new MediaType("application", "*+x-ndjson") };


private @Nullable String jsonPrefix;
Expand Down
6 changes: 6 additions & 0 deletions spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ void canDecodeWithObjectMapperRegistrationForType() {

}

@Test
void canDecodeVendorSuffixedNdjson() {
MediaType vendorNdjson = MediaType.parseMediaType("application/vnd.example.v1+x-ndjson");
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), vendorNdjson)).isTrue();
}

@Test // SPR-15866
void canDecodeWithProvidedMimeType() {
MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8);
Expand Down
6 changes: 6 additions & 0 deletions spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonDecoderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ void canDecodeWithObjectMapperRegistrationForType() {
assertThat(decoder.canDecode(ResolvableType.forClass(Map.class), MediaType.APPLICATION_JSON)).isTrue();
}

@Test
void canDecodeVendorSuffixedNdjson() {
MediaType vendorNdjson = MediaType.parseMediaType("application/vnd.example.v1+x-ndjson");
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), vendorNdjson)).isTrue();
}

@Test // SPR-15866
void canDecodeWithProvidedMimeType() {
MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8);
Expand Down