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

PiperOrigin-RevId: 194999124

7 files changed, 17 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
index 8c68b2655e..6e1679c277 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
@@ -38,7 +38,7 @@ import com.google.devtools.build.lib.packages.AspectDescriptor;
 import com.google.devtools.build.lib.skyframe.AspectValue;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -106,7 +106,7 @@ public class ActionGraphDump {
       // TODO(twerth): This handles the fixed environment. We probably want to output the inherited
       // environment as well.
       ImmutableMap<String, String> fixedEnvironment = spawnAction.getEnvironment();
-      for (Entry<String, String> environmentVariable : fixedEnvironment.entrySet()) {
+      for (Map.Entry<String, String> environmentVariable : fixedEnvironment.entrySet()) {
         AnalysisProtos.KeyValuePair.Builder keyValuePairBuilder =
             AnalysisProtos.KeyValuePair.newBuilder();
         keyValuePairBuilder
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java
index cf72c320df..7988cf25d8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java
@@ -15,14 +15,14 @@ package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 
 /**
  * Cache for Artifacts in the action graph.
  */
 public class KnownArtifacts extends BaseCache<Artifact, AnalysisProtos.Artifact> {
 
-  KnownArtifacts(Builder actionGraphBuilder) {
+  KnownArtifacts(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java
index 137d553563..e998ac4667 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java
@@ -14,10 +14,10 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.analysis.AnalysisProtos.KeyValuePair;
 import com.google.devtools.build.lib.packages.AspectDescriptor;
-import java.util.Map.Entry;
+import java.util.Map;
 
 /**
  * Cache for AspectDescriptors in the action graph.
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
 public class KnownAspectDescriptors
     extends BaseCache<AspectDescriptor, AnalysisProtos.AspectDescriptor> {
 
-  KnownAspectDescriptors(Builder actionGraphBuilder) {
+  KnownAspectDescriptors(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
@@ -35,7 +35,7 @@ public class KnownAspectDescriptors
         AnalysisProtos.AspectDescriptor.newBuilder()
             .setId(id)
             .setName(aspectDescriptor.getAspectClass().getName());
-    for (Entry<String, String> parameter :
+    for (Map.Entry<String, String> parameter :
         aspectDescriptor.getParameters().getAttributes().entries()) {
       KeyValuePair.Builder keyValuePairBuilder = KeyValuePair.newBuilder();
       keyValuePairBuilder.setKey(parameter.getKey()).setValue(parameter.getValue());
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java
index 6083d0bac3..59626a73a6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java
@@ -14,14 +14,14 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.buildeventstream.BuildEvent;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
 
 /** Cache for BuildConfigurations in the action graph. */
 public class KnownConfigurations extends BaseCache<BuildEvent, AnalysisProtos.Configuration> {
 
-  KnownConfigurations(Builder actionGraphBuilder) {
+  KnownConfigurations(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java
index ccd433cca5..59e49eb9ff 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
 
 /**
@@ -24,7 +24,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
 public class KnownNestedSets extends BaseCache<Object, AnalysisProtos.DepSetOfFiles> {
   private final KnownArtifacts knownArtifacts;
 
-  KnownNestedSets(Builder actionGraphBuilder, KnownArtifacts knownArtifacts) {
+  KnownNestedSets(ActionGraphContainer.Builder actionGraphBuilder, KnownArtifacts knownArtifacts) {
     super(actionGraphBuilder);
     this.knownArtifacts = knownArtifacts;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java
index 0b0eb6d05c..dd603dca5a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java
@@ -14,14 +14,14 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 
 /**
  * Cache for RuleClassStrings in the action graph.
  */
 public class KnownRuleClassStrings extends BaseCache<String, AnalysisProtos.RuleClass> {
 
-  KnownRuleClassStrings(Builder actionGraphBuilder) {
+  KnownRuleClassStrings(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java
index afa52ce57e..12005f5b34 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
 import com.google.devtools.build.lib.cmdline.Label;
 
@@ -26,7 +26,8 @@ public class KnownRuleConfiguredTargets
 
   private final KnownRuleClassStrings knownRuleClassStrings;
 
-  KnownRuleConfiguredTargets(Builder actionGraphBuilder,
+  KnownRuleConfiguredTargets(
+      ActionGraphContainer.Builder actionGraphBuilder,
       KnownRuleClassStrings knownRuleClassStrings) {
     super(actionGraphBuilder);
     this.knownRuleClassStrings = knownRuleClassStrings;