Rename TopLevelArtifactProvider to OutputGroupProvider.

--
MOS_MIGRATED_REVID=87596401

4 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 600afdf409..a84bb94c19 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -752,10 +752,10 @@ public class BuildView {
       Collection<ConfiguredTarget> configuredTargets) {
     NestedSetBuilder<Artifact> baselineCoverageArtifacts = NestedSetBuilder.stableOrder();
     for (ConfiguredTarget target : configuredTargets) {
-      TopLevelArtifactProvider provider = target.getProvider(TopLevelArtifactProvider.class);
+      OutputGroupProvider provider = target.getProvider(OutputGroupProvider.class);
       if (provider != null) {
         baselineCoverageArtifacts.addTransitive(provider.getOutputGroup(
-            TopLevelArtifactProvider.BASELINE_COVERAGE
+            OutputGroupProvider.BASELINE_COVERAGE
         ));
       }
     }
@@ -790,8 +790,8 @@ public class BuildView {
       Collection<ConfiguredTarget> targetsToTestExclusive, TopLevelArtifactContext topLevelOptions,
       Collection<ConfiguredTarget> allTestTargets) {
     Set<String> outputGroups = topLevelOptions.outputGroups();
-    if (!outputGroups.contains(TopLevelArtifactProvider.FILES_TO_COMPILE)
-        && !outputGroups.contains(TopLevelArtifactProvider.COMPILATION_PREREQUISITES)
+    if (!outputGroups.contains(OutputGroupProvider.FILES_TO_COMPILE)
+        && !outputGroups.contains(OutputGroupProvider.COMPILATION_PREREQUISITES)
         && allTestTargets != null) {
       scheduleTests(targetsToTest, targetsToTestExclusive, allTestTargets,
           topLevelOptions.runTestsExclusively());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java
index 5b46cc2ce2..40ba247929 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java
@@ -35,7 +35,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
  * not mentioned on the output.
  */
 @Immutable
-public final class TopLevelArtifactProvider implements TransitiveInfoProvider {
+public final class OutputGroupProvider implements TransitiveInfoProvider {
 
   /**
    * Prefix for output groups that are not reported to the user on the terminal output of Blaze when
@@ -87,7 +87,7 @@ public final class TopLevelArtifactProvider implements TransitiveInfoProvider {
 
   private final ImmutableMap<String, NestedSet<Artifact>> outputGroups;
 
-  TopLevelArtifactProvider(ImmutableMap<String, NestedSet<Artifact>> outputGroups) {
+  OutputGroupProvider(ImmutableMap<String, NestedSet<Artifact>> outputGroups) {
     this.outputGroups = outputGroups;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index cf57d700d0..b6f4bfe1f1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -100,7 +100,7 @@ public final class RuleConfiguredTargetBuilder {
     if (runfilesSupport != null) {
       // If a binary is built, build its runfiles, too
       addOutputGroup(
-          TopLevelArtifactProvider.HIDDEN_TOP_LEVEL, runfilesSupport.getRunfilesMiddleman());
+          OutputGroupProvider.HIDDEN_TOP_LEVEL, runfilesSupport.getRunfilesMiddleman());
     } else if (providers.get(RunfilesProvider.class) != null) {
       // If we don't have a RunfilesSupport (probably because this is not a binary rule), we still
       // want to build the files this rule contributes to runfiles of dependent rules so that we
@@ -109,7 +109,7 @@ public final class RuleConfiguredTargetBuilder {
       // Note that this is a best-effort thing: there is .getDataRunfiles() and all the language-
       // specific *RunfilesProvider classes, which we don't add here for reasons that are lost in
       // the mists of time.
-      addOutputGroup(TopLevelArtifactProvider.HIDDEN_TOP_LEVEL,
+      addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL,
           ((RunfilesProvider) providers.get(RunfilesProvider.class))
               .getDefaultRunfiles().getAllArtifacts());
     }
@@ -127,7 +127,7 @@ public final class RuleConfiguredTargetBuilder {
         outputGroups.put(entry.getKey(), entry.getValue().build());
       }
 
-      add(TopLevelArtifactProvider.class, new TopLevelArtifactProvider(outputGroups.build()));
+      add(OutputGroupProvider.class, new OutputGroupProvider(outputGroups.build()));
     }
 
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
index 8a431a6d2c..54edf029a0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
@@ -109,23 +109,23 @@ public final class TopLevelArtifactHelper {
     NestedSetBuilder<Artifact> importantBuilder = NestedSetBuilder.stableOrder();
     NestedSetBuilder<Artifact> allBuilder = NestedSetBuilder.stableOrder();
 
-    TopLevelArtifactProvider topLevelArtifactProvider =
-        target.getProvider(TopLevelArtifactProvider.class);
+    OutputGroupProvider outputGroupProvider =
+        target.getProvider(OutputGroupProvider.class);
 
     for (String outputGroup : context.outputGroups()) {
       NestedSet<Artifact> results = null;
 
-      if (outputGroup.equals(TopLevelArtifactProvider.DEFAULT)) {
+      if (outputGroup.equals(OutputGroupProvider.DEFAULT)) {
         FileProvider fileProvider = target.getProvider(FileProvider.class);
         if (fileProvider != null) {
           results = fileProvider.getFilesToBuild();
         }
-      } else if (topLevelArtifactProvider != null) {
-        results = topLevelArtifactProvider.getOutputGroup(outputGroup);
+      } else if (outputGroupProvider != null) {
+        results = outputGroupProvider.getOutputGroup(outputGroup);
       }
 
       if (results != null) {
-        if (outputGroup.startsWith(TopLevelArtifactProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) {
+        if (outputGroup.startsWith(OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) {
           allBuilder.addTransitive(results);
         } else {
           importantBuilder.addTransitive(results);