This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch mott in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 3108316259d5e50cb5750a938f9910e35d8e8e32 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Wed Feb 26 09:42:46 2025 -0500 Remove moot code --- src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java | 4 ++-- src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 +--- src/test/java/org/apache/maven/shared/utils/CaseTest.java | 5 ++--- .../shared/utils/introspection/ReflectionValueExtractorTest.java | 3 +-- 4 files changed, 6 insertions(+), 10 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 4eb9f31..96b69e0 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 @@ -544,7 +544,7 @@ public class DirectoryScanner { * @param dir The directory to scan. Must not be <code>null</code>. * @param vpath The path relative to the base directory (needed to prevent problems with an absolute path when using * dir). Must not be <code>null</code>. - * @param fast Whether or not this call is part of a fast scan. + * @param fast Whether this call is part of a fast scan * @see #filesIncluded * @see #filesNotIncluded * @see #filesExcluded @@ -553,7 +553,7 @@ public class DirectoryScanner { * @see #dirsExcluded * @see #slowScan */ - void scandir(@Nonnull final File dir, @Nonnull final String vpath, final boolean fast) { + private void scandir(@Nonnull final File dir, @Nonnull final String vpath, final boolean fast) { String[] newfiles = dir.list(); if (newfiles == null) { diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index 62c5bcb..bdf992d 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -428,9 +428,7 @@ public class FileUtils { try (Writer writer = Files.newBufferedWriter(file.toPath(), charset)) { for (int i = 0; data != null && i < data.length; i++) { writer.write(data[i]); - if (i < data.length) { - writer.write("\n"); - } + writer.write("\n"); } } } diff --git a/src/test/java/org/apache/maven/shared/utils/CaseTest.java b/src/test/java/org/apache/maven/shared/utils/CaseTest.java index ff10886..9b2e5c0 100644 --- a/src/test/java/org/apache/maven/shared/utils/CaseTest.java +++ b/src/test/java/org/apache/maven/shared/utils/CaseTest.java @@ -139,11 +139,10 @@ public class CaseTest extends Assert { upper.toLowerCase(locale)); // check that toLowerCase on lower and toUpperCase on upper don't cause harm - assertEquals("'" + lower + "'.toLowerCase('" + locale.toString() + "')", lower, lower.toLowerCase(locale)); - assertEquals("'" + upper + "'.toUpperCase('" + locale.toString() + "')", upper, upper.toUpperCase(locale)); + assertEquals("'" + lower + "'.toLowerCase('" + locale + "')", lower, lower.toLowerCase(locale)); + assertEquals("'" + upper + "'.toUpperCase('" + locale + "')", upper, upper.toUpperCase(locale)); // check equalsIgnoreCase - assertTrue("'" + upper + "'.equalsIgnoreCase('" + lower + "')", upper.equalsIgnoreCase(lower)); assertTrue( "'" + upper + "'.equalsIgnoreCase('" + expectedToLowerCase + "')", upper.equalsIgnoreCase(expectedToLowerCase)); diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java index 0e3a467..423f57f 100644 --- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java @@ -389,8 +389,7 @@ public class ReflectionValueExtractorTest extends TestCase { public Map<String, Dependency> getDependenciesAsMap() { Map<String, Dependency> ret = new HashMap<>(); - for (Object o : getDependencies()) { - Dependency dep = (Dependency) o; + for (Dependency dep : getDependencies()) { ret.put(dep.getArtifactId(), dep); } return ret;
