Clean up code that directly imports nested classes like Builder, Entry, etc.

PiperOrigin-RevId: 194985157

6 files changed, 53 insertions, 42 deletions

diff --git a/src/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java b/src/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java
index e99abc49d9..64dd871511 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java
@@ -16,11 +16,11 @@ package com.google.devtools.build.android.desugar.dependencies;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.android.desugar.proto.DesugarDeps;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.Dependency;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.DesugarDepsInfo;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceDetails;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceWithCompanion;
-import com.google.devtools.build.android.desugar.proto.DesugarDeps.Type;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -103,8 +103,8 @@ public class MetadataCollectorTest {
                 .build());
   }
 
-  private static Type wrapType(String name) {
-    return Type.newBuilder().setBinaryName(name).build();
+  private static DesugarDeps.Type wrapType(String name) {
+    return DesugarDeps.Type.newBuilder().setBinaryName(name).build();
   }
 
   private DesugarDepsInfo extractProto(MetadataCollector collector) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java b/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java
index bcc9e7892b..012e120139 100644
--- a/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java
+++ b/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java
@@ -18,14 +18,11 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.devtools.build.lib.cmdline.TargetPattern.ContainsTBDForTBDResult;
-import com.google.devtools.build.lib.cmdline.TargetPattern.Type;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for {@link TargetPattern}.
- */
+/** Tests for {@link com.google.devtools.build.lib.cmdline.TargetPattern}. */
 @RunWith(JUnit4.class)
 public class TargetPatternTest {
 
@@ -89,10 +86,11 @@ public class TargetPatternTest {
   @Test
   public void testTargetsBelowDirectoryContainsColonStar() throws Exception {
     // Given an outer pattern '//foo/...', that matches rules only,
-    TargetPattern outerPattern = parseAsExpectedType("//foo/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern outerPattern =
+        parseAsExpectedType("//foo/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // And a nested inner pattern '//foo/bar/...:*', that matches all targets,
     TargetPattern innerPattern =
-        parseAsExpectedType("//foo/bar/...:*", Type.TARGETS_BELOW_DIRECTORY);
+        parseAsExpectedType("//foo/bar/...:*", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // Then a directory exclusion would exactly describe the subtraction of the inner pattern from
     // the outer pattern,
     assertThat(outerPattern.containsTBDForTBD(innerPattern))
@@ -105,10 +103,11 @@ public class TargetPatternTest {
   @Test
   public void testTargetsBelowDirectoryColonStarContains() throws Exception {
     // Given an outer pattern '//foo/...:*', that matches all targets,
-    TargetPattern outerPattern = parseAsExpectedType("//foo/...:*", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern outerPattern =
+        parseAsExpectedType("//foo/...:*", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // And a nested inner pattern '//foo/bar/...', that matches rules only,
     TargetPattern innerPattern =
-        parseAsExpectedType("//foo/bar/...", Type.TARGETS_BELOW_DIRECTORY);
+        parseAsExpectedType("//foo/bar/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // Then a directory exclusion would be too broad,
     assertThat(outerPattern.containsTBDForTBD(innerPattern))
         .isEqualTo(ContainsTBDForTBDResult.DIRECTORY_EXCLUSION_WOULD_BE_TOO_BROAD);
@@ -120,9 +119,11 @@ public class TargetPatternTest {
   @Test
   public void testTargetsBelowDirectoryContainsNestedPatterns() throws Exception {
     // Given an outer pattern '//foo/...',
-    TargetPattern outerPattern = parseAsExpectedType("//foo/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern outerPattern =
+        parseAsExpectedType("//foo/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // And a nested inner pattern '//foo/bar/...',
-    TargetPattern innerPattern = parseAsExpectedType("//foo/bar/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern innerPattern =
+        parseAsExpectedType("//foo/bar/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // Then the outer pattern contains the inner pattern,
     assertThat(outerPattern.containsTBDForTBD(innerPattern))
         .isEqualTo(ContainsTBDForTBDResult.DIRECTORY_EXCLUSION_WOULD_BE_EXACT);
@@ -134,9 +135,11 @@ public class TargetPatternTest {
   @Test
   public void testTargetsBelowDirectoryIsExcludableFromForIndependentPatterns() throws Exception {
     // Given a pattern '//foo/...',
-    TargetPattern patternFoo = parseAsExpectedType("//foo/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern patternFoo =
+        parseAsExpectedType("//foo/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // And a pattern '//bar/...',
-    TargetPattern patternBar = parseAsExpectedType("//bar/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern patternBar =
+        parseAsExpectedType("//bar/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
     // Then neither pattern contains the other.
     assertThat(patternFoo.containsTBDForTBD(patternBar)).isEqualTo(ContainsTBDForTBDResult.OTHER);
     assertThat(patternBar.containsTBDForTBD(patternFoo)).isEqualTo(ContainsTBDForTBDResult.OTHER);
@@ -145,13 +148,17 @@ public class TargetPatternTest {
   @Test
   public void testTargetsBelowDirectoryContainsForOtherPatternTypes() throws Exception {
     // Given a TargetsBelowDirectory pattern, tbdFoo of '//foo/...',
-    TargetPattern tbdFoo = parseAsExpectedType("//foo/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern tbdFoo =
+        parseAsExpectedType("//foo/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
 
     // And target patterns of each type other than TargetsBelowDirectory, e.g. 'foo/bar',
     // '//foo:bar', and 'foo:all',
-    TargetPattern pathAsTargetPattern = parseAsExpectedType("foo/bar", Type.PATH_AS_TARGET);
-    TargetPattern singleTargetPattern = parseAsExpectedType("//foo:bar", Type.SINGLE_TARGET);
-    TargetPattern targetsInPackagePattern = parseAsExpectedType("foo:all", Type.TARGETS_IN_PACKAGE);
+    TargetPattern pathAsTargetPattern =
+        parseAsExpectedType("foo/bar", TargetPattern.Type.PATH_AS_TARGET);
+    TargetPattern singleTargetPattern =
+        parseAsExpectedType("//foo:bar", TargetPattern.Type.SINGLE_TARGET);
+    TargetPattern targetsInPackagePattern =
+        parseAsExpectedType("foo:all", TargetPattern.Type.TARGETS_IN_PACKAGE);
 
     // Then the non-TargetsBelowDirectory patterns do not contain tbdFoo.
     assertThat(pathAsTargetPattern.containsTBDForTBD(tbdFoo))
@@ -174,16 +181,19 @@ public class TargetPatternTest {
   @Test
   public void testTargetsBelowDirectoryDoesNotContainCoincidentPrefixPatterns() throws Exception {
     // Given a TargetsBelowDirectory pattern, tbdFoo of '//foo/...',
-    TargetPattern tbdFoo = parseAsExpectedType("//foo/...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern tbdFoo =
+        parseAsExpectedType("//foo/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
 
     // And target patterns with prefixes equal to the directory of the TBD pattern, but not below
     // it,
     TargetPattern targetsBelowDirectoryPattern =
-        parseAsExpectedType("//food/...", Type.TARGETS_BELOW_DIRECTORY);
-    TargetPattern pathAsTargetPattern = parseAsExpectedType("food/bar", Type.PATH_AS_TARGET);
-    TargetPattern singleTargetPattern = parseAsExpectedType("//food:bar", Type.SINGLE_TARGET);
+        parseAsExpectedType("//food/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern pathAsTargetPattern =
+        parseAsExpectedType("food/bar", TargetPattern.Type.PATH_AS_TARGET);
+    TargetPattern singleTargetPattern =
+        parseAsExpectedType("//food:bar", TargetPattern.Type.SINGLE_TARGET);
     TargetPattern targetsInPackagePattern =
-        parseAsExpectedType("food:all", Type.TARGETS_IN_PACKAGE);
+        parseAsExpectedType("food:all", TargetPattern.Type.TARGETS_IN_PACKAGE);
 
     // Then the non-TargetsBelowDirectory patterns are not contained by tbdFoo.
     assertThat(tbdFoo.containsTBDForTBD(targetsBelowDirectoryPattern))
@@ -199,14 +209,19 @@ public class TargetPatternTest {
   @Test
   public void testDepotRootTargetsBelowDirectoryContainsPatterns() throws Exception {
     // Given a TargetsBelowDirectory pattern, tbdDepot of '//...',
-    TargetPattern tbdDepot = parseAsExpectedType("//...", Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern tbdDepot =
+        parseAsExpectedType("//...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
 
     // And target patterns of each type other than TargetsBelowDirectory, e.g. 'foo/bar',
     // '//foo:bar', and 'foo:all',
-    TargetPattern tbdFoo = parseAsExpectedType("//foo/...", Type.TARGETS_BELOW_DIRECTORY);
-    TargetPattern pathAsTargetPattern = parseAsExpectedType("foo/bar", Type.PATH_AS_TARGET);
-    TargetPattern singleTargetPattern = parseAsExpectedType("//foo:bar", Type.SINGLE_TARGET);
-    TargetPattern targetsInPackagePattern = parseAsExpectedType("foo:all", Type.TARGETS_IN_PACKAGE);
+    TargetPattern tbdFoo =
+        parseAsExpectedType("//foo/...", TargetPattern.Type.TARGETS_BELOW_DIRECTORY);
+    TargetPattern pathAsTargetPattern =
+        parseAsExpectedType("foo/bar", TargetPattern.Type.PATH_AS_TARGET);
+    TargetPattern singleTargetPattern =
+        parseAsExpectedType("//foo:bar", TargetPattern.Type.SINGLE_TARGET);
+    TargetPattern targetsInPackagePattern =
+        parseAsExpectedType("foo:all", TargetPattern.Type.TARGETS_IN_PACKAGE);
 
     // Then the patterns are contained by tbdDepot, and do not contain tbdDepot.
     assertThat(tbdDepot.containsTBDForTBD(tbdFoo))
@@ -233,7 +248,7 @@ public class TargetPatternTest {
     return TargetPattern.defaultParser().parse(pattern);
   }
 
-  private static TargetPattern parseAsExpectedType(String pattern, Type expectedType)
+  private static TargetPattern parseAsExpectedType(String pattern, TargetPattern.Type expectedType)
       throws TargetParsingException {
     TargetPattern parsedPattern = parse(pattern);
     assertThat(parsedPattern.getType()).isEqualTo(expectedType);
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index 6fa2949ec4..13bcfaa803 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -26,7 +26,6 @@ import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
 import com.google.devtools.build.lib.packages.GlobCache;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Package.Builder;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.PackageFactory.LegacyGlobber;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
@@ -156,7 +155,7 @@ public class PackageFactoryApparatus {
         factory.newExternalPackageBuilder(
                 buildFile.getParentDirectory().getRelative("WORKSPACE"), "TESTING")
             .build();
-    Builder resultBuilder =
+    Package.Builder resultBuilder =
         factory.evaluateBuildFile(
             externalPkg.getWorkspaceName(),
             packageId,
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagSetterRule.java b/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagSetterRule.java
index 97ee6d78fa..060fa4e8f8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagSetterRule.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagSetterRule.java
@@ -35,13 +35,12 @@ import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 
 /** Rule introducing a transition to set feature flags for itself and dependencies. */
 public final class FeatureFlagSetterRule implements RuleDefinition, RuleConfiguredTargetFactory {
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
     return builder
         .requiresConfigurationFragments(ConfigFeatureFlagConfiguration.class)
         .cfg(new ConfigFeatureFlagTransitionFactory("flag_values"))
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
index c57c82442c..9778050d01 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.rules.cpp.CcCommon.CoptsFilter;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
-import com.google.devtools.build.lib.rules.cpp.CompileCommandLine.Builder;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction.DotdFile;
 import com.google.devtools.build.lib.vfs.Path;
 import java.io.IOException;
@@ -32,10 +31,10 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /**
- * Tests for {@link CompileCommandLine}, for example testing the ordering of individual command
- * line flags, or that command line is emitted differently subject to the presence of certain
- * build variables. Also used to test migration logic (removing hardcoded flags and expressing
- * them using feature configuration.
+ * Tests for {@link com.google.devtools.build.lib.rules.cpp.CompileCommandLine}, for example testing
+ * the ordering of individual command line flags, or that command line is emitted differently
+ * subject to the presence of certain build variables. Also used to test migration logic (removing
+ * hardcoded flags and expressing them using feature configuration.
  */
 @RunWith(JUnit4.class)
 public class CompileCommandLineTest extends BuildViewTestCase {
@@ -136,7 +135,7 @@ public class CompileCommandLineTest extends BuildViewTestCase {
     return compileCommandLine.getArguments(/* overwrittenVariables= */ null);
   }
 
-  private Builder makeCompileCommandLineBuilder() throws Exception {
+  private CompileCommandLine.Builder makeCompileCommandLineBuilder() throws Exception {
     return CompileCommandLine.builder(
         scratchArtifact("a/FakeInput"),
         CoptsFilter.alwaysPasses(),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
index a0d9c80659..f1ab983aee 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo.Builder;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 
@@ -40,7 +39,7 @@ public final class MockCppSemantics implements CppSemantics {
 
   @Override
   public void setupCcCompilationContextInfo(
-      RuleContext ruleContext, Builder ccCompilationContextInfoBuilder) {}
+      RuleContext ruleContext, CcCompilationContextInfo.Builder ccCompilationContextInfoBuilder) {}
 
   @Override
   public NestedSet<Artifact> getAdditionalPrunableIncludes() {