diff --git a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoder.java index 820b3d08ba1..4acc85b67f6 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoder.java @@ -60,7 +60,8 @@ public class ProtobufJsonEncoder implements HttpMessageEncoder { private static final List defaultMimeTypes = List.of( MediaType.APPLICATION_JSON, - new MediaType("application", "*+json")); + new MediaType("application", "*+json"), + MediaType.APPLICATION_NDJSON); private final JsonFormat.Printer printer; diff --git a/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoderTests.java index 477e8ba97d7..2924b0aa731 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufJsonEncoderTests.java @@ -64,7 +64,7 @@ class ProtobufJsonEncoderTests extends AbstractEncoderTests protected void canEncode() throws Exception { assertThat(this.encoder.canEncode(forClass(Msg.class), null)).isFalse(); assertThat(this.encoder.canEncode(forClass(Msg.class), MediaType.APPLICATION_JSON)).isTrue(); - assertThat(this.encoder.canEncode(forClass(Msg.class), MediaType.APPLICATION_NDJSON)).isFalse(); + assertThat(this.encoder.canEncode(forClass(Msg.class), MediaType.APPLICATION_NDJSON)).isTrue(); assertThat(this.encoder.canEncode(forClass(Object.class), MediaType.APPLICATION_JSON)).isFalse(); }