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

PiperOrigin-RevId: 195100670

1 files changed, 3 insertions, 4 deletions

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());
     }