commit a708a02680da349c85077acb6d8db21805342416
author Klaus Aehlig <aehlig@google.com> Tue Jul 11 12:54:40 2017 +0200
committer László Csomor <laszlocsomor@google.com> Tue Jul 11 14:47:39 2017 +0200
tree 4e740e29d18d5f4f547c3c424347959966fbddda
parent 7c2279967a619d44848b5384096323fa7529ed08

BuildEventWithConfiguration: represent configurations as BuildEvent

From a BEP point of view, the only interface of a configuration we care
about is its BuildEvent structure. Represent it as such, so that we
can move this class to the rest of the buildeventstream module. This
is a prerequisite for ActionOwners refering to configurations in the
BEP.

Change-Id: I6d1c1bf2951aac91607e83cad664553cd6620df8
PiperOrigin-RevId: 161510049

src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
index cda02a7..83c0891 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
@@ -30,7 +30,6 @@
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
-import com.google.devtools.build.lib.analysis.config.BuildEventWithConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.buildeventstream.AnnounceBuildEventTransportsEvent;
@@ -42,6 +41,7 @@
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId.NamedSetOfFilesId;
 import com.google.devtools.build.lib.buildeventstream.BuildEventTransport;
 import com.google.devtools.build.lib.buildeventstream.BuildEventTransportClosedEvent;
+import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration;
 import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint;
 import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
 import com.google.devtools.build.lib.buildeventstream.PathConverter;
@@ -206,18 +206,16 @@
   private static class GenericConfigurationEvent implements BuildEventWithConfiguration {
     private final BuildEventId id;
     private final Collection<BuildEventId> children;
-    private final Collection<BuildConfiguration> configurations;
+    private final Collection<BuildEvent> configurations;
 
     GenericConfigurationEvent(
-        BuildEventId id,
-        Collection<BuildEventId> children,
-        Collection<BuildConfiguration> configurations) {
+        BuildEventId id, Collection<BuildEventId> children, Collection<BuildEvent> configurations) {
       this.id = id;
       this.children = children;
       this.configurations = configurations;
     }
 
-    GenericConfigurationEvent(BuildEventId id, BuildConfiguration configuration) {
+    GenericConfigurationEvent(BuildEventId id, BuildEvent configuration) {
       this(id, ImmutableSet.<BuildEventId>of(), ImmutableSet.of(configuration));
     }
 
@@ -232,7 +230,7 @@
     }
 
     @Override
-    public Collection<BuildConfiguration> getConfigurations() {
+    public Collection<BuildEvent> getConfigurations() {
       return configurations;
     }