Automatic code cleanup.
PiperOrigin-RevId: 421846863
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
index 1cbbdeb..7cb1ea2 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemUtilsTest.java
@@ -532,7 +532,7 @@
createTestDirectoryTree();
Path copyDir = fileSystem.getPath("/my-dir");
Path copySubDir = fileSystem.getPath("/my-dir/subdir");
- FileSystemUtils.createDirectoryAndParents(copySubDir);
+ copySubDir.createDirectoryAndParents();
IOException expected =
assertThrows(
IOException.class,
@@ -702,28 +702,28 @@
"/dev/foobar /foobar dummy_foobar blah 0 0",
"proc proc proc rw,noexec,nosuid,nodev 0 0");
Path path = fileSystem.getPath("/usr/local/google/_blaze");
- FileSystemUtils.createDirectoryAndParents(path);
+ path.createDirectoryAndParents();
assertThat(FileSystemUtils.getFileSystem(path)).isEqualTo("ext3");
// Should match the root "/"
path = fileSystem.getPath("/usr/local/tmp");
- FileSystemUtils.createDirectoryAndParents(path);
+ path.createDirectoryAndParents();
assertThat(FileSystemUtils.getFileSystem(path)).isEqualTo("ext2");
// Make sure we don't consider /foobar matches /foo
path = fileSystem.getPath("/foo");
- FileSystemUtils.createDirectoryAndParents(path);
+ path.createDirectoryAndParents();
assertThat(FileSystemUtils.getFileSystem(path)).isEqualTo("dummy_foo");
path = fileSystem.getPath("/foobar");
- FileSystemUtils.createDirectoryAndParents(path);
+ path.createDirectoryAndParents();
assertThat(FileSystemUtils.getFileSystem(path)).isEqualTo("dummy_foobar");
path = fileSystem.getPath("/dev/shm/blaze");
- FileSystemUtils.createDirectoryAndParents(path);
+ path.createDirectoryAndParents();
assertThat(FileSystemUtils.getFileSystem(path)).isEqualTo("tmpfs");
Path fusePath = fileSystem.getPath("/fuse/mnt/tmp");
- FileSystemUtils.createDirectoryAndParents(fusePath);
+ fusePath.createDirectoryAndParents();
assertThat(FileSystemUtils.getFileSystem(fusePath)).isEqualTo("fuse");
// Create a symlink and make sure it gives the file system of the symlink target.
@@ -799,7 +799,7 @@
Path originalDir = workingDir.getRelative("originalDir");
Path linkPath = workingDir.getRelative("link");
- FileSystemUtils.createDirectoryAndParents(originalDir);
+ originalDir.createDirectoryAndParents();
/* Original directory is empty, no link to be created. */
FileSystemUtils.createHardLink(linkPath, originalDir);
@@ -819,7 +819,7 @@
Path linkPath2 = linkPath.getRelative("original2");
Path linkPath3 = linkPath.getRelative("original3");
- FileSystemUtils.createDirectoryAndParents(originalDir);
+ originalDir.createDirectoryAndParents();
FileSystemUtils.createEmptyFile(originalPath1);
FileSystemUtils.createEmptyFile(originalPath2);
FileSystemUtils.createEmptyFile(originalPath3);
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
index 0463f57..a870d28 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
@@ -82,7 +82,7 @@
"foo/bar/wiz", "foo/barnacle/wiz", "food/barnacle/wiz", "fool/barnacle/wiz");
for (String dir : directories) {
- FileSystemUtils.createDirectoryAndParents(tmpPath.getRelative(dir));
+ tmpPath.getRelative(dir).createDirectoryAndParents();
}
FileSystemUtils.createEmptyFile(tmpPath.getRelative("foo/bar/wiz/file"));
}
@@ -350,7 +350,7 @@
@Test
public void testSpecialRegexCharacter() throws Exception {
Path tmpPath2 = fs.getPath("/globtmp2");
- FileSystemUtils.createDirectoryAndParents(tmpPath2);
+ tmpPath2.createDirectoryAndParents();
Path aDotB = tmpPath2.getChild("a.b");
FileSystemUtils.createEmptyFile(aDotB);
Path aPlusB = tmpPath2.getChild("a+b");
@@ -385,7 +385,7 @@
@Test
public void testParenthesesInRegex() throws Exception {
Path tmpPath3 = fs.getPath("/globtmp3");
- FileSystemUtils.createDirectoryAndParents(tmpPath3);
+ tmpPath3.createDirectoryAndParents();
Path fooBar = tmpPath3.getChild("foo bar");
FileSystemUtils.createEmptyFile(fooBar);
Path fooBarInParentheses = tmpPath3.getChild("foo (bar)");
@@ -456,7 +456,7 @@
@Test
public void testHiddenFiles() throws Exception {
for (String dir : ImmutableList.of(".hidden", "..also.hidden", "not.hidden")) {
- FileSystemUtils.createDirectoryAndParents(tmpPath.getRelative(dir));
+ tmpPath.getRelative(dir).createDirectoryAndParents();
}
// Note that these are not in the result: ".", ".."
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/JavaIoFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/JavaIoFileSystemTest.java
index cdcb22e..ab5b9d3 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/JavaIoFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/JavaIoFileSystemTest.java
@@ -109,7 +109,7 @@
List<Path> subDirs =
getSubDirectories(xEmptyDirectory, loopi, subDirectoryCount);
Path lastDir = Iterables.getLast(subDirs);
- FileSystemUtils.createDirectoryAndParents(lastDir);
+ lastDir.createDirectoryAndParents();
}
} catch (IOException e) {
return e;
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathGetParentTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathGetParentTest.java
index 7138b4c..38f8dcc 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathGetParentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathGetParentTest.java
@@ -37,7 +37,7 @@
public final void createTestRoot() throws Exception {
fs = FileSystems.getNativeFileSystem();
testRoot = fs.getPath(TestUtils.tmpDir()).getRelative("UnixPathGetParentTest");
- FileSystemUtils.createDirectoryAndParents(testRoot);
+ testRoot.createDirectoryAndParents();
}
@After
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
index 07abb57..bdcfed2 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/RecursiveGlobTest.java
@@ -45,7 +45,7 @@
"foo/baz/quip/wiz",
"food/baz/wiz",
"fool/baz/wiz")) {
- FileSystemUtils.createDirectoryAndParents(tmpPath.getRelative(dir));
+ tmpPath.getRelative(dir).createDirectoryAndParents();
}
FileSystemUtils.createEmptyFile(tmpPath.getRelative("foo/bar/wiz/file"));
}
