From 617bb896dc5d2b815449459e991c577237d7a7fc Mon Sep 17 00:00:00 2001 From: aehlig Date: Tue, 4 Apr 2017 15:03:23 +0000 Subject: BEP: provide events a generic converter class Change the BuildEvent interface to accept a generic class of converters. In this way, we won't have to change it again in the future, once more converters are needed. In fact, a new converter is needed right now (will be added in a follow-up patch) to allow build events to know the name of named artifact groups already reported in the stream. Change-Id: Ibb32ea5fff361e21bcf2d34818d8351a1da7a2e3 PiperOrigin-RevId: 152131870 --- .../devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java | 4 ++-- .../devtools/build/lib/buildtool/buildevent/BuildStartingEvent.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/buildtool') diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java index 2412221513..f8e419e65f 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java @@ -18,11 +18,11 @@ import static com.google.devtools.build.lib.util.Preconditions.checkNotNull; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.buildeventstream.BuildEvent; +import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildFinished; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; -import com.google.devtools.build.lib.buildeventstream.PathConverter; import com.google.devtools.build.lib.buildtool.BuildResult; import java.util.Collection; @@ -59,7 +59,7 @@ public final class BuildCompleteEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(PathConverter pathConverter) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { BuildFinished finished = BuildFinished.newBuilder() .setOverallSuccess(result.getSuccess()) diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildStartingEvent.java b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildStartingEvent.java index 01c148d84b..c13723cf67 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildStartingEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildStartingEvent.java @@ -17,10 +17,10 @@ package com.google.devtools.build.lib.buildtool.buildevent; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.BlazeVersionInfo; import com.google.devtools.build.lib.buildeventstream.BuildEvent; +import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; -import com.google.devtools.build.lib.buildeventstream.PathConverter; import com.google.devtools.build.lib.buildeventstream.ProgressEvent; import com.google.devtools.build.lib.buildtool.BuildRequest; import com.google.devtools.build.lib.runtime.CommandEnvironment; @@ -89,7 +89,7 @@ public final class BuildStartingEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(PathConverter pathConverter) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { BuildEventStreamProtos.BuildStarted.Builder started = BuildEventStreamProtos.BuildStarted.newBuilder() .setUuid(request.getId().toString()) -- cgit v1.2.3