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/FilesetEntryFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
index 4ed96ec..aa4fa7b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
@@ -33,7 +33,6 @@
 import com.google.devtools.build.skyframe.SkyValue;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -326,13 +325,15 @@
           });
 
       // 2. Extract the iterables of the true subdirectories.
-      Iterable<Iterable<ResolvedFile>> subdirIters = Iterables.transform(noDirSymlinkes,
-          new Function<Map.Entry<String, DirectoryTree>, Iterable<ResolvedFile>>() {
-            @Override
-            public Iterable<ResolvedFile> apply(Entry<String, DirectoryTree> input) {
-              return input.getValue().iterateFiles();
-            }
-          });
+      Iterable<Iterable<ResolvedFile>> subdirIters =
+          Iterables.transform(
+              noDirSymlinkes,
+              new Function<Map.Entry<String, DirectoryTree>, Iterable<ResolvedFile>>() {
+                @Override
+                public Iterable<ResolvedFile> apply(Map.Entry<String, DirectoryTree> input) {
+                  return input.getValue().iterateFiles();
+                }
+              });
 
       // 3. Just concat all subdirectory iterations for one, seamless iteration.
       Iterable<ResolvedFile> dirsIter = Iterables.concat(subdirIters);