summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2018-01-04 11:41:49 +0100
committerTeryk Bellahsene <teryk@users.noreply.github.com>2018-01-08 18:54:38 +0100
commit3a2317bae6b6fc873447ad9fafc901e07d4d550b (patch)
treeb3e182f1e05ec05f1291015cf873e18b0db481e2
parent7b5b6416320b7dd3d13fc2b28709dc709abb2795 (diff)
downloadsonarqube-3a2317bae6b6fc873447ad9fafc901e07d4d550b.tar.gz
sonarqube-3a2317bae6b6fc873447ad9fafc901e07d4d550b.zip
SONAR-10154 Stream when writing protobuf message
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java2
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.java5
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();