From 3a2317bae6b6fc873447ad9fafc901e07d4d550b Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Thu, 4 Jan 2018 11:41:49 +0100 Subject: [PATCH] SONAR-10154 Stream when writing protobuf message --- .../src/main/java/org/sonar/server/ws/WsUtils.java | 2 +- .../src/main/java/org/sonar/api/server/ws/Response.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java index 186880e6802..d028f4879fa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java @@ -52,7 +52,7 @@ public class WsUtils { msg.writeTo(output); } else { response.stream().setMediaType(JSON); - try (JsonWriter writer = JsonWriter.of(new CacheWriter(new OutputStreamWriter(output, UTF_8)))) { + try (JsonWriter writer = JsonWriter.of(new OutputStreamWriter(output, UTF_8))) { ProtobufJsonFormat.write(msg, writer); } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.java index 87720afbe80..eff1334819e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.java @@ -41,11 +41,14 @@ public interface Response { */ Stream setStatus(int httpStatus); + /** + * Response stream. Beware that proper error recovery is not possible. + */ OutputStream output(); } /** - * Non streamable {@link JsonWriter}. Response is written when resource is closed. + * Non streamable {@link JsonWriter}. Response is effectively written when closing the resource. */ JsonWriter newJsonWriter(); -- 2.39.5