Automatic code cleanup. PiperOrigin-RevId: 420047301
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java index 43e38e2..2f7187c 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java
@@ -76,7 +76,6 @@ import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.DigestHashFunction; import com.google.devtools.build.lib.vfs.FileSystem; -import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; @@ -150,14 +149,14 @@ Chunker.setDefaultChunkSizeForTesting(1000); // Enough for everything to be one chunk. fs = new InMemoryFileSystem(new JavaClock(), DigestHashFunction.SHA256); execRoot = fs.getPath("/execroot/main"); - FileSystemUtils.createDirectoryAndParents(execRoot); + execRoot.createDirectoryAndParents(); fakeFileCache = new FakeActionInputFileCache(execRoot); remotePathResolver = RemotePathResolver.createDefault(execRoot); Path stdout = fs.getPath("/tmp/stdout"); Path stderr = fs.getPath("/tmp/stderr"); - FileSystemUtils.createDirectoryAndParents(stdout.getParentDirectory()); - FileSystemUtils.createDirectoryAndParents(stderr.getParentDirectory()); + stdout.getParentDirectory().createDirectoryAndParents(); + stderr.getParentDirectory().createDirectoryAndParents(); outErr = new FileOutErr(stdout, stderr); RequestMetadata metadata = TracingMetadataUtils.buildMetadata(
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java index 68fce99..2bc4abc 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -97,7 +97,6 @@ import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.DigestHashFunction; import com.google.devtools.build.lib.vfs.FileSystem; -import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; @@ -161,13 +160,13 @@ FileSystem fs = new InMemoryFileSystem(new JavaClock(), DigestHashFunction.SHA256); execRoot = fs.getPath("/exec/root"); logDir = fs.getPath("/server-logs"); - FileSystemUtils.createDirectoryAndParents(execRoot); + execRoot.createDirectoryAndParents(); fakeFileCache = new FakeActionInputFileCache(execRoot); Path stdout = fs.getPath("/tmp/stdout"); Path stderr = fs.getPath("/tmp/stderr"); - FileSystemUtils.createDirectoryAndParents(stdout.getParentDirectory()); - FileSystemUtils.createDirectoryAndParents(stderr.getParentDirectory()); + stdout.getParentDirectory().createDirectoryAndParents(); + stderr.getParentDirectory().createDirectoryAndParents(); outErr = new FileOutErr(stdout, stderr); remoteOptions = Options.getDefaults(RemoteOptions.class);
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerWithGrpcRemoteExecutorTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerWithGrpcRemoteExecutorTest.java index 16e0b37..2aa8d0e 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerWithGrpcRemoteExecutorTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerWithGrpcRemoteExecutorTest.java
@@ -83,7 +83,6 @@ import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.DigestHashFunction; import com.google.devtools.build.lib.vfs.FileSystem; -import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; @@ -188,7 +187,7 @@ fs = new InMemoryFileSystem(new JavaClock(), DigestHashFunction.SHA256); execRoot = fs.getPath("/execroot/main"); logDir = fs.getPath("/server-logs"); - FileSystemUtils.createDirectoryAndParents(execRoot); + execRoot.createDirectoryAndParents(); fakeFileCache = new FakeActionInputFileCache(execRoot); simpleSpawn = new SimpleSpawn( @@ -235,8 +234,8 @@ Path stdout = fs.getPath("/tmp/stdout"); Path stderr = fs.getPath("/tmp/stderr"); - FileSystemUtils.createDirectoryAndParents(stdout.getParentDirectory()); - FileSystemUtils.createDirectoryAndParents(stderr.getParentDirectory()); + stdout.getParentDirectory().createDirectoryAndParents(); + stderr.getParentDirectory().createDirectoryAndParents(); outErr = new FileOutErr(stdout, stderr); remoteOptions = Options.getDefaults(RemoteOptions.class);