commit cecb3a8887eec0bdd07fadf36d7f8a181801c6bd
author jcater <jcater@google.com> Tue May 01 14:37:48 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue May 01 14:39:40 2018 -0700
tree 41dad407b9ebf7244d95eabb51d825f188a3410d
parent 36745914cc043df70e8c50c975ef125593406c8a

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

PiperOrigin-RevId: 194998981

src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java
index e438d91..7215ffe 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java
@@ -43,7 +43,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import javax.annotation.Nullable;
 
@@ -84,7 +83,7 @@
       TProcessedTargets processedTargets,
       EventHandler eventHandler,
       TargetAndErrorIfAny targetAndErrorIfAny,
-      Iterable<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>>
+      Iterable<Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>>
           depEntries)
       throws InterruptedException;
 
@@ -140,9 +139,11 @@
     // made to skyframe for building this node was for the corresponding PackageValue.
     Iterable<SkyKey> labelAspectKeys =
         getStrictLabelAspectDepKeys(env, depMap, targetAndErrorIfAny);
-    Set<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>>
-        labelAspectEntries = env.getValuesOrThrow(labelAspectKeys, NoSuchPackageException.class,
-        NoSuchTargetException.class).entrySet();
+    Set<Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>>
+        labelAspectEntries =
+            env.getValuesOrThrow(
+                    labelAspectKeys, NoSuchPackageException.class, NoSuchTargetException.class)
+                .entrySet();
     if (env.valuesMissing()) {
       return null;
     }
@@ -188,14 +189,14 @@
     if (target instanceof Rule) {
       Map<Label, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> labelDepMap =
           new HashMap<>(depMap.size());
-      for (Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry :
-          depMap.entrySet()) {
+      for (Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>
+          entry : depMap.entrySet()) {
         labelDepMap.put(argumentFromKey(entry.getKey()), entry.getValue());
       }
 
       Multimap<Attribute, Label> transitions =
           ((Rule) target).getTransitions(DependencyFilter.NO_NODEP_ATTRIBUTES);
-      for (Entry<Attribute, Label> entry : transitions.entries()) {
+      for (Map.Entry<Attribute, Label> entry : transitions.entries()) {
         ValueOrException2<NoSuchPackageException, NoSuchTargetException> value =
             labelDepMap.get(entry.getValue());
         for (Label label :