Valid json when using jsonproto output in queries

bazelbuild · Jun 15, 2023 · 86478e4 · 86478e4
1 parent fed23d5
commit 86478e4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...main/java/com/google/devtools/build/lib/query2/query/output/JSONProtoOutputFormatter.java b/...main/java/com/google/devtools/build/lib/query2/query/output/JSONProtoOutputFormatter.java
@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * An output formatter that outputs a protocol buffer json representation of a query result and
@@ -40,10 +42,13 @@ public OutputFormatterCallback<Target> createPostFactoStreamCallback(
       @Override
       public void processOutput(Iterable<Target> partialResult)
           throws IOException, InterruptedException {
+        List<String> jsonProtoBuffers = new ArrayList<>();
         for (Target target : partialResult) {
-          out.write(
-              jsonPrinter.print(toTargetProtoBuffer(target)).getBytes(StandardCharsets.UTF_8));
+          jsonProtoBuffers.add(jsonPrinter.omittingInsignificantWhitespace().print(toTargetProtoBuffer(target)));
         }
+        out.write("[".getBytes(StandardCharsets.UTF_8));
+        out.write(String.join(",", jsonProtoBuffers).getBytes(StandardCharsets.UTF_8));
+        out.write("]".getBytes(StandardCharsets.UTF_8));
       }
     };
   }