This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 6d8f485e27a1a1c4101a27ac15314f05bbcfd747
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu May 23 11:10:47 2024 -0400
Fix PMD UnnecessaryFullyQualifiedName and friends
- Fix PMD 7.1.0 issues
---
src/changes/changes.xml | 1 +
src/conf/maven-pmd-plugin.xml | 7 ++++++-
src/main/java/org/apache/commons/io/FileCleaningTracker.java | 2 +-
src/main/java/org/apache/commons/io/FileUtils.java | 2 +-
src/main/java/org/apache/commons/io/IOCase.java | 2 +-
src/main/java/org/apache/commons/io/IOUtils.java | 2 +-
src/main/java/org/apache/commons/io/ThreadMonitor.java | 2 +-
src/main/java/org/apache/commons/io/file/Counters.java | 6 +++---
src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +-
src/main/java/org/apache/commons/io/file/StandardDeleteOption.java | 2 +-
.../java/org/apache/commons/io/output/FileWriterWithEncoding.java | 2 +-
src/main/java/org/apache/commons/io/output/LockableFileWriter.java | 7 +++----
12 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 75292defc..da17bb78c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -55,6 +55,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" due-to="Gary
Gregory">FileUtils.lastModifiedFileTime(File) calls Objects.requireNonNull() on
the wrong object.</action>
<action dev="ggregory" type="fix" due-to="Gary
Gregory">PathUtils.deleteOnExit(Path) calls Objects.requireNonNull() on the
wrong object.</action>
<action dev="ggregory" type="fix" due-to="Gary
Gregory">Deprecate LineIterator.nextLine() in favor of next().</action>
+ <action dev="ggregory" type="fix" due-to="Gary
Gregory">Fix PMD UnnecessaryFullyQualifiedName.</action>
<!-- UPDATE -->
<action dev="ggregory" type="update"
due-to="Dependabot">Bump tests commons.bytebuddy.version from 1.14.13 to
1.14.15 #615, #621.</action>
<action dev="ggregory" type="update"
due-to="Dependabot">Bump tests commons-codec:commons-codec from 1.16.1 to
1.17.0.</action>
diff --git a/src/conf/maven-pmd-plugin.xml b/src/conf/maven-pmd-plugin.xml
index a89254dac..cdb42c7e9 100644
--- a/src/conf/maven-pmd-plugin.xml
+++ b/src/conf/maven-pmd-plugin.xml
@@ -65,7 +65,12 @@ under the License.
<rule ref="category/java/errorprone.xml/CheckSkipResult" />
<rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray" />
<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
- <rule ref="category/java/errorprone.xml/EmptyCatchBlock" />
+ <rule ref="category/java/errorprone.xml/EmptyCatchBlock">
+ <properties>
+ <property name="allowCommentedBlocks" value="true" />
+ <property name="allowExceptionNameRegex" value="^(ignored|expected)$"
/>
+ </properties>
+ </rule>
<rule ref="category/java/errorprone.xml/JumbledIncrementer" />
<rule ref="category/java/errorprone.xml/MisplacedNullCheck" />
<rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
diff --git a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
index f8e23a87e..02de332b9 100644
--- a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
+++ b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
@@ -54,7 +54,7 @@ public class FileCleaningTracker {
/** Constructs a new Reaper */
Reaper() {
super("File Reaper");
- setPriority(Thread.MAX_PRIORITY);
+ setPriority(MAX_PRIORITY);
setDaemon(true);
}
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index be7e1618b..c8eef6067 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2485,7 +2485,7 @@ public class FileUtils {
// Don't interfere with file date on move, handled by
StandardCopyOption.COPY_ATTRIBUTES
copyFile(srcFile, destFile, false, copyOptions);
if (!srcFile.delete()) {
- FileUtils.deleteQuietly(destFile);
+ deleteQuietly(destFile);
throw new IOException("Failed to delete original file '" +
srcFile + "' after copy to '" + destFile + "'");
}
}
diff --git a/src/main/java/org/apache/commons/io/IOCase.java
b/src/main/java/org/apache/commons/io/IOCase.java
index 901f89606..40a64b756 100644
--- a/src/main/java/org/apache/commons/io/IOCase.java
+++ b/src/main/java/org/apache/commons/io/IOCase.java
@@ -76,7 +76,7 @@ public enum IOCase {
* @throws IllegalArgumentException if the name is invalid
*/
public static IOCase forName(final String name) {
- return Stream.of(IOCase.values()).filter(ioCase ->
ioCase.getName().equals(name)).findFirst()
+ return Stream.of(values()).filter(ioCase ->
ioCase.getName().equals(name)).findFirst()
.orElseThrow(() -> new IllegalArgumentException("Illegal
IOCase name: " + name));
}
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java
b/src/main/java/org/apache/commons/io/IOUtils.java
index 63c7b3098..3a4f5ae41 100644
--- a/src/main/java/org/apache/commons/io/IOUtils.java
+++ b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -1104,7 +1104,7 @@ public class IOUtils {
*/
public static long copy(final InputStream inputStream, final OutputStream
outputStream, final int bufferSize)
throws IOException {
- return copyLarge(inputStream, outputStream,
IOUtils.byteArray(bufferSize));
+ return copyLarge(inputStream, outputStream, byteArray(bufferSize));
}
/**
diff --git a/src/main/java/org/apache/commons/io/ThreadMonitor.java
b/src/main/java/org/apache/commons/io/ThreadMonitor.java
index 17e44e4da..463b4ae69 100644
--- a/src/main/java/org/apache/commons/io/ThreadMonitor.java
+++ b/src/main/java/org/apache/commons/io/ThreadMonitor.java
@@ -102,7 +102,7 @@ final class ThreadMonitor implements Runnable {
try {
ThreadUtils.sleep(timeout);
thread.interrupt();
- } catch (final InterruptedException e) {
+ } catch (final InterruptedException ignored) {
// timeout not reached
}
}
diff --git a/src/main/java/org/apache/commons/io/file/Counters.java
b/src/main/java/org/apache/commons/io/file/Counters.java
index 2b6736c1e..6654c8308 100644
--- a/src/main/java/org/apache/commons/io/file/Counters.java
+++ b/src/main/java/org/apache/commons/io/file/Counters.java
@@ -173,7 +173,7 @@ public class Counters {
* Constructs a new initialized instance.
*/
protected BigIntegerPathCounters() {
- super(Counters.bigIntegerCounter(), Counters.bigIntegerCounter(),
Counters.bigIntegerCounter());
+ super(bigIntegerCounter(), bigIntegerCounter(),
bigIntegerCounter());
}
}
@@ -295,7 +295,7 @@ public class Counters {
* Constructs a new initialized instance.
*/
protected LongPathCounters() {
- super(Counters.longCounter(), Counters.longCounter(),
Counters.longCounter());
+ super(longCounter(), longCounter(), longCounter());
}
}
@@ -356,7 +356,7 @@ public class Counters {
* Constructs a new initialized instance.
*/
private NoopPathCounters() {
- super(Counters.noopCounter(), Counters.noopCounter(),
Counters.noopCounter());
+ super(noopCounter(), noopCounter(), noopCounter());
}
}
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java
b/src/main/java/org/apache/commons/io/file/PathUtils.java
index 36b080761..857db4be4 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -498,7 +498,7 @@ public final class PathUtils {
* @since 2.8.0
*/
public static PathCounters deleteDirectory(final Path directory, final
DeleteOption... deleteOptions) throws IOException {
- final LinkOption[] linkOptions = PathUtils.noFollowLinkOptionArray();
+ final LinkOption[] linkOptions = noFollowLinkOptionArray();
// POSIX ops will noop on non-POSIX.
return withPosixFileAttributes(getParent(directory), linkOptions,
overrideReadOnly(deleteOptions),
pfa -> visitFileTree(new
DeletingPathVisitor(Counters.longPathCounters(), linkOptions, deleteOptions),
directory).getPathCounters());
diff --git a/src/main/java/org/apache/commons/io/file/StandardDeleteOption.java
b/src/main/java/org/apache/commons/io/file/StandardDeleteOption.java
index c5c2af96b..0e1e3db9c 100644
--- a/src/main/java/org/apache/commons/io/file/StandardDeleteOption.java
+++ b/src/main/java/org/apache/commons/io/file/StandardDeleteOption.java
@@ -45,7 +45,7 @@ public enum StandardDeleteOption implements DeleteOption {
if (IOUtils.length(options) == 0) {
return false;
}
- return Stream.of(options).anyMatch(e ->
StandardDeleteOption.OVERRIDE_READ_ONLY == e);
+ return Stream.of(options).anyMatch(e -> OVERRIDE_READ_ONLY == e);
}
}
diff --git
a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
index 0f60bb274..3446f1493 100644
--- a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
+++ b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
@@ -113,7 +113,7 @@ public class FileWriterWithEncoding extends ProxyWriter {
throw new IllegalStateException(String.format("Mismatched
Charset(%s) and CharsetEncoder(%s)", getCharset(), charsetEncoder.charset()));
}
final Object encoder = charsetEncoder != null ? charsetEncoder :
getCharset();
- return new
FileWriterWithEncoding(FileWriterWithEncoding.initWriter(checkOrigin().getFile(),
encoder, append));
+ return new
FileWriterWithEncoding(initWriter(checkOrigin().getFile(), encoder, append));
}
/**
diff --git a/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
b/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
index f7a8046c4..fadeb02aa 100644
--- a/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
+++ b/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
@@ -28,7 +28,6 @@ import java.util.Objects;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.build.AbstractOrigin;
-import org.apache.commons.io.build.AbstractOriginSupplier;
import org.apache.commons.io.build.AbstractStreamBuilder;
/**
@@ -74,7 +73,7 @@ public class LockableFileWriter extends Writer {
public static class Builder extends
AbstractStreamBuilder<LockableFileWriter, Builder> {
private boolean append;
- private AbstractOrigin<?, ?> lockDirectory =
AbstractOriginSupplier.newFileOrigin(FileUtils.getTempDirectoryPath());
+ private AbstractOrigin<?, ?> lockDirectory =
newFileOrigin(FileUtils.getTempDirectoryPath());
/**
* Builds a new {@link LockableFileWriter}.
@@ -127,7 +126,7 @@ public class LockableFileWriter extends Writer {
* @return {@code this} instance.
*/
public Builder setLockDirectory(final File lockDirectory) {
- this.lockDirectory =
AbstractOriginSupplier.newFileOrigin(lockDirectory != null ? lockDirectory :
FileUtils.getTempDirectory());
+ this.lockDirectory = newFileOrigin(lockDirectory != null ?
lockDirectory : FileUtils.getTempDirectory());
return this;
}
@@ -138,7 +137,7 @@ public class LockableFileWriter extends Writer {
* @return {@code this} instance.
*/
public Builder setLockDirectory(final String lockDirectory) {
- this.lockDirectory =
AbstractOriginSupplier.newFileOrigin(lockDirectory != null ? lockDirectory :
FileUtils.getTempDirectoryPath());
+ this.lockDirectory = newFileOrigin(lockDirectory != null ?
lockDirectory : FileUtils.getTempDirectoryPath());
return this;
}
