From c60622df7fb868e51d6c3fbde02836f24955d97f Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Fri, 26 Dec 2025 06:08:01 -0800 Subject: [PATCH] Revert "Issue #980: Replace AntBuilder.copy() with Files.walkFileTree()" This reverts commit be967bafdc38cefeec1df5675370773c546c4f0d. --- checkstyle-tester/diff.groovy | 36 +++-------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/checkstyle-tester/diff.groovy b/checkstyle-tester/diff.groovy index 104f7937..e46a973e 100644 --- a/checkstyle-tester/diff.groovy +++ b/checkstyle-tester/diff.groovy @@ -1,12 +1,8 @@ import static java.lang.System.err import static java.nio.file.StandardCopyOption.REPLACE_EXISTING -import java.nio.file.FileVisitResult import java.nio.file.Files -import java.nio.file.Path import java.nio.file.Paths -import java.nio.file.SimpleFileVisitor -import java.nio.file.attribute.BasicFileAttributes import java.util.regex.Pattern static void main(String[] args) { @@ -717,35 +713,9 @@ def postProcessCheckstyleReport(targetDir, repoName, repoPath) { } def copyDir(source, destination) { - Path sourceDir = new File(source).toPath().toAbsolutePath().normalize() - Path destinationDir = new File(destination).toPath().toAbsolutePath().normalize() - - Files.walkFileTree(sourceDir, new SimpleFileVisitor() { - @Override - FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { - if (dir.startsWith(destinationDir)) { - return FileVisitResult.SKIP_SUBTREE - } - Path targetDir = destinationDir.resolve(sourceDir.relativize(dir)) - if (targetDir.startsWith(sourceDir)) { - return FileVisitResult.SKIP_SUBTREE - } - if (!Files.exists(targetDir)) { - Files.createDirectories(targetDir) - } - return FileVisitResult.CONTINUE - } - - @Override - FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { - Path targetFile = destinationDir.resolve(sourceDir.relativize(file)) - if (targetFile.startsWith(sourceDir)) { - return FileVisitResult.CONTINUE - } - Files.copy(file, targetFile, REPLACE_EXISTING) - return FileVisitResult.CONTINUE - } - }) + new AntBuilder().copy(todir: destination) { + fileset(dir: source) + } } def moveDir(source, destination) {