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

PiperOrigin-RevId: 195040539

4 files changed, 5 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java b/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java
index 233f374c44..98fc311ed2 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java
@@ -36,7 +36,6 @@ import java.util.ArrayList;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Queue;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -461,7 +460,7 @@ public final class Profiler {
         Map<String, ? extends Predicate<? super String>> vfsHeuristics =
             VfsHeuristics.vfsTypeHeuristics;
         List<RecorderAndPredicate> recorders = new ArrayList<>(vfsHeuristics.size());
-        for (Entry<String, ? extends Predicate<? super String>> e : vfsHeuristics.entrySet()) {
+        for (Map.Entry<String, ? extends Predicate<? super String>> e : vfsHeuristics.entrySet()) {
           recorders.add(new RecorderAndPredicate(
               new SingleStatRecorder(task + " " + e.getKey(), HISTOGRAM_BUCKETS), e.getValue()));
         }
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java b/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java
index 530547db8f..ccb353c063 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java
@@ -32,7 +32,6 @@ import com.google.monitoring.runtime.instrumentation.Sampler;
 import com.google.perftools.profiles.ProfileProto.Function;
 import com.google.perftools.profiles.ProfileProto.Line;
 import com.google.perftools.profiles.ProfileProto.Profile;
-import com.google.perftools.profiles.ProfileProto.Profile.Builder;
 import com.google.perftools.profiles.ProfileProto.Sample;
 import com.google.perftools.profiles.ProfileProto.ValueType;
 import java.io.FileOutputStream;
@@ -342,7 +341,7 @@ public class AllocationTracker implements Sampler {
     final Map<String, Long> table = new HashMap<>();
     long index = 1; // 0 is reserved
 
-    LocationTable(Builder profile, FunctionTable functionTable) {
+    LocationTable(Profile.Builder profile, FunctionTable functionTable) {
       this.profile = profile;
       this.functionTable = functionTable;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/output/SkylarkHtml.java b/src/main/java/com/google/devtools/build/lib/profiler/output/SkylarkHtml.java
index d01f93e9e7..b560e1f345 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/output/SkylarkHtml.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/output/SkylarkHtml.java
@@ -18,11 +18,9 @@ import com.google.common.base.StandardSystemProperty;
 import com.google.devtools.build.lib.profiler.statistics.SkylarkStatistics;
 import com.google.devtools.build.lib.profiler.statistics.TasksStatistics;
 import com.google.devtools.build.lib.util.LongArrayList;
-
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * Formats {@link SkylarkStatistics} as HTML tables and histogram charts.
@@ -165,7 +163,7 @@ public final class SkylarkHtml extends HtmlPrinter {
   private void printHistogramData(Map<String, LongArrayList> functionDurations, String category) {
     lnPrintf("'%s': {", category);
     down();
-    for (Entry<String, LongArrayList> entry : functionDurations.entrySet()) {
+    for (Map.Entry<String, LongArrayList> entry : functionDurations.entrySet()) {
       String function = entry.getKey();
       LongArrayList durations = entry.getValue();
       lnPrintf("'%s': google.visualization.arrayToDataTable(", function);
@@ -211,7 +209,7 @@ public final class SkylarkHtml extends HtmlPrinter {
       lnPrintf("%s.addColumn('number', 'relative (%%)');", tmpVar);
       lnPrintf("%s.addRows([", tmpVar);
       down();
-      for (Entry<String, TasksStatistics> entry : taskStatistics.entrySet()) {
+      for (Map.Entry<String, TasksStatistics> entry : taskStatistics.entrySet()) {
         String function = entry.getKey();
         TasksStatistics stats = entry.getValue();
         TasksStatistics selfStats = taskSelfStatistics.get(function);
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/statistics/SkylarkStatistics.java b/src/main/java/com/google/devtools/build/lib/profiler/statistics/SkylarkStatistics.java
index 4dff2723d4..ff98837f8d 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/statistics/SkylarkStatistics.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/statistics/SkylarkStatistics.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.lib.util.LongArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * Extracts the execution times of user-defined and built-in Skylark functions and computes
@@ -208,7 +207,7 @@ public final class SkylarkStatistics {
       Map<String, LongArrayList> durationsMap,
       Map<String, LongArrayList> selfDurationsMap) {
     long totalTime = 0;
-    for (Entry<String, Collection<Task>> entry : functionTasks.asMap().entrySet()) {
+    for (Map.Entry<String, Collection<Task>> entry : functionTasks.asMap().entrySet()) {
       String function = entry.getKey();
       Collection<Task> tasks = entry.getValue();
       LongArrayList durations;