You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/05/23 15:10:55 UTC

(commons-io) branch master updated (edf8c8b7e -> 6d8f485e2)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


    from edf8c8b7e Refactor common code
     new 3d412ccc0 Sort members
     new a61015c94 'this' not needed for these method calls
     new 6d8f485e2 Fix PMD UnnecessaryFullyQualifiedName and friends

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/changes/changes.xml                            |  1 +
 src/conf/maven-pmd-plugin.xml                      |  7 +++-
 .../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 +-
 .../java/org/apache/commons/io/ThreadMonitor.java  |  2 +-
 .../java/org/apache/commons/io/file/Counters.java  |  6 ++--
 .../java/org/apache/commons/io/file/PathUtils.java |  2 +-
 .../commons/io/file/StandardDeleteOption.java      |  2 +-
 .../commons/io/output/FileWriterWithEncoding.java  |  2 +-
 .../commons/io/output/LockableFileWriter.java      |  7 ++--
 .../java/org/apache/commons/io/FileUtilsTest.java  |  2 +-
 .../commons/io/IOExceptionWithCauseTest.java       |  4 +--
 .../org/apache/commons/io/LineIteratorTest.java    |  4 +--
 .../AbstractConditionalFileFilterTest.java         | 32 ++++++++---------
 .../apache/commons/io/function/IOIteratorTest.java |  8 ++---
 .../commons/io/input/BOMInputStreamTest.java       |  8 ++---
 .../commons/io/input/BrokenInputStreamTest.java    |  6 ++--
 .../io/input/buffer/CircularByteBufferTest.java    | 40 +++++++++++-----------
 20 files changed, 73 insertions(+), 68 deletions(-)


(commons-io) 03/03: Fix PMD UnnecessaryFullyQualifiedName and friends

Posted by gg...@apache.org.
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 <ga...@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;
         }
 


(commons-io) 02/03: 'this' not needed for these method calls

Posted by gg...@apache.org.
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 a61015c944ffa27891b7b0d653280cfef1dd7963
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu May 23 10:46:11 2024 -0400

    'this' not needed for these method calls
---
 .../java/org/apache/commons/io/FileUtilsTest.java  |  2 +-
 .../commons/io/IOExceptionWithCauseTest.java       |  4 +--
 .../org/apache/commons/io/LineIteratorTest.java    |  4 +--
 .../AbstractConditionalFileFilterTest.java         | 32 +++++++++++-----------
 .../commons/io/input/BOMInputStreamTest.java       |  8 +++---
 .../commons/io/input/BrokenInputStreamTest.java    |  6 ++--
 .../io/input/buffer/CircularByteBufferTest.java    |  2 +-
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 774646381..94d076412 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -2873,7 +2873,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
         file.mkdir();
 
         // Create a cyclic symlink
-        this.createCircularSymLink(file);
+        createCircularSymLink(file);
 
         assertEquals(TEST_DIRECTORY_SIZE, FileUtils.sizeOfDirectory(file), "Unexpected directory size");
     }
diff --git a/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java b/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java
index 6f5d7bdbd..b01bc04a3 100644
--- a/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java
+++ b/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java
@@ -36,7 +36,7 @@ public class IOExceptionWithCauseTest {
     public void testIOExceptionStringThrowable() {
         final Throwable cause = new IllegalArgumentException("cause");
         final IOException exception = new IOException("message", cause);
-        this.validate(exception, cause, "message");
+        validate(exception, cause, "message");
     }
 
     /**
@@ -47,7 +47,7 @@ public class IOExceptionWithCauseTest {
     public void testIOExceptionThrowable() {
         final Throwable cause = new IllegalArgumentException("cause");
         final IOException exception = new IOException(cause);
-        this.validate(exception, cause, "java.lang.IllegalArgumentException: cause");
+        validate(exception, cause, "java.lang.IllegalArgumentException: cause");
     }
 
     void validate(final Throwable throwable, final Throwable expectedCause, final String expectedMessage) {
diff --git a/src/test/java/org/apache/commons/io/LineIteratorTest.java b/src/test/java/org/apache/commons/io/LineIteratorTest.java
index 70fd90e5a..9b02cf591 100644
--- a/src/test/java/org/apache/commons/io/LineIteratorTest.java
+++ b/src/test/java/org/apache/commons/io/LineIteratorTest.java
@@ -205,7 +205,7 @@ public class LineIteratorTest {
         final List<String> lines = createLinesFile(testFile, encoding, 9);
 
         final Reader reader = new BufferedReader(Files.newBufferedReader(testFile.toPath()));
-        this.testFiltering(lines, reader);
+        testFiltering(lines, reader);
     }
 
     @Test
@@ -217,7 +217,7 @@ public class LineIteratorTest {
         final List<String> lines = createLinesFile(testFile, encoding, 9);
 
         final Reader reader = Files.newBufferedReader(testFile.toPath());
-        this.testFiltering(lines, reader);
+        testFiltering(lines, reader);
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java b/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
index a663e5f69..3a0dbe35a 100644
--- a/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
+++ b/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
@@ -60,7 +60,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
 
     @BeforeEach
     public void setUp() {
-        this.workingPath = determineWorkingDirectoryPath(this.getWorkingPathNamePropertyKey(), this.getDefaultWorkingPath());
+        this.workingPath = determineWorkingDirectoryPath(getWorkingPathNamePropertyKey(), getDefaultWorkingPath());
         this.file = new File(this.workingPath, TEST_FILE_NAME_PREFIX + 1 + TEST_FILE_TYPE);
         this.trueFilters = new TesterTrueFileFilter[4];
         this.falseFilters = new TesterFalseFileFilter[4];
@@ -75,7 +75,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
     @Test
     public void testAdd() {
         final List<TesterTrueFileFilter> filters = new ArrayList<>();
-        final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
+        final ConditionalFileFilter fileFilter = getConditionalFileFilter();
         filters.add(new TesterTrueFileFilter());
         filters.add(new TesterTrueFileFilter());
         filters.add(new TesterTrueFileFilter());
@@ -93,11 +93,11 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
 
     @Test
     public void testFilterBuiltUsingAdd() {
-        final List<List<IOFileFilter>> testFilters = this.getTestFilters();
-        final List<boolean[]> testTrueResults = this.getTrueResults();
-        final List<boolean[]> testFalseResults = this.getFalseResults();
-        final List<Boolean> testFileResults = this.getFileResults();
-        final List<Boolean> testFilenameResults = this.getFilenameResults();
+        final List<List<IOFileFilter>> testFilters = getTestFilters();
+        final List<boolean[]> testTrueResults = getTrueResults();
+        final List<boolean[]> testFalseResults = getFalseResults();
+        final List<Boolean> testFileResults = getFileResults();
+        final List<Boolean> testFilenameResults = getFilenameResults();
 
         for (int i = 1; i < testFilters.size(); i++) {
             final List<IOFileFilter> filters = testFilters.get(i);
@@ -107,7 +107,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
             final boolean fileNameResults = testFilenameResults.get(i);
 
             // Test conditional AND filter created by passing filters to the constructor
-            final IOFileFilter filter = this.buildFilterUsingAdd(filters);
+            final IOFileFilter filter = buildFilterUsingAdd(filters);
 
             // Test as a file filter
             resetTrueFilters(this.trueFilters);
@@ -127,11 +127,11 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
 
     @Test
     public void testFilterBuiltUsingConstructor() {
-        final List<List<IOFileFilter>> testFilters = this.getTestFilters();
-        final List<boolean[]> testTrueResults = this.getTrueResults();
-        final List<boolean[]> testFalseResults = this.getFalseResults();
-        final List<Boolean> testFileResults = this.getFileResults();
-        final List<Boolean> testFilenameResults = this.getFilenameResults();
+        final List<List<IOFileFilter>> testFilters = getTestFilters();
+        final List<boolean[]> testTrueResults = getTrueResults();
+        final List<boolean[]> testFalseResults = getFalseResults();
+        final List<Boolean> testFileResults = getFileResults();
+        final List<Boolean> testFilenameResults = getFilenameResults();
 
         for (int i = 1; i < testFilters.size(); i++) {
             final List<IOFileFilter> filters = testFilters.get(i);
@@ -141,7 +141,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
             final boolean fileNameResults = testFilenameResults.get(i);
 
             // Test conditional AND filter created by passing filters to the constructor
-            final IOFileFilter filter = this.buildFilterUsingConstructor(filters);
+            final IOFileFilter filter = buildFilterUsingConstructor(filters);
 
             // Test as a file filter
             resetTrueFilters(this.trueFilters);
@@ -161,7 +161,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
 
     @Test
     public void testNoFilters() {
-        final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
+        final ConditionalFileFilter fileFilter = getConditionalFileFilter();
         final File file = new File(this.workingPath, TEST_FILE_NAME_PREFIX + 1 + TEST_FILE_TYPE);
         assertFileFiltering(1, (IOFileFilter) fileFilter, file, false);
         assertFilenameFiltering(1, (IOFileFilter) fileFilter, file, false);
@@ -170,7 +170,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
     @Test
     public void testRemove() {
         final List<TesterTrueFileFilter> filters = new ArrayList<>();
-        final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
+        final ConditionalFileFilter fileFilter = getConditionalFileFilter();
         filters.add(new TesterTrueFileFilter());
         filters.add(new TesterTrueFileFilter());
         filters.add(new TesterTrueFileFilter());
diff --git a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
index 54dbde987..6bd9f5426 100644
--- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
@@ -190,9 +190,9 @@ public class BOMInputStreamTest {
             try (BOMInputStream bomInputStream = BOMInputStream.builder().setInputStream(inputStream).get()) {
                 bomInputStream.mark(1_000_000);
 
-                this.readFile(bomInputStream);
+                readFile(bomInputStream);
                 bomInputStream.reset();
-                this.readFile(bomInputStream);
+                readFile(bomInputStream);
                 inputStream.close();
             }
         }
@@ -435,12 +435,12 @@ public class BOMInputStreamTest {
 
     @Test
     public void testReadTwiceWithBOM() throws Exception {
-        this.readBOMInputStreamTwice("/org/apache/commons/io/testfileBOM.xml");
+        readBOMInputStreamTwice("/org/apache/commons/io/testfileBOM.xml");
     }
 
     @Test
     public void testReadTwiceWithoutBOM() throws Exception {
-        this.readBOMInputStreamTwice("/org/apache/commons/io/testfileNoBOM.xml");
+        readBOMInputStreamTwice("/org/apache/commons/io/testfileNoBOM.xml");
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java
index 04df8e5f4..b1ca5a028 100644
--- a/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java
@@ -74,17 +74,17 @@ public class BrokenInputStreamTest {
         try {
             try {
                 in.read();
-            } catch (Throwable localThrowable1) {
+            } catch (final Throwable localThrowable1) {
                 localThrowable2 = localThrowable1;
                 throw localThrowable1;
             } finally {
                 try {
                     in.close();
-                } catch (Throwable x2) {
+                } catch (final Throwable x2) {
                     localThrowable2.addSuppressed(x2);
                 }
             }
-        } catch (IOException expected) {
+        } catch (final IOException expected) {
             final Throwable[] suppressed = expected.getSuppressed();
             assertEquals(1, suppressed.length);
         }
diff --git a/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java b/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
index 1b2816c46..d596f3395 100644
--- a/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
+++ b/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
@@ -60,7 +60,7 @@ public class CircularByteBufferTest {
 
     @Test
     public void testClear() {
-       final byte[] data = new byte[] { 1, 2, 3 };
+       final byte[] data = { 1, 2, 3 };
        final CircularByteBuffer buffer = new CircularByteBuffer(10);
        assertEquals(0, buffer.getCurrentNumberOfBytes());
        assertFalse(buffer.hasBytes());


(commons-io) 01/03: Sort members

Posted by gg...@apache.org.
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 3d412ccc0826a5eaaacb32b735909ce4e44e6c91
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu May 23 10:35:53 2024 -0400

    Sort members
---
 .../apache/commons/io/function/IOIteratorTest.java |  8 ++---
 .../io/input/buffer/CircularByteBufferTest.java    | 40 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/test/java/org/apache/commons/io/function/IOIteratorTest.java b/src/test/java/org/apache/commons/io/function/IOIteratorTest.java
index f39703161..4aeb739f4 100644
--- a/src/test/java/org/apache/commons/io/function/IOIteratorTest.java
+++ b/src/test/java/org/apache/commons/io/function/IOIteratorTest.java
@@ -51,13 +51,13 @@ public class IOIteratorTest {
     }
 
     @Test
-    public void testAdaptIterator() throws IOException {
-        assertEquals(TestConstants.ABS_PATH_A, iterator.next());
+    public void testAdaptIterable() throws IOException {
+        assertEquals(TestConstants.ABS_PATH_A, IOIterator.adapt(newPathList()).next());
     }
 
     @Test
-    public void testAdaptIterable() throws IOException {
-        assertEquals(TestConstants.ABS_PATH_A, IOIterator.adapt(newPathList()).next());
+    public void testAdaptIterator() throws IOException {
+        assertEquals(TestConstants.ABS_PATH_A, iterator.next());
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java b/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
index 2c3bfe234..1b2816c46 100644
--- a/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
+++ b/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
@@ -58,6 +58,26 @@ public class CircularByteBufferTest {
         assertEquals(length, cbb.getCurrentNumberOfBytes());
     }
 
+    @Test
+    public void testClear() {
+       final byte[] data = new byte[] { 1, 2, 3 };
+       final CircularByteBuffer buffer = new CircularByteBuffer(10);
+       assertEquals(0, buffer.getCurrentNumberOfBytes());
+       assertFalse(buffer.hasBytes());
+
+       buffer.add(data, 0, data.length);
+       assertEquals(3, buffer.getCurrentNumberOfBytes());
+       assertEquals(7, buffer.getSpace());
+       assertTrue(buffer.hasBytes());
+       assertTrue(buffer.hasSpace());
+
+       buffer.clear();
+       assertEquals(0, buffer.getCurrentNumberOfBytes());
+       assertEquals(10, buffer.getSpace());
+       assertFalse(buffer.hasBytes());
+       assertTrue(buffer.hasSpace());
+    }
+
     @Test
     public void testPeekWithExcessiveLength() {
         assertFalse(new CircularByteBuffer().peek(new byte[] { 1, 3, 5, 7, 9 }, 0, 6));
@@ -82,24 +102,4 @@ public class CircularByteBufferTest {
     public void testPeekWithValidArguments() {
         assertFalse(new CircularByteBuffer().peek(new byte[] { 5, 10, 15, 20, 25 }, 0, 5));
     }
-
-    @Test
-    public void testClear() {
-       final byte[] data = new byte[] { 1, 2, 3 };
-       final CircularByteBuffer buffer = new CircularByteBuffer(10);
-       assertEquals(0, buffer.getCurrentNumberOfBytes());
-       assertFalse(buffer.hasBytes());
-
-       buffer.add(data, 0, data.length);
-       assertEquals(3, buffer.getCurrentNumberOfBytes());
-       assertEquals(7, buffer.getSpace());
-       assertTrue(buffer.hasBytes());
-       assertTrue(buffer.hasSpace());
-
-       buffer.clear();
-       assertEquals(0, buffer.getCurrentNumberOfBytes());
-       assertEquals(10, buffer.getSpace());
-       assertFalse(buffer.hasBytes());
-       assertTrue(buffer.hasSpace());
-    }
 }