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-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new af71852a Fix Checkstyle issues
af71852a is described below
commit af71852a49a2c96c8f873f0c9087d4b50f4ef78f
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Oct 12 08:33:00 2023 -0400
Fix Checkstyle issues
---
.../org/apache/commons/vfs2/AbstractProviderTestCase.java | 15 +++++++--------
.../vfs2/FileObjectContentOutputStreamCloseTest.java | 2 +-
.../org/apache/commons/vfs2/cache/LRUFilesCacheTests.java | 8 ++++----
.../commons/vfs2/provider/local/WindowsFileNameTests.java | 12 ++++++------
.../org/apache/commons/vfs2/util/NHttpFileServer.java | 4 ++--
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
index fd1a75f5..83304c8a 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
@@ -44,9 +44,11 @@ public abstract class AbstractProviderTestCase extends
TestCase {
public static final String FILE1_CONTENT = "This is a test file.";
// Expected contents of test files
public static final String TEST_FILE_CONTENT = "A test file.";
+
protected static Test notConfigured(final Class<?> testClass) {
return warning(testClass + " is not configured for tests, skipping");
}
+
private static Test warning(final String message) {
return new TestCase("warning") {
@Override
@@ -55,17 +57,14 @@ public abstract class AbstractProviderTestCase extends
TestCase {
}
};
}
- private FileObject baseFolder;
- private FileObject readFolder;
- private FileObject writeFolder;
+ private boolean addEmptyDir;
+ private FileObject baseFolder;
private DefaultFileSystemManager manager;
-
- private ProviderTestConfig providerConfig;
-
private Method method;
-
- private boolean addEmptyDir;
+ private ProviderTestConfig providerConfig;
+ private FileObject readFolder;
+ private FileObject writeFolder;
protected void addEmptyDir(final boolean addEmptyDir) {
this.addEmptyDir = addEmptyDir;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
index 0969a41e..93352cc1 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
@@ -40,4 +40,4 @@ public class FileObjectContentOutputStreamCloseTest {
}
}
-}
\ No newline at end of file
+}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTests.java
index f21bde7a..530d9001 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTests.java
@@ -75,12 +75,12 @@ public class LRUFilesCacheTests extends
AbstractFilesCacheTestsBase {
final FileObject dir8 = scratchFolder.resolveFile("dir8");
// check if the cache still holds the right instance
- final FileObject dir2_2 = scratchFolder.resolveFile("dir2");
- assertSame(dir2, dir2_2);
+ final FileObject dir2Bis = scratchFolder.resolveFile("dir2");
+ assertSame(dir2, dir2Bis);
// check if the cache still holds the right instance
- final FileObject dir1_2 = scratchFolder.resolveFile("dir1");
- assertNotSame(dir1, dir1_2);
+ final FileObject dir1Bis = scratchFolder.resolveFile("dir1");
+ assertNotSame(dir1, dir1Bis);
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java
index 29295b86..af3ee4e9 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java
@@ -35,11 +35,11 @@ public class WindowsFileNameTests extends
AbstractProviderTestCase {
public void testWindowsFilenameParserError() {
// check VFS-338 with 2+4 slashes we want a dedicated error
try {
- final String FILE = "file://////";
+ final String file = "file://////";
final DefaultFileSystemManager manager = getManager();
Assertions.assertNotNull(manager, "Unexpected null manager for
test " + this);
- final FileObject fo = manager.resolveFile(FILE);
- fail("Windows File Parser should not allow " + FILE + " " + fo);
+ final FileObject fo = manager.resolveFile(file);
+ fail("Windows File Parser should not allow " + file + " " + fo);
} catch (FileSystemException ex) {
assertEquals("Exception code",
"vfs.provider/invalid-absolute-uri.error", ex.getCode());
ex = (FileSystemException) ex.getCause();
@@ -50,11 +50,11 @@ public class WindowsFileNameTests extends
AbstractProviderTestCase {
@Test
public void testWindowsFilenameUNCStartError() {
try {
- final String FILE = "file://///";
+ final String file = "file://///";
final DefaultFileSystemManager manager = getManager();
Assertions.assertNotNull(manager, "Unexpected null manager for
test " + this);
- final FileObject fo = manager.resolveFile(FILE);
- fail("Windows File Parser should not allow " + FILE + " " + fo);
+ final FileObject fo = manager.resolveFile(file);
+ fail("Windows File Parser should not allow " + file + " " + fo);
} catch (FileSystemException ex) {
assertEquals("Exception code",
"vfs.provider/invalid-absolute-uri.error", ex.getCode());
ex = (FileSystemException) ex.getCause();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/NHttpFileServer.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/NHttpFileServer.java
index 9e84229a..245967a7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/NHttpFileServer.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/NHttpFileServer.java
@@ -79,7 +79,7 @@ import org.apache.hc.core5.util.TimeValue;
/**
* Embedded HTTP/1.1 file server based on a non-blocking I/O model and capable
of direct channel (zero copy) data transfer.
*/
-public class NHttpFileServer {
+public final class NHttpFileServer {
private static class HttpFileHandler implements
AsyncServerRequestHandler<Message<HttpRequest, Void>> {
@@ -181,7 +181,7 @@ public class NHttpFileServer {
start(port, docRoot, 0).awaitTermination();
}
- static final void println(final String msg) {
+ static void println(final String msg) {
if (DEBUG) {
System.out.println(HttpDateGenerator.INSTANCE.getCurrentDate() + "
| " + msg);
}
