From a61956634c71096c04251e9783de3486fc155485 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 9 Mar 2022 13:11:26 +0100 Subject: [PATCH] Resteasy Reactive: Fix line separator for "x-ndjson" and "stream+json". We're wrongly using `/n` instead of `\n`. This was done in https://github.com/quarkusio/quarkus/pull/20908 --- .../reactive/jackson/deployment/test/sse/SseTestCase.java | 8 ++++---- .../reactive/jsonb/deployment/test/sse/SseTestCase.java | 8 ++++---- .../server/handlers/PublisherResponseHandler.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java index 1f29b42de959c..afb909111ba93 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java @@ -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)); } @@ -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)); } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java index 9e00b014c544e..8930a47aa6622 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java @@ -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)); } @@ -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)); } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java index 6fc4b848efb9e..a0d71ceaaca92 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java @@ -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;