commit 75216c74470090c6f720814dbee239ae4102290e
author mschaller <mschaller@google.com> Thu Jun 25 16:04:29 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 25 16:05:51 2020 -0700
tree 39466fce3ace1ece1b263f7de042066f5155fa3c
parent 2634de1aa2f4533be718ed75dd5d21c49355b790

Remove remaining undetailed BuildFailedException constructor

Some loading-phase-related failure modes have placeholder detailed codes
to be improved when loading-phase failures are detailed.

RELNOTES: None.
PiperOrigin-RevId: 318366815

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

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
index ae03826..3c63b34 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
@@ -22,6 +22,7 @@
 import com.google.devtools.build.lib.actions.ActionGraph;
 import com.google.devtools.build.lib.actions.PackageRoots;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
+import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.skyframe.AspectValueKey.AspectKey;
 import java.util.Collection;
 import javax.annotation.Nullable;
@@ -34,7 +35,7 @@
   private final ImmutableSet<ConfiguredTarget> targetsToBuild;
   @Nullable private final ImmutableList<ConfiguredTarget> targetsToTest;
   private final ImmutableSet<ConfiguredTarget> targetsToSkip;
-  @Nullable private final String error;
+  @Nullable private final FailureDetail failureDetail;
   private final ActionGraph actionGraph;
   private final ArtifactsToOwnerLabels topLevelArtifactsToOwnerLabels;
   private final ImmutableSet<ConfiguredTarget> parallelTests;
@@ -52,7 +53,7 @@
       ImmutableMap<AspectKey, ConfiguredAspect> aspects,
       @Nullable ImmutableList<ConfiguredTarget> targetsToTest,
       ImmutableSet<ConfiguredTarget> targetsToSkip,
-      @Nullable String error,
+      @Nullable FailureDetail failureDetail,
       ActionGraph actionGraph,
       ArtifactsToOwnerLabels topLevelArtifactsToOwnerLabels,
       ImmutableSet<ConfiguredTarget> parallelTests,
@@ -67,7 +68,7 @@
     this.aspects = aspects;
     this.targetsToTest = targetsToTest;
     this.targetsToSkip = targetsToSkip;
-    this.error = error;
+    this.failureDetail = failureDetail;
     this.actionGraph = actionGraph;
     this.topLevelArtifactsToOwnerLabels = topLevelArtifactsToOwnerLabels;
     this.parallelTests = parallelTests;
@@ -131,15 +132,14 @@
     return parallelTests;
   }
 
-  /**
-   * Returns an error description (if any).
-   */
-  @Nullable public String getError() {
-    return error;
+  /** Returns a {@link FailureDetail}, if any failures occurred. */
+  @Nullable
+  public FailureDetail getFailureDetail() {
+    return failureDetail;
   }
 
   public boolean hasError() {
-    return error != null;
+    return failureDetail != null;
   }
 
   /**
@@ -176,7 +176,7 @@
         aspects,
         targetsToTest,
         targetsToSkip,
-        error,
+        failureDetail,
         actionGraph,
         topLevelArtifactsToOwnerLabels,
         Sets.union(parallelTests, exclusiveTests).immutableCopy(),