This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch unused in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit c16cda6c8a858ea2159a03e14e748294e1721fee Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Sun Jun 18 16:09:11 2023 -0400 remove and cleanup unused code --- .../maven/shared/utils/io/DirectoryScanner.java | 39 ++++------------------ .../shared/utils/io/DirectoryScannerTest.java | 6 ---- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java index 3c613ab..af6e384 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java @@ -22,7 +22,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; @@ -569,8 +568,6 @@ public class DirectoryScanner { * the problematic code, as it appears to come from a native method in UnixFileSystem... */ newfiles = new String[0]; - - // throw new IOException( "IO error scanning directory " + dir.getAbsolutePath() ); } if (!followSymlinks) { @@ -668,22 +665,15 @@ public class DirectoryScanner { private String[] doNotFollowSymbolicLinks(final File dir, final String vpath, String[] newfiles) { final List<String> noLinks = new ArrayList<String>(); for (final String newfile : newfiles) { - try { - if (isSymbolicLink(dir, newfile)) { - final String name = vpath + newfile; - final File file = new File(dir, newfile); - if (file.isDirectory()) { - dirsExcluded.add(name); - } else { - filesExcluded.add(name); - } + if (Files.isSymbolicLink(dir)) { + final String name = vpath + newfile; + final File file = new File(dir, newfile); + if (file.isDirectory()) { + dirsExcluded.add(name); } else { - noLinks.add(newfile); + filesExcluded.add(name); } - } catch (final IOException ioe) { - final String msg = "IOException caught while checking " + "for links, couldn't get canonical path!"; - // will be caught and redirected to Ant's logging system - System.err.println(msg); + } else { noLinks.add(newfile); } } @@ -822,21 +812,6 @@ public class DirectoryScanner { excludes = newExcludes; } - /** - * Checks whether a given file is a symbolic link. - * <p> - * It doesn't really test for symbolic links but whether the canonical and absolute paths of the file are identical - * - this may lead to false positives on some platforms. - * </p> - * - * @param parent the parent directory of the file to test - * @param name the name of the file to test. - * - */ - boolean isSymbolicLink(final File parent, final String name) throws IOException { - return Files.isSymbolicLink(parent.toPath()); - } - private void setupDefaultFilters() { if (includes == null) { // No includes supplied, so set it to 'matches all' diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index 272cc65..74a3f32 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -276,12 +276,6 @@ public class DirectoryScannerTest { /* expExclDirs */ NONE); } - public void testIsSymbolicLink() throws IOException { - File file = new File("."); - DirectoryScanner ds = new DirectoryScanner(); - ds.isSymbolicLink(file, "abc"); - } - /** * Performs a scan and test for the given parameters if not null. */
