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
The following commit(s) were added to refs/heads/master by this push:
new 7ca6a79d Remove extra blank lines
7ca6a79d is described below
commit 7ca6a79dd390d21947478114082b93903fed76bc
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Nov 26 13:58:44 2023 -0500
Remove extra blank lines
---
src/main/java/org/apache/commons/io/FileUtils.java | 1 -
src/main/java/org/apache/commons/io/IOUtils.java | 1 -
src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java | 1 -
src/main/java/org/apache/commons/io/input/BOMInputStream.java | 1 -
src/main/java/org/apache/commons/io/input/CountingInputStream.java | 1 -
src/main/java/org/apache/commons/io/output/CountingOutputStream.java | 1 -
src/main/java/org/apache/commons/io/output/StringBuilderWriter.java | 1 -
src/test/java/org/apache/commons/io/DirectoryWalkerTest.java | 1 -
src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java | 1 -
src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java | 2 --
src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java | 1 -
src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java | 1 -
src/test/java/org/apache/commons/io/FileUtilsTest.java | 1 -
src/test/java/org/apache/commons/io/FilenameUtilsTest.java | 1 -
src/test/java/org/apache/commons/io/IOCaseTest.java | 1 -
.../org/apache/commons/io/comparator/ExtensionFileComparatorTest.java | 1 -
.../java/org/apache/commons/io/comparator/PathFileComparatorTest.java | 1 -
src/test/java/org/apache/commons/io/file/AbstractTempDirTest.java | 1 -
src/test/java/org/apache/commons/io/file/DeletablePath.java | 1 -
src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java | 1 -
.../java/org/apache/commons/io/input/CharSequenceInputStreamTest.java | 1 -
src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java | 1 -
.../commons/io/input/ReversedLinesFileReaderTestParamBlockSize.java | 1 -
.../java/org/apache/commons/io/input/SwappedDataInputStreamTest.java | 2 --
src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java | 1 -
src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java | 1 -
26 files changed, 28 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index f2124462..5c4b2e80 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2682,7 +2682,6 @@ public class FileUtils {
return readLines(file, Charsets.toCharset(charsetName));
}
-
private static void requireAbsent(final File file, final String name)
throws FileExistsException {
if (file.exists()) {
throw new FileExistsException(String.format("File element in
parameter '%s' already exists: '%s'", name, file));
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java
b/src/main/java/org/apache/commons/io/IOUtils.java
index 9752615a..81584a68 100644
--- a/src/main/java/org/apache/commons/io/IOUtils.java
+++ b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -3584,7 +3584,6 @@ public class IOUtils {
write(data, output, Charsets.toCharset(charsetName));
}
-
/**
* Writes chars from a {@link CharSequence} to a {@link Writer}.
*
diff --git
a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
index c1c205ee..4eed282b 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
@@ -47,7 +47,6 @@ public class FileFilterUtils {
private static final IOFileFilter CVS_FILTER = notFileFilter(
and(directoryFileFilter(), nameFileFilter("CVS")));
-
/* Constructed on demand and then cached */
private static final IOFileFilter SVN_FILTER = notFileFilter(
and(directoryFileFilter(), nameFileFilter(".svn")));
diff --git a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
index e6b30a92..8c390bb6 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -190,7 +190,6 @@ public class BOMInputStream extends ProxyInputStream {
*/
private static final Comparator<ByteOrderMark>
ByteOrderMarkLengthComparator =
Comparator.comparing(ByteOrderMark::length).reversed();
-
/**
* Constructs a new {@link Builder}.
*
diff --git a/src/main/java/org/apache/commons/io/input/CountingInputStream.java
b/src/main/java/org/apache/commons/io/input/CountingInputStream.java
index 4b706f28..87827b4f 100644
--- a/src/main/java/org/apache/commons/io/input/CountingInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/CountingInputStream.java
@@ -43,7 +43,6 @@ public class CountingInputStream extends ProxyInputStream {
super(in);
}
-
/**
* Adds the number of read bytes to the count.
*
diff --git
a/src/main/java/org/apache/commons/io/output/CountingOutputStream.java
b/src/main/java/org/apache/commons/io/output/CountingOutputStream.java
index 3b2006f7..9f799cc9 100644
--- a/src/main/java/org/apache/commons/io/output/CountingOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/CountingOutputStream.java
@@ -40,7 +40,6 @@ public class CountingOutputStream extends ProxyOutputStream {
super(out);
}
-
/**
* Updates the count with the number of bytes that are being written.
*
diff --git
a/src/main/java/org/apache/commons/io/output/StringBuilderWriter.java
b/src/main/java/org/apache/commons/io/output/StringBuilderWriter.java
index 398f73a7..39274d41 100644
--- a/src/main/java/org/apache/commons/io/output/StringBuilderWriter.java
+++ b/src/main/java/org/apache/commons/io/output/StringBuilderWriter.java
@@ -120,7 +120,6 @@ public class StringBuilderWriter extends Writer implements
Serializable {
// no-op
}
-
/**
* Returns the underlying builder.
*
diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
b/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
index aeff9435..0e92b4fd 100644
--- a/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
+++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
@@ -243,7 +243,6 @@ public class DirectoryWalkerTest {
// Filters
private static final IOFileFilter dirsFilter =
createNameFilter(dirs);
-
private static final IOFileFilter ioFilesFilter =
createNameFilter(ioFiles);
private static final IOFileFilter outputFilesFilter =
createNameFilter(outputFiles);
diff --git
a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
index ad7337dd..ca5f1b8b 100644
--- a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
+++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
@@ -249,7 +249,6 @@ public class DirectoryWalkerTestCaseJava4 {
private static final IOFileFilter ioFilesFilter =
createNameFilter(ioFiles);
-
private static final IOFileFilter outputFilesFilter =
createNameFilter(outputFiles);
private static final IOFileFilter ioDirAndFilesFilter = new
OrFileFilter(dirsFilter, ioFilesFilter);
diff --git
a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
index da8eecfc..c1cf71e8 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
@@ -52,7 +52,6 @@ public class FileUtilsCleanSymlinksTest {
return proc.waitFor() == 0;
}
-
@Test
public void testCleanDirWithASymlinkDir() throws Exception {
if (System.getProperty("os.name").startsWith("Win")) {
@@ -162,7 +161,6 @@ public class FileUtilsCleanSymlinksTest {
assertFalse(symlinkFile.exists());
}
-
@Test
public void testCorrectlyIdentifySymlinkWithParentSymLink() throws
Exception {
if (System.getProperty("os.name").startsWith("Win")) {
diff --git a/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java
b/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java
index 851863e5..de0117a3 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java
@@ -25,7 +25,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-
/**
* Tests {@link FileUtils}.
*/
diff --git a/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
b/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
index e65bc8de..0afd1c21 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
@@ -202,5 +202,4 @@ public class FileUtilsListFilesTest {
assertFalse(fileNames.contains("dummy-file.txt"));
}
-
}
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java
b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 2c820c8d..2a67be47 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -2917,7 +2917,6 @@ public class FileUtilsTest extends AbstractTempDirTest {
TestUtils.assertEqualContent(text, file);
}
-
@Test
public void testWriteLines_3arg_nullSeparator() throws Exception {
final Object[] data = {
diff --git a/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
b/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
index 05c90f05..071ea94e 100644
--- a/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
@@ -407,7 +407,6 @@ public class FilenameUtilsTest {
assertEquals("a/b/", FilenameUtils.getPath("~user/a/b/c.txt"));
}
-
@Test
public void testGetPath_with_null_character() {
assertThrows(IllegalArgumentException.class, () ->
FilenameUtils.getPath("~user/a/\u0000b/c.txt"));
diff --git a/src/test/java/org/apache/commons/io/IOCaseTest.java
b/src/test/java/org/apache/commons/io/IOCaseTest.java
index 6ca30c0c..a30f5da2 100644
--- a/src/test/java/org/apache/commons/io/IOCaseTest.java
+++ b/src/test/java/org/apache/commons/io/IOCaseTest.java
@@ -119,7 +119,6 @@ public class IOCaseTest {
assertFalse(IOCase.SENSITIVE.checkEndsWith(null, null));
}
-
@Test
public void test_checkEquals_case() {
assertTrue(IOCase.SENSITIVE.checkEquals("ABC", "ABC"));
diff --git
a/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
b/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
index 6a6a505c..8c1c0d54 100644
---
a/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
+++
b/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
*/
public class ExtensionFileComparatorTest extends ComparatorAbstractTest {
-
@BeforeEach
public void setUp() {
comparator = (AbstractFileComparator)
ExtensionFileComparator.EXTENSION_COMPARATOR;
diff --git
a/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
b/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
index 6c5d0f13..2dd70cd4 100644
--- a/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
+++ b/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
*/
public class PathFileComparatorTest extends ComparatorAbstractTest {
-
@BeforeEach
public void setUp() {
comparator = (AbstractFileComparator)
PathFileComparator.PATH_COMPARATOR;
diff --git a/src/test/java/org/apache/commons/io/file/AbstractTempDirTest.java
b/src/test/java/org/apache/commons/io/file/AbstractTempDirTest.java
index 7e6de1f5..b2859890 100644
--- a/src/test/java/org/apache/commons/io/file/AbstractTempDirTest.java
+++ b/src/test/java/org/apache/commons/io/file/AbstractTempDirTest.java
@@ -53,7 +53,6 @@ public abstract class AbstractTempDirTest {
tempDirFile = tempDirPath.toFile();
}
-
@SuppressWarnings("resource") // no FileSystem allocation
protected final boolean isPosixFilePermissionsSupported() {
return
FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
diff --git a/src/test/java/org/apache/commons/io/file/DeletablePath.java
b/src/test/java/org/apache/commons/io/file/DeletablePath.java
index 9f9fbf07..e998dc09 100644
--- a/src/test/java/org/apache/commons/io/file/DeletablePath.java
+++ b/src/test/java/org/apache/commons/io/file/DeletablePath.java
@@ -39,7 +39,6 @@ public class DeletablePath extends AbstractPathWrapper
implements Closeable {
super(path);
}
-
@Override
public void close() throws IOException {
delete();
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 6f5e8e13..312e32a2 100644
--- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
@@ -687,7 +687,6 @@ public class BOMInputStreamTest {
parseXml(createUtf32BeDataStream(data, false));
}
-
@Test
public void testSkipReturnValueWithBom() throws IOException {
final byte[] data = { (byte) 0x31, (byte) 0x32, (byte) 0x33 };
diff --git
a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
index 3c5d2da9..6f6f1c36 100644
--- a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
@@ -458,7 +458,6 @@ public class CharSequenceInputStreamTest {
testSingleByteRead(TEST_STRING, UTF_8);
}
-
@ParameterizedTest
@MethodSource(CharsetsTest.REQUIRED_CHARSETS)
public void testSkip_RequiredCharsets(final String csName) throws
Exception {
diff --git
a/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
index ba369a9a..46612998 100644
--- a/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
@@ -62,7 +62,6 @@ public class CountingInputStreamTest {
}
}
-
@Test
public void testEOF1() throws Exception {
final ByteArrayInputStream bais = new ByteArrayInputStream(new
byte[2]);
diff --git
a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamBlockSize.java
b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamBlockSize.java
index d3023ee1..517efd76 100644
---
a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamBlockSize.java
+++
b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamBlockSize.java
@@ -77,7 +77,6 @@ public class ReversedLinesFileReaderTestParamBlockSize {
assertEquals(expected, actual, msg);
}
-
// small and uneven block sizes are not used in reality but are good to
show that the algorithm is solid
public static IntStream blockSizes() {
return IntStream.of(1, 3, 8, 256, 4096);
diff --git
a/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java
index f2193b69..2002670e 100644
--- a/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.io.input;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -29,7 +28,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
/**
* Test for the SwappedDataInputStream. This also
* effectively tests the underlying EndianUtils Stream methods.
diff --git
a/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java
b/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java
index 3c1cdf30..cb043f72 100644
--- a/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java
+++ b/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
public class StringBuilderWriterTest {
private static final char[] FOOBAR_CHARS = {'F', 'o', 'o', 'B', 'a', 'r'};
-
@Test
public void testAppendChar() throws IOException {
try (Writer writer = new StringBuilderWriter()) {
diff --git
a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
index 61355907..7b37f631 100644
--- a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
@@ -165,7 +165,6 @@ public class WriterOutputStreamTest {
assertEquals(testString, writer.toString());
}
-
private void testWithSingleByteWrite(final String testString, final
Charset charset) throws IOException {
final byte[] bytes = testString.getBytes(Charsets.toCharset(charset));
StringWriter writer = new StringWriter();
