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

PiperOrigin-RevId: 194985259

4 files changed, 10 insertions, 11 deletions

diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/AstVisitorWithNameResolution.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/AstVisitorWithNameResolution.java
index 7ffcc657d1..5c09bc504a 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/AstVisitorWithNameResolution.java
+++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/AstVisitorWithNameResolution.java
@@ -32,7 +32,6 @@ import com.google.devtools.build.lib.syntax.Statement;
 import com.google.devtools.build.lib.syntax.SyntaxTreeVisitor;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * AST visitor that keeps track of which symbols are in scope.
@@ -78,7 +77,7 @@ public class AstVisitorWithNameResolution extends SyntaxTreeVisitor {
   @Override
   public void visit(LoadStatement node) {
     Map<Identifier, String> symbolMap = node.getSymbolMap();
-    for (Entry<Identifier, String> entry : symbolMap.entrySet()) {
+    for (Map.Entry<Identifier, String> entry : symbolMap.entrySet()) {
       String name = entry.getKey().getName();
       env.addImported(name, entry.getKey());
       declare(name, entry.getKey());
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/DeprecationChecker.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/DeprecationChecker.java
index 9fb7ba171d..893e48e7ca 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/DeprecationChecker.java
+++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/DeprecationChecker.java
@@ -29,7 +29,6 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /** Checks for usage of deprecated symbols. */
 public class DeprecationChecker extends AstVisitorWithNameResolution {
@@ -129,7 +128,7 @@ public class DeprecationChecker extends AstVisitorWithNameResolution {
         LoadStatement stmt,
         Path loadedPath,
         Map<String, DeprecatedSymbol> loadedFileInfo) {
-      for (Entry<Identifier, String> entry : stmt.getSymbolMap().entrySet()) {
+      for (Map.Entry<Identifier, String> entry : stmt.getSymbolMap().entrySet()) {
         String originalName = entry.getValue();
         String alias = entry.getKey().getName();
         DeprecatedSymbol originalDeprecation = loadedFileInfo.get(originalName);
@@ -144,7 +143,7 @@ public class DeprecationChecker extends AstVisitorWithNameResolution {
     public Map<String, DeprecatedSymbol> collectInfo(
         Path path, BuildFileAST ast, Map<String, DeprecatedSymbol> deprecationInfos) {
       Map<String, StringLiteral> docstrings = DocstringUtils.collectDocstringLiterals(ast);
-      for (Entry<String, StringLiteral> entry : docstrings.entrySet()) {
+      for (Map.Entry<String, StringLiteral> entry : docstrings.entrySet()) {
         String symbol = entry.getKey();
         StringLiteral docstring = entry.getValue();
         DocstringInfo info = DocstringUtils.parseDocstring(docstring, new ArrayList<>());
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringUtils.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringUtils.java
index 96c86ec6a2..b4271a4333 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringUtils.java
+++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringUtils.java
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
@@ -54,7 +54,8 @@ public final class DocstringUtils {
     ImmutableMap.Builder<String, StringLiteral> nameToDocstringLiteral = ImmutableMap.builder();
     Statement previousStatement = null;
     for (Statement currentStatement : ast.getStatements()) {
-      Entry<String, StringLiteral> entry = getNameAndDocstring(previousStatement, currentStatement);
+      Map.Entry<String, StringLiteral> entry =
+          getNameAndDocstring(previousStatement, currentStatement);
       if (entry != null) {
         nameToDocstringLiteral.put(entry);
       }
@@ -64,7 +65,7 @@ public final class DocstringUtils {
   }
 
   @Nullable
-  private static Entry<String, StringLiteral> getNameAndDocstring(
+  private static Map.Entry<String, StringLiteral> getNameAndDocstring(
       @Nullable Statement previousStatement, Statement currentStatement) {
     // function docstring:
     if (currentStatement instanceof FunctionDefStatement) {
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/Linter.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/Linter.java
index d537281f30..93253419ec 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/Linter.java
+++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/Linter.java
@@ -25,7 +25,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -117,14 +117,14 @@ public class Linter {
               }
             },
             content);
-    for (Entry<String, Check> entry : nameToCheck.entrySet()) {
+    for (Map.Entry<String, Check> entry : nameToCheck.entrySet()) {
       if (disabledChecks.contains(entry.getKey())) {
         continue;
       }
       issues.addAll(entry.getValue().check(ast));
     }
     if (!singleFileMode) {
-      for (Entry<String, MultiFileCheck> entry : nameToMultiFileCheck.entrySet()) {
+      for (Map.Entry<String, MultiFileCheck> entry : nameToMultiFileCheck.entrySet()) {
         if (disabledChecks.contains(entry.getKey())) {
           continue;
         }