diff options
Diffstat (limited to 'src/main/java/com/google')
33 files changed, 65 insertions, 64 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java index eb45ecc701..52ec1096fc 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutedEvent.java @@ -18,7 +18,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; 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.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration; @@ -117,7 +117,7 @@ public class ActionExecutedEvent implements BuildEventWithConfiguration, Progres } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { PathConverter pathConverter = converters.pathConverter(); BuildEventStreamProtos.ActionExecuted.Builder actionBuilder = BuildEventStreamProtos.ActionExecuted.newBuilder() diff --git a/src/main/java/com/google/devtools/build/lib/actions/BuildConfigurationEvent.java b/src/main/java/com/google/devtools/build/lib/actions/BuildConfigurationEvent.java index 96fd9cba38..d4141cf7e0 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/BuildConfigurationEvent.java +++ b/src/main/java/com/google/devtools/build/lib/actions/BuildConfigurationEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.actions; 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.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @@ -40,7 +40,7 @@ public class BuildConfigurationEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters unusedConverters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext unusedConverters) { return eventProto; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java index f1cbe6e743..1ab2f8db26 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.analysis; 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.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; @@ -71,7 +71,7 @@ public class AnalysisFailureEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setAborted( BuildEventStreamProtos.Aborted.newBuilder() diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java index 4b87bf0e47..6cd519fd3a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java @@ -22,7 +22,7 @@ import com.google.devtools.build.lib.actions.EventReportingArtifacts; import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper.ArtifactsInOutputGroup; import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper.ArtifactsToBuild; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.OutputGroup; @@ -120,7 +120,7 @@ public class AspectCompleteEvent } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { ArtifactGroupNamer namer = converters.artifactGroupNamer(); BuildEventStreamProtos.TargetComplete.Builder builder = diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java index a4671e9561..ffee31618d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectConfiguredEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.analysis; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration; @@ -71,7 +71,7 @@ public class AspectConfiguredEvent implements BuildEventWithConfiguration { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.TargetConfigured.Builder builder = BuildEventStreamProtos.TargetConfigured.newBuilder(); return GenericBuildEvent.protoChaining(this).setConfigured(builder.build()).build(); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java index fa6feffba4..41d58ec2ff 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.analysis; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; @@ -58,7 +58,7 @@ public final class BuildInfoEvent implements BuildEventWithOrderConstraint { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.WorkspaceStatus.Builder status = BuildEventStreamProtos.WorkspaceStatus.newBuilder(); for (Map.Entry<String, String> entry : getBuildInfoMap().entrySet()) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java index 044053b671..270f2ee30a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/NoBuildEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.analysis; 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.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; @@ -67,7 +67,7 @@ public final class NoBuildEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.BuildStarted.Builder started = BuildEventStreamProtos.BuildStarted.newBuilder() .setBuildToolVersion(BlazeVersionInfo.instance().getVersion()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index d8b09c99ad..e6f5c3f281 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -29,7 +29,7 @@ import com.google.devtools.build.lib.analysis.test.InstrumentedFilesProvider; import com.google.devtools.build.lib.analysis.test.TestProvider; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.File; @@ -196,7 +196,7 @@ public final class TargetCompleteEvent // field. private static void addImportantOutputs( BuildEventStreamProtos.TargetComplete.Builder builder, - BuildEventConverters converters, + BuildEventContext converters, Iterable<Artifact> artifacts) { addImportantOutputs(builder, Artifact::getRootRelativePathString, converters, artifacts); } @@ -204,7 +204,7 @@ public final class TargetCompleteEvent private static void addImportantOutputs( BuildEventStreamProtos.TargetComplete.Builder builder, Function<Artifact, String> artifactNameFunction, - BuildEventConverters converters, + BuildEventContext converters, Iterable<Artifact> artifacts) { for (Artifact artifact : artifacts) { String name = artifactNameFunction.apply(artifact); @@ -214,7 +214,7 @@ public final class TargetCompleteEvent } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.TargetComplete.Builder builder = BuildEventStreamProtos.TargetComplete.newBuilder(); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java index daa08d9a86..dd015c7ad7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.analysis; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration; @@ -88,7 +88,7 @@ public class TargetConfiguredEvent implements BuildEventWithConfiguration { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.TargetConfigured.Builder builder = BuildEventStreamProtos.TargetConfigured.newBuilder().setTargetKind(target.getTargetKind()); Rule rule = target.getAssociatedRule(); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/VisibilityErrorEvent.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/VisibilityErrorEvent.java index 1859e6dde9..ebb0e4cc4f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/VisibilityErrorEvent.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/VisibilityErrorEvent.java @@ -17,7 +17,7 @@ package com.google.devtools.build.lib.bazel.rules; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration; @@ -49,7 +49,7 @@ public class VisibilityErrorEvent implements BuildEventWithConfiguration { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setAborted( BuildEventStreamProtos.Aborted.newBuilder() diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceTransport.java index a3cafc2bf6..8783ef01df 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceTransport.java @@ -35,7 +35,7 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.devtools.build.lib.buildeventservice.client.BuildEventServiceClient; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent.PayloadCase; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildFinished; @@ -287,7 +287,7 @@ public class BuildEventServiceTransport implements BuildEventTransport { @Override public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) { BuildEventStreamProtos.BuildEvent eventProto = event.asStreamProto( - new BuildEventConverters() { + new BuildEventContext() { @Override public PathConverter pathConverter() { return pathConverter; diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java index 0638c29552..f3edfe7a2d 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java @@ -67,7 +67,7 @@ public class AbortedEvent extends GenericBuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setAborted( BuildEventStreamProtos.Aborted.newBuilder() diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildCompletingEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildCompletingEvent.java index 72b6e085f1..f8d37d8848 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildCompletingEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildCompletingEvent.java @@ -55,7 +55,7 @@ public abstract class BuildCompletingEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.BuildFinished.ExitCode protoExitCode = BuildEventStreamProtos.BuildFinished.ExitCode.newBuilder() .setName(exitCode.name()) diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java index 111561e4f9..de4cfb8c88 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java @@ -29,5 +29,5 @@ public interface BuildEvent extends ChainableEvent, ExtendedEventHandler.Postabl * <p>Provide a presentation of the event according to the specified binary format, as appropriate * protocol buffer. */ - BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters); + BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters); } diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventConverters.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventContext.java index 25571981d9..72422bde41 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventConverters.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventContext.java @@ -18,7 +18,7 @@ package com.google.devtools.build.lib.buildeventstream; * Interface for providing {@link BuildEvent}s with the convertes needed for computing the protobuf * representation. */ -public interface BuildEventConverters { +public interface BuildEventContext { /** * Return the {@link PathConverter} to be used in order to obtain URIs for the the file paths to * be reported in the event. @@ -27,7 +27,8 @@ public interface BuildEventConverters { /** * Return the {@link ArtifactGroupNamer} that can be used to refer to a {@code - * NestedSet<Artifact>} declared via the {@link EventReportingArtifacts} interface. + * NestedSet<Artifact>} declared via the {@link + * com.google.devtools.build.lib.actions.EventReportingArtifacts} interface. */ ArtifactGroupNamer artifactGroupNamer(); } diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java index 8cf96ede22..fe68043eb0 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildToolLogs.java @@ -41,7 +41,7 @@ public class BuildToolLogs implements BuildEventWithOrderConstraint { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.BuildToolLogs.Builder toolLogs = BuildEventStreamProtos.BuildToolLogs.newBuilder(); for (Pair<String, ByteString> direct : directValues) { diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/FetchEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/FetchEvent.java index 40109e1ed6..a2f836d08e 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/FetchEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/FetchEvent.java @@ -45,7 +45,7 @@ public final class FetchEvent implements BuildEvent, ExtendedEventHandler.Progre } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.Fetch fetch = BuildEventStreamProtos.Fetch.newBuilder().setSuccess(success).build(); return GenericBuildEvent.protoChaining(this).setFetch(fetch).build(); diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/GenericBuildEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/GenericBuildEvent.java index 58e85e79cb..b9e70ac547 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/GenericBuildEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/GenericBuildEvent.java @@ -52,7 +52,7 @@ public class GenericBuildEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return protoChaining(this).build(); } } 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 b071f3e06a..59724a021c 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 @@ -35,7 +35,7 @@ public class LastBuildEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return BuildEventStreamProtos.BuildEvent.newBuilder(event.asStreamProto(converters)) .setLastMessage(true) .build(); diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/NullConfiguration.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/NullConfiguration.java index a95e5a3d72..844537b3cb 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/NullConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/NullConfiguration.java @@ -34,7 +34,7 @@ public class NullConfiguration implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setConfiguration(BuildEventStreamProtos.Configuration.getDefaultInstance()) .build(); diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java index a2feece07b..06cd27dc2d 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java @@ -41,7 +41,7 @@ public final class ProgressEvent extends GenericBuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.Progress.Builder builder = BuildEventStreamProtos.Progress.newBuilder(); if (out != null) { builder.setStdout(out); diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java index 5af8cd3306..025fee5809 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventTransport; import com.google.devtools.build.lib.buildeventstream.PathConverter; @@ -43,8 +43,8 @@ public final class BinaryFormatFileTransport extends FileTransport { @Override public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) { checkNotNull(event); - BuildEventConverters converters = - new BuildEventConverters() { + BuildEventContext converters = + new BuildEventContext() { @Override public PathConverter pathConverter() { return pathConverter; 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 3909f2830f..1f9f41e077 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 @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.buildeventstream.transports; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventTransport; import com.google.devtools.build.lib.buildeventstream.PathConverter; import com.google.protobuf.InvalidProtocolBufferException; @@ -43,8 +43,8 @@ public final class JsonFormatFileTransport extends FileTransport { @Override public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) { - BuildEventConverters converters = - new BuildEventConverters() { + BuildEventContext converters = + new BuildEventContext() { @Override public PathConverter pathConverter() { return pathConverter; 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 1640fd9038..24b23c457b 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 @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.buildeventstream.transports; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventTransport; import com.google.devtools.build.lib.buildeventstream.PathConverter; import com.google.protobuf.TextFormat; @@ -44,8 +44,8 @@ public final class TextFormatFileTransport extends FileTransport { @Override public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) { - BuildEventConverters converters = - new BuildEventConverters() { + BuildEventContext converters = + new BuildEventContext() { @Override public PathConverter pathConverter() { return pathConverter; 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 1bcc3acc30..2a92186555 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,7 +17,7 @@ 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.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; @@ -94,7 +94,7 @@ public final class BuildStartingEvent implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.BuildStarted.Builder started = BuildEventStreamProtos.BuildStarted.newBuilder() .setUuid(request.getId().toString()) diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java b/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java index f32336c6b6..e6fd3e1a98 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java +++ b/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.test.TestRunnerAction; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; @@ -185,7 +185,7 @@ public class TestAttempt implements BuildEventWithOrderConstraint { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { PathConverter pathConverter = converters.pathConverter(); BuildEventStreamProtos.TestResult.Builder builder = BuildEventStreamProtos.TestResult.newBuilder(); diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java index b2eb9433e1..e660a5c80e 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java @@ -17,7 +17,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; @@ -114,7 +114,7 @@ public class TargetParsingCompleteEvent implements BuildEventWithOrderConstraint } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setExpanded(BuildEventStreamProtos.PatternExpanded.newBuilder().build()) .build(); diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java index b01706f3c4..adc9b5a37e 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.runtime; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.io.BaseEncoding; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent; @@ -260,7 +260,7 @@ public abstract class CommandLineEvent implements BuildEventWithOrderConstraint } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setStructuredCommandLine( CommandLine.newBuilder() @@ -363,7 +363,7 @@ public abstract class CommandLineEvent implements BuildEventWithOrderConstraint } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setStructuredCommandLine( CommandLine.newBuilder() @@ -392,7 +392,7 @@ public abstract class CommandLineEvent implements BuildEventWithOrderConstraint } @Override - public BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this).setStructuredCommandLine(commandLine).build(); } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/GotOptionsEvent.java b/src/main/java/com/google/devtools/build/lib/runtime/GotOptionsEvent.java index 2193761000..00eee343f7 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/GotOptionsEvent.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/GotOptionsEvent.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.runtime; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; @@ -76,7 +76,7 @@ public class GotOptionsEvent implements BuildEventWithOrderConstraint { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.OptionsParsed.Builder optionsBuilder = BuildEventStreamProtos.OptionsParsed.newBuilder(); diff --git a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java index 5d581e4179..700ab651df 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java @@ -19,7 +19,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.EventReportingArtifacts; import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; import com.google.devtools.build.lib.buildeventstream.BuildEvent; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; @@ -52,7 +52,7 @@ class NamedArtifactGroup implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { PathConverter pathConverter = converters.pathConverter(); ArtifactGroupNamer namer = converters.artifactGroupNamer(); diff --git a/src/main/java/com/google/devtools/build/lib/runtime/OriginalUnstructuredCommandLineEvent.java b/src/main/java/com/google/devtools/build/lib/runtime/OriginalUnstructuredCommandLineEvent.java index 291f1e6f4a..4dd4ad030b 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/OriginalUnstructuredCommandLineEvent.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/OriginalUnstructuredCommandLineEvent.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.runtime; import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; @@ -48,7 +48,7 @@ public class OriginalUnstructuredCommandLineEvent implements BuildEventWithOrder } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { return GenericBuildEvent.protoChaining(this) .setUnstructuredCommandLine( BuildEventStreamProtos.UnstructuredCommandLine.newBuilder().addAllArgs(args).build()) diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java b/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java index 903916eeba..97c66cb8e6 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/TestSummary.java @@ -23,7 +23,7 @@ import com.google.common.collect.MultimapBuilder; import com.google.devtools.build.lib.analysis.AliasProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; -import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; @@ -490,7 +490,7 @@ public class TestSummary implements Comparable<TestSummary>, BuildEventWithOrder } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { PathConverter pathConverter = converters.pathConverter(); BuildEventStreamProtos.TestSummary.Builder summaryBuilder = BuildEventStreamProtos.TestSummary.newBuilder() diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java b/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java index f24f095ef2..99a76c840c 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PatternExpandingError.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skyframe; 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.BuildEventContext; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; @@ -66,7 +66,7 @@ public final class PatternExpandingError implements BuildEvent { } @Override - public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { + public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { BuildEventStreamProtos.Aborted failure = BuildEventStreamProtos.Aborted.newBuilder() .setReason(BuildEventStreamProtos.Aborted.AbortReason.LOADING_FAILURE) |