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

PiperOrigin-RevId: 195100670

3 files changed, 15 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java
index 4cf02ac5b7..87c55d48db 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java
@@ -25,7 +25,6 @@ import com.google.devtools.build.lib.vfs.Symlinks;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 /** Creates and manages the contents of a working directory of a persistent worker. */
@@ -77,7 +76,7 @@ final class WorkerExecRoot extends SymlinkedSandboxedSpawn {
   @Override
   protected void createInputs(Map<PathFragment, Path> inputs) throws IOException {
     // All input files are relative to the execroot.
-    for (Entry<PathFragment, Path> entry : inputs.entrySet()) {
+    for (Map.Entry<PathFragment, Path> entry : inputs.entrySet()) {
       Path key = workDir.getRelative(entry.getKey());
       FileStatus keyStat = key.statNullable(Symlinks.NOFOLLOW);
       if (keyStat != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java
index a39e47f968..ddc7da791f 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java
@@ -30,7 +30,6 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -42,7 +41,7 @@ class WorkerFilesHash {
 
   static HashCode getCombinedHash(SortedMap<PathFragment, HashCode> workerFilesMap) {
     Hasher hasher = Hashing.sha256().newHasher();
-    for (Entry<PathFragment, HashCode> workerFile : workerFilesMap.entrySet()) {
+    for (Map.Entry<PathFragment, HashCode> workerFile : workerFilesMap.entrySet()) {
       hasher.putString(workerFile.getKey().getPathString(), Charset.defaultCharset());
       hasher.putBytes(workerFile.getValue().asBytes());
     }
@@ -66,11 +65,11 @@ class WorkerFilesHash {
           HashCode.fromBytes(actionInputFileCache.getMetadata(tool).getDigest()));
     }
 
-    for (Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings :
+    for (Map.Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings :
         spawn.getRunfilesSupplier().getMappings().entrySet()) {
       PathFragment root = rootAndMappings.getKey();
       Preconditions.checkState(!root.isAbsolute(), root);
-      for (Entry<PathFragment, Artifact> mapping : rootAndMappings.getValue().entrySet()) {
+      for (Map.Entry<PathFragment, Artifact> mapping : rootAndMappings.getValue().entrySet()) {
         Artifact localArtifact = mapping.getValue();
         if (localArtifact != null) {
           Metadata metadata = actionInputFileCache.getMetadata(localArtifact);
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java
index d0bb6749e3..6055818680 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java
@@ -20,7 +20,7 @@ import com.google.devtools.common.options.OptionEffectTag;
 import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 
 /**
  * Options related to worker processes.
@@ -85,17 +85,16 @@ public class WorkerOptions extends OptionsBase {
   public boolean workerVerbose;
 
   @Option(
-    name = "worker_extra_flag",
-    converter = Converters.AssignmentConverter.class,
-    defaultValue = "",
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
-    help =
-        "Extra command-flags that will be passed to worker processes in addition to "
-            + "--persistent_worker, keyed by mnemonic (e.g. --worker_extra_flag=Javac=--debug.",
-    allowMultiple = true
-  )
-  public List<Entry<String, String>> workerExtraFlags;
+      name = "worker_extra_flag",
+      converter = Converters.AssignmentConverter.class,
+      defaultValue = "",
+      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+      effectTags = {OptionEffectTag.UNKNOWN},
+      help =
+          "Extra command-flags that will be passed to worker processes in addition to "
+              + "--persistent_worker, keyed by mnemonic (e.g. --worker_extra_flag=Javac=--debug.",
+      allowMultiple = true)
+  public List<Map.Entry<String, String>> workerExtraFlags;
 
   @Option(
     name = "worker_sandboxing",