Skip to content
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

In Resteasy Reactive, fix line separator for "x-ndjson" and "stream+json". #24200

Merged
merged 1 commit into from
Mar 9, 2022
Merged

In Resteasy Reactive, fix line separator for "x-ndjson" and "stream+json". #24200

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
8 changes: 4 additions & 4 deletions ...t/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ public void testNdJsonMultiFromMulti() {
when().get(uri.toString() + "sse/ndjson/multi")
.then().statusCode(HttpStatus.SC_OK)
// @formatter:off
.body(is("{\"name\":\"hello\"}/n"
+ "{\"name\":\"stef\"}/n"))
.body(is("{\"name\":\"hello\"}\n"
+ "{\"name\":\"stef\"}\n"))
// @formatter:on
.header(HttpHeaders.CONTENT_TYPE, containsString(RestMediaType.APPLICATION_NDJSON));
}
Expand All @@ -130,8 +130,8 @@ public void testStreamJsonMultiFromMulti() {
when().get(uri.toString() + "sse/stream-json/multi")
.then().statusCode(HttpStatus.SC_OK)
// @formatter:off
.body(is("{\"name\":\"hello\"}/n"
+ "{\"name\":\"stef\"}/n"))
.body(is("{\"name\":\"hello\"}\n"
+ "{\"name\":\"stef\"}\n"))
// @formatter:on
.header(HttpHeaders.CONTENT_TYPE, containsString(RestMediaType.APPLICATION_STREAM_JSON));
}
Expand Down
8 changes: 4 additions & 4 deletions ...ent/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ public void testNdJsonMultiFromMulti() {
when().get(uri.toString() + "sse/ndjson/multi")
.then().statusCode(HttpStatus.SC_OK)
// @formatter:off
.body(is("{\"name\":\"hello\"}/n"
+ "{\"name\":\"stef\"}/n"))
.body(is("{\"name\":\"hello\"}\n"
+ "{\"name\":\"stef\"}\n"))
// @formatter:on
.header(HttpHeaders.CONTENT_TYPE, containsString(RestMediaType.APPLICATION_NDJSON));
}
Expand All @@ -128,8 +128,8 @@ public void testStreamJsonMultiFromMulti() {
when().get(uri.toString() + "sse/stream-json/multi")
.then().statusCode(HttpStatus.SC_OK)
// @formatter:off
.body(is("{\"name\":\"hello\"}/n"
+ "{\"name\":\"stef\"}/n"))
.body(is("{\"name\":\"hello\"}\n"
+ "{\"name\":\"stef\"}\n"))
// @formatter:on
.header(HttpHeaders.CONTENT_TYPE, containsString(RestMediaType.APPLICATION_STREAM_JSON));
}
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void accept(Object v, Throwable t) {

private static class ChunkedStreamingMultiSubscriber extends StreamingMultiSubscriber {

private static final String LINE_SEPARATOR = "/n";
private static final String LINE_SEPARATOR = "\n";

private boolean isFirstItem = true;

Expand Down