Rename ExecRequestUtils to PathToReplaceUtils

PiperOrigin-RevId: 721777475 Change-Id: I41caab311020f85cd417912009ec1738b2bf6c86
bazelbuild · Jan 31, 2025 · ad97203 · ad97203
1 parent 7fe187e
commit ad97203
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...ib/runtime/commands/ExecRequestUtils.java → .../runtime/commands/PathToReplaceUtils.java b/...ib/runtime/commands/ExecRequestUtils.java → .../runtime/commands/PathToReplaceUtils.java
@@ -21,7 +21,7 @@
 import com.google.protobuf.ByteString;
 
 /** Helpers for constructing {@link ExecRequest}s. */
-public class ExecRequestUtils {
+public class PathToReplaceUtils {
 
   /** Returns the common required {@link PathToReplace} list. */
   public static ImmutableList<PathToReplace> getPathsToReplace(CommandEnvironment env) {
@@ -45,5 +45,5 @@ public static ByteString bytes(String string) {
     return ByteString.copyFrom(string, ISO_8859_1);
   }
 
-  private ExecRequestUtils() {}
+  private PathToReplaceUtils() {}
 }
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
@@ -548,7 +548,7 @@ private static ExecRequest.Builder execRequestBuilder(
 
   private static ImmutableList<PathToReplace> getPathsToReplace(
       CommandEnvironment env, String testLogDir, boolean isTestTarget) {
-    ImmutableList<PathToReplace> pathsToReplace = ExecRequestUtils.getPathsToReplace(env);
+    ImmutableList<PathToReplace> pathsToReplace = PathToReplaceUtils.getPathsToReplace(env);
     if (isTestTarget) {
       return ImmutableList.<PathToReplace>builder()
           .addAll(pathsToReplace)

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
@@ -39,7 +39,7 @@
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.runtime.CommonCommandOptions;
 import com.google.devtools.build.lib.runtime.commands.BuildCommand;
-import com.google.devtools.build.lib.runtime.commands.ExecRequestUtils;
+import com.google.devtools.build.lib.runtime.commands.PathToReplaceUtils;
 import com.google.devtools.build.lib.server.CommandProtos.EnvironmentVariable;
 import com.google.devtools.build.lib.server.CommandProtos.ExecRequest;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
@@ -357,18 +357,18 @@ private static ExecRequest createExecRequest(
       CommandEnvironment env, Path workingDir, ImmutableList<String> cmdLine) {
     return ExecRequest.newBuilder()
         .setShouldExec(true)
-        .setWorkingDirectory(ExecRequestUtils.bytes(workingDir.getPathString()))
-        .addAllArgv(cmdLine.stream().map(ExecRequestUtils::bytes).collect(toImmutableList()))
-        .addAllPathToReplace(ExecRequestUtils.getPathsToReplace(env))
+        .setWorkingDirectory(PathToReplaceUtils.bytes(workingDir.getPathString()))
+        .addAllArgv(cmdLine.stream().map(PathToReplaceUtils::bytes).collect(toImmutableList()))
+        .addAllPathToReplace(PathToReplaceUtils.getPathsToReplace(env))
         // TODO: b/333695932 - Shim for client run-support, remove once no longer needed.
         .addEnvironmentVariable(
             EnvironmentVariable.newBuilder()
-                .setName(ExecRequestUtils.bytes("BUILD_WORKING_DIRECTORY"))
-                .setValue(ExecRequestUtils.bytes(env.getWorkingDirectory().getPathString())))
+                .setName(PathToReplaceUtils.bytes("BUILD_WORKING_DIRECTORY"))
+                .setValue(PathToReplaceUtils.bytes(env.getWorkingDirectory().getPathString())))
         .addEnvironmentVariable(
             EnvironmentVariable.newBuilder()
-                .setName(ExecRequestUtils.bytes("BUILD_WORKSPACE_DIRECTORY"))
-                .setValue(ExecRequestUtils.bytes(env.getWorkspace().getPathString())))
+                .setName(PathToReplaceUtils.bytes("BUILD_WORKSPACE_DIRECTORY"))
+                .setValue(PathToReplaceUtils.bytes(env.getWorkspace().getPathString())))
         .build();
   }