diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildeventstream')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/LastBuildEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/LastBuildEvent.java index 767e9140ed..b071f3e06a 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/LastBuildEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/LastBuildEvent.java @@ -24,14 +24,17 @@ public class LastBuildEvent implements BuildEvent { this.event = event; } + @Override public BuildEventId getEventId() { return event.getEventId(); } + @Override public Collection<BuildEventId> getChildrenEvents() { return event.getChildrenEvents(); } + @Override public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { return BuildEventStreamProtos.BuildEvent.newBuilder(event.asStreamProto(converters)) .setLastMessage(true) diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransport.java index e090f55800..eca7d37c7b 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransport.java @@ -22,6 +22,7 @@ import com.google.devtools.build.lib.buildeventstream.PathConverter; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import java.io.IOException; +import java.nio.charset.StandardCharsets; /** * A simple {@link BuildEventTransport} that writes the JSON representation of the protocol-buffer @@ -68,6 +69,6 @@ public final class JsonFormatFileTransport extends FileTransport { protoJsonRepresentation = "{\"id\" : \"unknown\", \"exception\" : \"InvalidProtocolBufferException\"}\n"; } - writeData(protoJsonRepresentation.getBytes()); + writeData(protoJsonRepresentation.getBytes(StandardCharsets.UTF_8)); } } diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java index dc7c2ade65..974dc523d5 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java @@ -21,6 +21,7 @@ import com.google.devtools.build.lib.buildeventstream.BuildEventTransport; import com.google.devtools.build.lib.buildeventstream.PathConverter; import com.google.protobuf.TextFormat; import java.io.IOException; +import java.nio.charset.StandardCharsets; /** * A simple {@link BuildEventTransport} that writes the text representation of the protocol-buffer @@ -58,6 +59,6 @@ public final class TextFormatFileTransport extends FileTransport { }; String protoTextRepresentation = TextFormat.printToString(event.asStreamProto(converters)); String line = "event {\n" + protoTextRepresentation + "}\n\n"; - writeData(line.getBytes()); + writeData(line.getBytes(StandardCharsets.UTF_8)); } } |