commit 3ca2468ddd3d34606e34ee08b8698d4ddce84dfe
author janakr <janakr@google.com> Wed Apr 01 09:12:03 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 01 09:13:34 2020 -0700
tree 554dfa7f50983dd1fe116a39ae4ac2e3f1a67fe1
parent 8109991630abfcc28dd8bb22e39bc315627a553f

Remove superfluous BuildEventId Java class. The protobuf is just as good, and it reduces complexity to not have these wrapper classes floating around.

Probably will have no noticeable effect on performance/memory, but can't hurt.

PiperOrigin-RevId: 304197948

src/main/java/com/google/devtools/build/lib/analysis/TargetConfiguredEvent.java

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 d749cba..8fab9fd 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
@@ -17,8 +17,9 @@
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.buildeventstream.BuildEvent;
 import com.google.devtools.build.lib.buildeventstream.BuildEventContext;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
 import com.google.devtools.build.lib.buildeventstream.BuildEventWithConfiguration;
 import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
 import com.google.devtools.build.lib.buildeventstream.NullConfiguration;
@@ -55,7 +56,7 @@
 
   @Override
   public BuildEventId getEventId() {
-    return BuildEventId.targetConfigured(target.getLabel());
+    return BuildEventIdUtil.targetConfigured(target.getLabel());
   }
 
   @Override
@@ -63,10 +64,12 @@
     ImmutableList.Builder<BuildEventId> childrenBuilder = ImmutableList.builder();
     for (BuildConfiguration config : configurations) {
       if (config != null) {
-        childrenBuilder.add(BuildEventId.targetCompleted(target.getLabel(), config.getEventId()));
+        childrenBuilder.add(
+            BuildEventIdUtil.targetCompleted(target.getLabel(), config.getEventId()));
       } else {
         childrenBuilder.add(
-            BuildEventId.targetCompleted(target.getLabel(), BuildEventId.nullConfigurationId()));
+            BuildEventIdUtil.targetCompleted(
+                target.getLabel(), BuildEventIdUtil.nullConfigurationId()));
       }
     }
     return childrenBuilder.build();