Rename FileOutErr.get{Output,Error}File to get{Output,Error}Path, because they actually return a Path and not a File.

--
MOS_MIGRATED_REVID=126102820

3 files changed, 8 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
index 2dd01c3bcd..7df123a52b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
@@ -139,7 +139,7 @@ public class StandaloneTestStrategy extends TestStrategy {
           ResourceHandle handle = ResourceManager.instance().acquireResources(action, resources)) {
         TestResultData data =
             execute(actionExecutionContext.withFileOutErr(fileOutErr), spawn, action);
-        appendStderr(fileOutErr.getOutputFile(), fileOutErr.getErrorFile());
+        appendStderr(fileOutErr.getOutputPath(), fileOutErr.getErrorPath());
         finalizeTest(actionExecutionContext, action, data);
       }
     } catch (IOException e) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
index de651e9137..a9cf5833f1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -1042,10 +1042,10 @@ public final class SkyframeActionExecutor implements ActionExecutionContextFacto
     String stderr = null;
 
     if (outErr.hasRecordedStdout()) {
-      stdout = outErr.getOutputFile().toString();
+      stdout = outErr.getOutputPath().toString();
     }
     if (outErr.hasRecordedStderr()) {
-      stderr = outErr.getErrorFile().toString();
+      stderr = outErr.getErrorPath().toString();
     }
     postEvent(new ActionExecutedEvent(action, exception, stdout, stderr));
   }
diff --git a/src/main/java/com/google/devtools/build/lib/util/io/FileOutErr.java b/src/main/java/com/google/devtools/build/lib/util/io/FileOutErr.java
index 512d9988cd..d28228d5d5 100644
--- a/src/main/java/com/google/devtools/build/lib/util/io/FileOutErr.java
+++ b/src/main/java/com/google/devtools/build/lib/util/io/FileOutErr.java
@@ -106,23 +106,22 @@ public class FileOutErr extends OutErr {
   }
 
   /**
-   * Returns the file this OutErr uses to buffer stdout
+   * Returns the {@link Path} this OutErr uses to buffer stdout
    *
-   * The user must ensure that no other process is writing to the
-   * files at time of creation.
+   * <p>The user must ensure that no other process is writing to the files at time of creation.
    *
    * @return the path object with the contents of stdout
    */
-  public Path getOutputFile() {
+  public Path getOutputPath() {
     return getFileOutputStream().getFile();
   }
 
   /**
-   * Returns the file this OutErr uses to buffer stderr.
+   * Returns the {@link Path} this OutErr uses to buffer stderr.
    *
    * @return the path object with the contents of stderr
    */
-  public Path getErrorFile() {
+  public Path getErrorPath() {
     return getFileErrorStream().getFile();
   }