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

PiperOrigin-RevId: 195100670

4 files changed, 16 insertions, 20 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java
index e4a4193d57..43068fe839 100644
--- a/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java
@@ -34,7 +34,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 import javax.annotation.Nullable;
@@ -238,7 +237,7 @@ public abstract class AbstractExceptionalParallelEvaluator<E extends Exception>
           evaluatorContext.getProgressReceiver());
     }
     try {
-      for (Entry<SkyKey, ? extends NodeEntry> e :
+      for (Map.Entry<SkyKey, ? extends NodeEntry> e :
           graph.createIfAbsentBatch(null, Reason.PRE_OR_POST_EVALUATION, skyKeys).entrySet()) {
         SkyKey skyKey = e.getKey();
         NodeEntry entry = e.getValue();
@@ -650,7 +649,7 @@ public abstract class AbstractExceptionalParallelEvaluator<E extends Exception>
       throws InterruptedException {
     Map<SkyKey, ? extends NodeEntry> prevNodeEntries =
         graph.createIfAbsentBatch(null, Reason.OTHER, injectionMap.keySet());
-    for (Entry<SkyKey, SkyValue> injectionEntry : injectionMap.entrySet()) {
+    for (Map.Entry<SkyKey, SkyValue> injectionEntry : injectionMap.entrySet()) {
       SkyKey key = injectionEntry.getKey();
       SkyValue value = injectionEntry.getValue();
       NodeEntry prevEntry = prevNodeEntries.get(key);
diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
index 40ed157180..bc6e01f346 100644
--- a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
@@ -38,7 +38,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 import java.util.logging.Logger;
@@ -226,7 +225,7 @@ public abstract class AbstractParallelEvaluator {
           // a child error.
           Map<SkyKey, ? extends NodeEntry> entriesToCheck =
               graph.getBatch(skyKey, Reason.OTHER, directDepsToCheck);
-          for (Entry<SkyKey, ? extends NodeEntry> entry : entriesToCheck.entrySet()) {
+          for (Map.Entry<SkyKey, ? extends NodeEntry> entry : entriesToCheck.entrySet()) {
             if (entry.getValue().isDone() && entry.getValue().getErrorInfo() != null) {
               // If any child has an error, we arbitrarily add a dep on the first one (needed
               // for error bubbling) and throw an exception coming from it.
@@ -235,7 +234,7 @@ public abstract class AbstractParallelEvaluator {
               state.addTemporaryDirectDeps(GroupedListHelper.create(errorKey));
               errorEntry.checkIfDoneForDirtyReverseDep(skyKey);
               // Perform the necessary bookkeeping for any deps that are not being used.
-              for (Entry<SkyKey, ? extends NodeEntry> depEntry : entriesToCheck.entrySet()) {
+              for (Map.Entry<SkyKey, ? extends NodeEntry> depEntry : entriesToCheck.entrySet()) {
                 if (!depEntry.getKey().equals(errorKey)) {
                   depEntry.getValue().removeReverseDep(skyKey);
                 }
@@ -563,7 +562,7 @@ public abstract class AbstractParallelEvaluator {
                 graph.createIfAbsentBatchAsync(
                     skyKey, Reason.RDEP_ADDITION, newDepsThatWerentInTheLastEvaluation);
 
-        for (Entry<SkyKey, ? extends NodeEntry> e :
+        for (Map.Entry<SkyKey, ? extends NodeEntry> e :
             graph
                 .getBatch(skyKey, Reason.ENQUEUING_CHILD, newDepsThatWereInTheLastEvaluation)
                 .entrySet()) {
@@ -572,7 +571,7 @@ public abstract class AbstractParallelEvaluator {
           enqueueChild(skyKey, state, newDirectDep, newDirectDepEntry, /*depAlreadyExists=*/ true);
         }
 
-        for (Entry<SkyKey, ? extends NodeEntry> e :
+        for (Map.Entry<SkyKey, ? extends NodeEntry> e :
             newDepsThatWerentInTheLastEvaluationNodes.get().entrySet()) {
           SkyKey newDirectDep = e.getKey();
           NodeEntry newDirectDepEntry = e.getValue();
@@ -694,7 +693,7 @@ public abstract class AbstractParallelEvaluator {
     InterruptibleSupplier<Map<SkyKey, ? extends NodeEntry>> newlyAddedNewDepNodes =
         graph.getBatchAsync(skyKey, Reason.RDEP_ADDITION, newlyAddedNewDeps);
 
-    for (Entry<SkyKey, ? extends NodeEntry> newDep :
+    for (Map.Entry<SkyKey, ? extends NodeEntry> newDep :
         graph.getBatch(skyKey, Reason.SIGNAL_DEP, previouslyRegisteredNewDeps).entrySet()) {
       // Note that this depEntry can't be null. In a keep-going build, we expect all deps to be
       // done. In a non-keep-going build, If env.newlyRequestedDeps contained a key with a
diff --git a/src/main/java/com/google/devtools/build/skyframe/DelegatingWalkableGraph.java b/src/main/java/com/google/devtools/build/skyframe/DelegatingWalkableGraph.java
index e70b3a7556..8c7b901096 100644
--- a/src/main/java/com/google/devtools/build/skyframe/DelegatingWalkableGraph.java
+++ b/src/main/java/com/google/devtools/build/skyframe/DelegatingWalkableGraph.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Maps;
 import com.google.devtools.build.skyframe.QueryableGraph.Reason;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import javax.annotation.Nullable;
 
 /**
@@ -57,7 +56,7 @@ public class DelegatingWalkableGraph implements WalkableGraph {
     Map<SkyKey, ? extends NodeEntry> batchGet =
         graph.getBatch(null, Reason.WALKABLE_GRAPH_VALUE, keys);
     Map<SkyKey, SkyValue> result = Maps.newHashMapWithExpectedSize(batchGet.size());
-    for (Entry<SkyKey, ? extends NodeEntry> entryPair : batchGet.entrySet()) {
+    for (Map.Entry<SkyKey, ? extends NodeEntry> entryPair : batchGet.entrySet()) {
       SkyValue value = getValue(entryPair.getValue());
       if (value != null) {
         result.put(entryPair.getKey(), value);
@@ -113,7 +112,7 @@ public class DelegatingWalkableGraph implements WalkableGraph {
     Map<SkyKey, ? extends NodeEntry> entries =
         graph.getBatch(null, Reason.WALKABLE_GRAPH_DEPS, keys);
     Map<SkyKey, Iterable<SkyKey>> result = new HashMap<>(entries.size());
-    for (Entry<SkyKey, ? extends NodeEntry> entry : entries.entrySet()) {
+    for (Map.Entry<SkyKey, ? extends NodeEntry> entry : entries.entrySet()) {
       Preconditions.checkState(entry.getValue().isDone(), entry);
       result.put(entry.getKey(), entry.getValue().getDirectDeps());
     }
@@ -126,7 +125,7 @@ public class DelegatingWalkableGraph implements WalkableGraph {
     Map<SkyKey, ? extends NodeEntry> entries =
         graph.getBatch(null, Reason.WALKABLE_GRAPH_RDEPS, keys);
     Map<SkyKey, Iterable<SkyKey>> result = new HashMap<>(entries.size());
-    for (Entry<SkyKey, ? extends NodeEntry> entry : entries.entrySet()) {
+    for (Map.Entry<SkyKey, ? extends NodeEntry> entry : entries.entrySet()) {
       Preconditions.checkState(entry.getValue().isDone(), entry);
       result.put(entry.getKey(), entry.getValue().getReverseDepsForDoneEntry());
     }
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
index 923c71242a..a035c0374c 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Nullable;
@@ -118,9 +117,9 @@ public final class InMemoryMemoizingEvaluator implements MemoizingEvaluator {
     valuesToDelete.addAll(
         Maps.filterEntries(
                 graph.getAllValues(),
-                new Predicate<Entry<SkyKey, ? extends NodeEntry>>() {
+                new Predicate<Map.Entry<SkyKey, ? extends NodeEntry>>() {
                   @Override
-                  public boolean apply(Entry<SkyKey, ? extends NodeEntry> input) {
+                  public boolean apply(Map.Entry<SkyKey, ? extends NodeEntry> input) {
                     Preconditions.checkNotNull(input.getKey(), "Null SkyKey in entry: %s", input);
                     return input.getValue().isDirty() || deletePredicate.apply(input.getKey());
                   }
@@ -206,9 +205,9 @@ public final class InMemoryMemoizingEvaluator implements MemoizingEvaluator {
    * graph.
    */
   private void pruneInjectedValues(Map<SkyKey, SkyValue> valuesToInject) {
-    for (Iterator<Entry<SkyKey, SkyValue>> it = valuesToInject.entrySet().iterator();
-        it.hasNext();) {
-      Entry<SkyKey, SkyValue> entry = it.next();
+    for (Iterator<Map.Entry<SkyKey, SkyValue>> it = valuesToInject.entrySet().iterator();
+        it.hasNext(); ) {
+      Map.Entry<SkyKey, SkyValue> entry = it.next();
       SkyKey key = entry.getKey();
       SkyValue newValue = entry.getValue();
       NodeEntry prevEntry = graph.get(null, Reason.OTHER, key);
@@ -353,7 +352,7 @@ public final class InMemoryMemoizingEvaluator implements MemoizingEvaluator {
             }
           };
 
-      for (Entry<SkyKey, ? extends NodeEntry> mapPair : graph.getAllValues().entrySet()) {
+      for (Map.Entry<SkyKey, ? extends NodeEntry> mapPair : graph.getAllValues().entrySet()) {
         SkyKey key = mapPair.getKey();
         NodeEntry entry = mapPair.getValue();
         if (entry.isDone()) {