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

PiperOrigin-RevId: 195100670

4 files changed, 15 insertions, 18 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializers.java b/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializers.java
index ae8307ed90..9e6ec2464b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializers.java
+++ b/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializers.java
@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.EnumMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.TreeMap;
 
 /**
@@ -30,7 +29,7 @@ import java.util.TreeMap;
  * classes.
  */
 public class FieldInitializers
-    implements Iterable<Entry<ResourceType, Map<String, FieldInitializer>>> {
+    implements Iterable<Map.Entry<ResourceType, Map<String, FieldInitializer>>> {
 
   private final Map<ResourceType, Map<String, FieldInitializer>> initializers;
 
@@ -48,13 +47,13 @@ public class FieldInitializers
     final Map<ResourceType, Map<String, FieldInitializer>> merged =
         new EnumMap<>(ResourceType.class);
     for (FieldInitializers mergee : toMerge) {
-      for (Entry<ResourceType, Map<String, FieldInitializer>> entry : mergee) {
+      for (Map.Entry<ResourceType, Map<String, FieldInitializer>> entry : mergee) {
         final Map<String, FieldInitializer> fieldMap =
             merged.containsKey(entry.getKey())
                 ? merged.get(entry.getKey())
                 : new TreeMap<String, FieldInitializer>();
         merged.put(entry.getKey(), fieldMap);
-        for (Entry<String, FieldInitializer> field : entry.getValue().entrySet()) {
+        for (Map.Entry<String, FieldInitializer> field : entry.getValue().entrySet()) {
           fieldMap.put(field.getKey(), field.getValue());
         }
       }
@@ -62,12 +61,12 @@ public class FieldInitializers
     return copyOf(merged);
   }
 
-  public Iterable<Entry<ResourceType, Map<String, FieldInitializer>>> filter(
+  public Iterable<Map.Entry<ResourceType, Map<String, FieldInitializer>>> filter(
       FieldInitializers fieldsToWrite) {
     Map<ResourceType, Map<String, FieldInitializer>> initializersToWrite =
         new EnumMap<>(ResourceType.class);
 
-    for (Entry<ResourceType, Map<String, FieldInitializer>> entry :
+    for (Map.Entry<ResourceType, Map<String, FieldInitializer>> entry :
         fieldsToWrite.initializers.entrySet()) {
       if (initializers.containsKey(entry.getKey())) {
         final Map<String, FieldInitializer> valueFields = initializers.get(entry.getKey());
@@ -87,7 +86,7 @@ public class FieldInitializers
   }
 
   @Override
-  public Iterator<Entry<ResourceType, Map<String, FieldInitializer>>> iterator() {
+  public Iterator<Map.Entry<ResourceType, Map<String, FieldInitializer>>> iterator() {
     return initializers.entrySet().iterator();
   }
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/RClassGenerator.java b/src/tools/android/java/com/google/devtools/build/android/resources/RClassGenerator.java
index e170cd73e1..61bff97b79 100644
--- a/src/tools/android/java/com/google/devtools/build/android/resources/RClassGenerator.java
+++ b/src/tools/android/java/com/google/devtools/build/android/resources/RClassGenerator.java
@@ -25,7 +25,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -79,7 +78,7 @@ public class RClassGenerator {
 
   private void writeClasses(
       String packageName,
-      Iterable<Entry<ResourceType, Map<String, FieldInitializer>>> initializersToWrite)
+      Iterable<Map.Entry<ResourceType, Map<String, FieldInitializer>>> initializersToWrite)
       throws IOException {
 
     Iterable<String> folders = PACKAGE_SPLITTER.split(packageName);
@@ -110,7 +109,7 @@ public class RClassGenerator {
     classWriter.visitSource(SdkConstants.FN_RESOURCE_CLASS, null);
     writeConstructor(classWriter);
     // Build the R.class w/ the inner classes, then later build the individual R$inner.class.
-    for (Entry<ResourceType, Map<String, FieldInitializer>> entry : initializersToWrite) {
+    for (Map.Entry<ResourceType, Map<String, FieldInitializer>> entry : initializersToWrite) {
       String innerClassName = rClassName + "$" + entry.getKey().toString();
       classWriter.visitInnerClass(
           innerClassName,
@@ -141,7 +140,7 @@ public class RClassGenerator {
     if (finalFields) {
       fieldAccessLevel |= Opcodes.ACC_FINAL;
     }
-    for (Entry<String, FieldInitializer> entry : initializers.entrySet()) {
+    for (Map.Entry<String, FieldInitializer> entry : initializers.entrySet()) {
       FieldInitializer init = entry.getValue();
       Preconditions.checkArgument(
           !entry.getKey().contains(":"),
@@ -205,7 +204,7 @@ public class RClassGenerator {
     visitor.visitCode();
     int stackSlotsNeeded = 0;
     InstructionAdapter insts = new InstructionAdapter(visitor);
-    for (Entry<String, FieldInitializer> fieldEntry : deferredInitializers.entrySet()) {
+    for (Map.Entry<String, FieldInitializer> fieldEntry : deferredInitializers.entrySet()) {
       final FieldInitializer fieldInit = fieldEntry.getValue();
       stackSlotsNeeded =
           Math.max(stackSlotsNeeded, fieldInit.writeCLInit(fieldEntry.getKey(), insts, className));
diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/RSourceGenerator.java b/src/tools/android/java/com/google/devtools/build/android/resources/RSourceGenerator.java
index ffaab026d0..2f2cff37ab 100644
--- a/src/tools/android/java/com/google/devtools/build/android/resources/RSourceGenerator.java
+++ b/src/tools/android/java/com/google/devtools/build/android/resources/RSourceGenerator.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /** Writes out an R.java source. */
 public class RSourceGenerator {
@@ -62,7 +61,7 @@ public class RSourceGenerator {
 
   private void writeSource(
       String packageName,
-      Iterable<Entry<ResourceType, Map<String, FieldInitializer>>> initializersToWrite)
+      Iterable<Map.Entry<ResourceType, Map<String, FieldInitializer>>> initializersToWrite)
       throws IOException {
     String packageDir = packageName.replace('.', '/');
     Path packagePath = outputBasePath.resolve(packageDir);
@@ -82,10 +81,10 @@ public class RSourceGenerator {
       writer.write(" */\n");
       writer.write(String.format("package %s;\n", packageName));
       writer.write("public final class R {\n");
-      for (Entry<ResourceType, Map<String, FieldInitializer>> entry : initializersToWrite) {
+      for (Map.Entry<ResourceType, Map<String, FieldInitializer>> entry : initializersToWrite) {
         writer.write(
             String.format("    public static final class %s {\n", entry.getKey().getName()));
-        for (Entry<String, FieldInitializer> fieldEntry : entry.getValue().entrySet()) {
+        for (Map.Entry<String, FieldInitializer> fieldEntry : entry.getValue().entrySet()) {
           fieldEntry.getValue().writeInitSource(fieldEntry.getKey(), writer, finalFields);
         }
         writer.write("    }\n");
diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java b/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java
index 10f87902cb..e3b606f113 100644
--- a/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java
+++ b/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java
@@ -31,7 +31,6 @@ import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeMap;
 import java.util.concurrent.Callable;
@@ -135,7 +134,8 @@ public class ResourceSymbols {
           dependency, executor.submit(new PackageParsingTask(dependency.getManifest())));
     }
     Multimap<String, ListenableFuture<ResourceSymbols>> packageToTable = HashMultimap.create();
-    for (Entry<SymbolFileProvider, ListenableFuture<String>> entry : providerToPackage.entrySet()) {
+    for (Map.Entry<SymbolFileProvider, ListenableFuture<String>> entry :
+        providerToPackage.entrySet()) {
       File symbolFile = entry.getKey().getSymbolFile();
       if (!Objects.equals(entry.getValue().get(), packageToExclude)) {
         packageToTable.put(entry.getValue().get(), load(symbolFile.toPath(), executor));