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 bd1ed00 Minor Improvement: (#152)
bd1ed00 is described below
commit bd1ed002b0fb0f43505adc469479eb11e9bf731a
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Tue Dec 29 18:28:35 2020 +0100
Minor Improvement: (#152)
* Add final
* Unused import
* Unnecessary semicolon
* Use Standard Charset object
* Compare
* Use primitive
* Replace block comment to text plain
* Redundant 'if' statement
---
.../java/org/apache/commons/vfs2/example/Shell.java | 2 +-
.../org/apache/commons/vfs2/libcheck/SftpCheck.java | 1 -
.../vfs2/provider/webdav/WebdavFileObject.java | 4 ++--
.../vfs2/provider/webdav/WebdavFileProvider.java | 1 +
.../provider/webdav/test/WebdavProviderTestCase.java | 2 +-
.../provider/webdav/test/WebdavVersioningTests.java | 5 +++--
.../vfs2/provider/webdav4/Webdav4FileObject.java | 6 +++---
.../vfs2/provider/webdav4/Webdav4FileProvider.java | 4 ++--
.../vfs2/provider/webdav4s/Webdav4sFileProvider.java | 4 ++--
.../webdav4/test/Webdav4ProviderTestCase.java | 2 +-
.../provider/webdav4/test/Webdav4VersioningTests.java | 5 +++--
.../main/java/org/apache/commons/vfs2/Capability.java | 2 +-
.../org/apache/commons/vfs2/FileSystemOptions.java | 6 +-----
.../main/java/org/apache/commons/vfs2/FilesCache.java | 8 ++++----
.../commons/vfs2/auth/StaticUserAuthenticator.java | 4 +---
.../apache/commons/vfs2/filter/EmptyFileFilter.java | 2 +-
.../apache/commons/vfs2/filter/SizeFileFilter.java | 2 +-
.../apache/commons/vfs2/impl/DefaultFileMonitor.java | 4 ++--
.../commons/vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../commons/vfs2/impl/StandardFileSystemManager.java | 2 +-
.../apache/commons/vfs2/operations/vcs/VcsStatus.java | 2 +-
.../commons/vfs2/provider/AbstractFileName.java | 14 ++++----------
.../commons/vfs2/provider/AbstractFileObject.java | 2 +-
.../commons/vfs2/provider/AbstractFileProvider.java | 2 +-
.../commons/vfs2/provider/AbstractFileSystem.java | 4 ++--
.../commons/vfs2/provider/DefaultFileContent.java | 4 ++--
.../vfs2/provider/DefaultURLStreamHandler.java | 2 +-
.../commons/vfs2/provider/ftp/FtpFileObject.java | 4 ++--
.../vfs2/provider/hdfs/HdfsFileAttributes.java | 2 +-
.../commons/vfs2/provider/hdfs/HdfsFileSystem.java | 6 +++---
.../commons/vfs2/provider/http/HttpClientFactory.java | 10 +++++-----
.../provider/http/HttpFileContentInfoFactory.java | 2 +-
.../vfs2/provider/http4/Http4FileProvider.java | 4 ++--
.../vfs2/provider/http5/Http5FileProvider.java | 4 ++--
.../commons/vfs2/provider/ram/RamFileSystem.java | 5 +----
.../commons/vfs2/provider/sftp/SftpClientFactory.java | 6 +++---
.../commons/vfs2/provider/sftp/SftpFileObject.java | 2 +-
.../commons/vfs2/provider/sftp/SftpFileSystem.java | 2 +-
.../commons/vfs2/provider/zip/ZipFileSystem.java | 6 +++---
.../apache/commons/vfs2/tasks/AbstractSyncTask.java | 4 ++--
.../org/apache/commons/vfs2/util/DefaultCryptor.java | 1 -
.../vfs2/util/DelegatingFileSystemOptionsBuilder.java | 2 +-
.../org/apache/commons/vfs2/util/FileObjectUtils.java | 6 +-----
.../java/org/apache/commons/vfs2/util/Messages.java | 2 +-
.../java/org/apache/commons/vfs2/util/URIUtils.java | 7 ++-----
.../vfs2/cache/AbstractFilesCacheTestsBase.java | 2 +-
.../commons/vfs2/cache/LRUFilesCacheTestCase.java | 2 +-
.../apache/commons/vfs2/filter/AgeFileFilterTest.java | 8 ++++----
.../apache/commons/vfs2/filter/BaseFilterTest.java | 4 ++--
.../commons/vfs2/filter/HiddenFileFilterTest.java | 2 +-
.../http/test/GetContentInfoFunctionalTest.java | 2 +-
.../https/test/GetContentInfoFunctionalTest.java | 2 +-
.../vfs2/provider/local/test/TempFileTests.java | 3 ---
.../vfs2/provider/ram/test/RamProviderTestCase.java | 2 +-
.../vfs2/provider/zip/test/FileLockTestCase.java | 3 ++-
.../vfs2/provider/zip/test/ZipFileObjectTestCase.java | 3 ++-
.../commons/vfs2/test/AbstractProviderTestCase.java | 5 +++--
.../apache/commons/vfs2/test/PermissionsTests.java | 3 ++-
.../apache/commons/vfs2/test/ProviderRenameTests.java | 3 ++-
.../commons/vfs2/test/ProviderWriteAppendTests.java | 5 +++--
.../apache/commons/vfs2/test/ProviderWriteTests.java | 19 ++++++++++---------
.../util/DelegatingFileSystemOptionsBuilderTest.java | 2 +-
62 files changed, 113 insertions(+), 130 deletions(-)
diff --git
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
index b4789ed..01cd4ca 100644
---
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
+++
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
@@ -164,7 +164,7 @@ public final class Shell {
private void info(final String scheme) throws Exception {
System.out.println("Provider Info for scheme \"" + scheme + "\":");
- Collection<Capability> caps;
+ final Collection<Capability> caps;
caps = mgr.getProviderCapabilities(scheme);
if (caps != null && !caps.isEmpty()) {
System.out.println(" capabilities: " + caps);
diff --git
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/SftpCheck.java
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/SftpCheck.java
index f6f0bc1..e865f2f 100644
---
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/SftpCheck.java
+++
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/SftpCheck.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.vfs2.libcheck;
-import java.util.Iterator;
import java.util.Properties;
import java.util.Vector;
diff --git
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
index ba2d005..00e0265 100644
---
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
+++
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
@@ -82,7 +82,7 @@ public class WebdavFileObject extends
HttpFileObject<WebdavFileSystem> {
/**
* An empty immutable {@code WebdavFileObject} array.
*/
- private static WebdavFileObject[] EMPTY_ARRAY = new WebdavFileObject[0];
+ private static final WebdavFileObject[] EMPTY_ARRAY = new
WebdavFileObject[0];
/**
* An OutputStream that writes to a Webdav resource.
@@ -565,7 +565,7 @@ public class WebdavFileObject extends
HttpFileObject<WebdavFileSystem> {
private boolean isDirectory(final URLFileName name) throws IOException {
try {
final DavProperty property = getProperty(name,
DavConstants.PROPERTY_RESOURCETYPE);
- Node node;
+ final Node node;
if (property != null && (node = (Node) property.getValue()) !=
null) {
return node.getLocalName().equals(DavConstants.XML_COLLECTION);
}
diff --git
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java
index c44352e..9d6c162 100644
---
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java
+++
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileName;
+import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemConfigBuilder;
import org.apache.commons.vfs2.FileSystemException;
diff --git
a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
index fdc444b..74053f3 100644
---
a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
+++
b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
@@ -69,7 +69,7 @@ public class WebdavProviderTestCase extends
AbstractProviderTestConfig {
private static File RepoDirectory;
- private static boolean DEBUG =
Boolean.getBoolean("WebdavProviderTestCase.Debug");
+ private static final boolean DEBUG =
Boolean.getBoolean("WebdavProviderTestCase.Debug");
static File createTempDirectory() throws IOException {
// create base folder
diff --git
a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
index d6c4ce0..03e1de0 100644
---
a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
+++
b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.provider.webdav.test;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.commons.vfs2.FileObject;
@@ -69,7 +70,7 @@ public class WebdavVersioningTests extends
AbstractProviderTestCase {
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
map = file.getContent().getAttributes();
@@ -118,7 +119,7 @@ public class WebdavVersioningTests extends
AbstractProviderTestCase {
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
map = file.getContent().getAttributes();
diff --git
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
index a4b5af8..16ee05b 100644
---
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
+++
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
@@ -82,7 +82,7 @@ public class Webdav4FileObject extends
Http4FileObject<Webdav4FileSystem> {
/**
* An empty immutable {@code Webdav4FileObject} array.
*/
- private static Webdav4FileObject[] EMPTY_ARRAY = new Webdav4FileObject[0];
+ private static final Webdav4FileObject[] EMPTY_ARRAY = new
Webdav4FileObject[0];
/**
* An OutputStream that writes to a Webdav resource.
@@ -458,7 +458,7 @@ public class Webdav4FileObject extends
Http4FileObject<Webdav4FileSystem> {
}
private HttpResponse executeRequest(final HttpUriRequest request) throws
FileSystemException {
- HttpResponse response = null;
+ final HttpResponse response;
try {
response = executeHttpUriRequest(request);
@@ -569,7 +569,7 @@ public class Webdav4FileObject extends
Http4FileObject<Webdav4FileSystem> {
private boolean isDirectory(final GenericURLFileName name) throws
IOException {
try {
final DavProperty property = getProperty(name,
DavConstants.PROPERTY_RESOURCETYPE);
- Node node;
+ final Node node;
if (property != null && (node = (Node) property.getValue()) !=
null) {
return node.getLocalName().equals(DavConstants.XML_COLLECTION);
}
diff --git
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileProvider.java
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileProvider.java
index 5e03ed5..f1919aa 100644
---
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileProvider.java
+++
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileProvider.java
@@ -95,8 +95,8 @@ public class Webdav4FileProvider extends Http4FileProvider {
final FileSystemOptions fsOpts = fileSystemOptions == null ? new
FileSystemOptions() : fileSystemOptions;
UserAuthenticationData authData = null;
- HttpClient httpClient = null;
- HttpClientContext httpClientContext = null;
+ final HttpClient httpClient;
+ final HttpClientContext httpClientContext;
try {
final Webdav4FileSystemConfigBuilder builder =
Webdav4FileSystemConfigBuilder.getInstance();
diff --git
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4s/Webdav4sFileProvider.java
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4s/Webdav4sFileProvider.java
index 49da252..0535396 100644
---
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4s/Webdav4sFileProvider.java
+++
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4s/Webdav4sFileProvider.java
@@ -68,8 +68,8 @@ public class Webdav4sFileProvider extends Http4sFileProvider {
final FileSystemOptions fsOpts = fileSystemOptions == null ? new
FileSystemOptions() : fileSystemOptions;
UserAuthenticationData authData = null;
- HttpClient httpClient = null;
- HttpClientContext httpClientContext = null;
+ final HttpClient httpClient;
+ final HttpClientContext httpClientContext;
try {
final Webdav4FileSystemConfigBuilder builder =
Webdav4FileSystemConfigBuilder.getInstance();
diff --git
a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
index 9d7fd07..e09cd71 100644
---
a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
+++
b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
@@ -73,7 +73,7 @@ public class Webdav4ProviderTestCase extends
AbstractProviderTestConfig {
private static File RepoDirectory;
- private static boolean DEBUG =
Boolean.getBoolean("Webdav4ProviderTestCase.Debug");
+ private static final boolean DEBUG =
Boolean.getBoolean("Webdav4ProviderTestCase.Debug");
static File createTempDirectory() throws IOException {
// create base folder
diff --git
a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4VersioningTests.java
b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4VersioningTests.java
index 12e0cff..761a15d 100644
---
a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4VersioningTests.java
+++
b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4VersioningTests.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.provider.webdav4.test;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.commons.vfs2.FileObject;
@@ -71,7 +72,7 @@ public class Webdav4VersioningTests extends
AbstractProviderTestCase {
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
map = file.getContent().getAttributes();
@@ -120,7 +121,7 @@ public class Webdav4VersioningTests extends
AbstractProviderTestCase {
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
map = file.getContent().getAttributes();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java
index 2ea6f65..79383dc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/Capability.java
@@ -153,5 +153,5 @@ public enum Capability {
*
* @since 2.0
*/
- DIRECTORY_READ_CONTENT;
+ DIRECTORY_READ_CONTENT
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
index 1963c89..91e8cec 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
@@ -103,11 +103,7 @@ public final class FileSystemOptions implements Cloneable {
if (!fileSystemClass.equals(that.fileSystemClass)) {
return false;
}
- if (!name.equals(that.name)) {
- return false;
- }
-
- return true;
+ return name.equals(that.name);
}
@Override
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FilesCache.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FilesCache.java
index 8f37d6d..a627786 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FilesCache.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FilesCache.java
@@ -65,10 +65,10 @@ public interface FilesCache {
*/
void removeFile(final FileSystem fileSystem, final FileName name);
- /**
- * If the cache uses timestamps it could use this method to handle updates
of them.
- *
- * @param file file name
+ /*
+ If the cache uses timestamps it could use this method to handle updates
of them.
+
+ @param file file name
*/
// public void touchFile(final FileObject file);
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
index 9aa556a..788caba 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
@@ -132,9 +132,7 @@ public class StaticUserAuthenticator implements
UserAuthenticator, Comparable<St
}
final int result = thisString.compareTo(otherString);
- if (result != 0) {
- return result;
- }
+ return result;
}
return 0;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
index e90ac96..99316cb 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
@@ -94,7 +94,7 @@ public class EmptyFileFilter implements FileFilter,
Serializable {
final FileObject[] files = file.getChildren();
return files == null || files.length == 0;
}
- try (final FileContent content = file.getContent();) {
+ try (final FileContent content = file.getContent()) {
return content.isEmpty();
}
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
index d11edc6..ede1025 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
@@ -104,7 +104,7 @@ public class SizeFileFilter implements FileFilter,
Serializable {
if (!file.exists()) {
return false;
}
- try (final FileContent content = file.getContent();) {
+ try (final FileContent content = file.getContent()) {
final long length = content.getSize();
final boolean smaller = length < size;
return acceptLarger ? !smaller : smaller;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
index f99e953..697f6ca 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
@@ -304,13 +304,13 @@ public class DefaultFileMonitor implements Runnable,
FileMonitor {
public void run() {
mainloop: while (!monitorThread.isInterrupted() && this.shouldRun) {
// For each entry in the map
- Object[] fileNames;
+ final Object[] fileNames;
synchronized (this.monitorMap) {
fileNames = this.monitorMap.keySet().toArray();
}
for (int iterFileNames = 0; iterFileNames < fileNames.length;
iterFileNames++) {
final FileName fileName = (FileName) fileNames[iterFileNames];
- FileMonitorAgent agent;
+ final FileMonitorAgent agent;
synchronized (this.monitorMap) {
agent = this.monitorMap.get(fileName);
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
index bdd9276..890ffdf 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
@@ -805,7 +805,7 @@ public class DefaultFileSystemManager implements
FileSystemManager {
throw new
FileSystemException("vfs.provider/invalid-descendent-name.error", name);
}
- String fullPath;
+ final String fullPath;
if (scheme != null) {
fullPath = resolvedPath;
} else {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
index 25a7c0e..fcb84a3 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
@@ -118,7 +118,7 @@ public class StandardFileSystemManager extends
DefaultFileSystemManager {
* @throws FileSystemException if an error occurs.
*/
protected void configurePlugins() throws FileSystemException {
- Enumeration<URL> enumResources;
+ final Enumeration<URL> enumResources;
try {
enumResources = loadResources(PLUGIN_CONFIG_RESOURCE);
} catch (final IOException e) {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java
index d47698c..7d5c9e4 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java
@@ -26,7 +26,7 @@ public enum VcsStatus {
7), UNVERSIONED(8), MISSING(9), OBSTRUCTED(10), REVERTED(11),
RESOLVED(12), COPIED(
13), MOVED(14), RESTORED(15), UPDATED(16), EXTERNAL(18),
CORRUPTED(19), NOT_REVERTED(20);
- private int status;
+ private final int status;
VcsStatus(final int status) {
this.status = status;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
index 8ac0667..7b1b0b7 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
@@ -510,18 +510,12 @@ public abstract class AbstractFileName implements
FileName {
}
if (scope == NameScope.CHILD) {
- if (path.length() == baseLen || baseLen > 1 &&
path.charAt(baseLen) != SEPARATOR_CHAR
- || path.indexOf(SEPARATOR_CHAR, baseLen + 1) != -1) {
- return false;
- }
+ return path.length() != baseLen && (baseLen <= 1 ||
path.charAt(baseLen) == SEPARATOR_CHAR)
+ && path.indexOf(SEPARATOR_CHAR, baseLen + 1) == -1;
} else if (scope == NameScope.DESCENDENT) {
- if (path.length() == baseLen || baseLen > 1 &&
path.charAt(baseLen) != SEPARATOR_CHAR) {
- return false;
- }
+ return path.length() != baseLen && (baseLen <= 1 ||
path.charAt(baseLen) == SEPARATOR_CHAR);
} else if (scope == NameScope.DESCENDENT_OR_SELF) {
- if (baseLen > 1 && path.length() > baseLen && path.charAt(baseLen)
!= SEPARATOR_CHAR) {
- return false;
- }
+ return baseLen <= 1 || path.length() <= baseLen ||
path.charAt(baseLen) == SEPARATOR_CHAR;
} else if (scope != NameScope.FILE_SYSTEM) {
throw new IllegalArgumentException();
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
index b47978a..adc6064 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -1077,7 +1077,7 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
}
// allow the filesystem to return resolved children. e.g. prefill
type for webdav
- FileObject[] childrenObjects;
+ final FileObject[] childrenObjects;
try {
childrenObjects = doListChildrenResolved();
children = extractNames(childrenObjects);
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
index 8782419..f0135f7 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
@@ -132,7 +132,7 @@ public abstract class AbstractFileProvider extends
AbstractVfsContainer implemen
* Free unused resources.
*/
public void freeUnusedResources() {
- AbstractFileSystem[] abstractFileSystems;
+ final AbstractFileSystem[] abstractFileSystems;
synchronized (fileSystems) {
// create snapshot under lock
abstractFileSystems =
fileSystems.values().toArray(EMPTY_ABSTRACTFILESYSTEMS);
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
index f3095bc..0486d26 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
@@ -333,8 +333,8 @@ public abstract class AbstractFileSystem extends
AbstractVfsComponent implements
}
}
- /**
- * resync the file information if requested
+ /*
+ resync the file information if requested
*/
if
(getFileSystemManager().getCacheStrategy().equals(CacheStrategy.ON_RESOLVE)) {
file.refresh();
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
index 397bc55..07b7367 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
@@ -510,7 +510,7 @@ public final class DefaultFileContent implements
FileContent {
// ? new FileContentInputStream(fileObject, inputStream)
// : new FileContentInputStream(fileObject, inputStream,
bufferSize);
- InputStream wrappedInputStream;
+ final InputStream wrappedInputStream;
if (inputStream instanceof BufferedInputStream) {
// Don't double buffer.
wrappedInputStream = new RawFileContentInputStream(fileObject,
inputStream);
@@ -861,7 +861,7 @@ public final class DefaultFileContent implements
FileContent {
try {
// This read/write code from Apache Commons IO
final byte[] buffer = new byte[bufferSize];
- int n = 0;
+ int n;
while (-1 != (n = input.read(buffer))) {
output.write(buffer, 0, n);
count += n;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
index 78b0d22..5846286 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultURLStreamHandler.java
@@ -52,7 +52,7 @@ public class DefaultURLStreamHandler extends URLStreamHandler
{
try {
final FileObject old = context.resolveFile(u.toExternalForm(),
fileSystemOptions);
- FileObject newURL;
+ final FileObject newURL;
if (start > 0 && spec.charAt(start - 1) == ':') {
newURL = context.resolveFile(old, spec, fileSystemOptions);
} else {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
index c141789..df796ca 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
@@ -330,7 +330,7 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
protected OutputStream doGetOutputStream(final boolean bAppend) throws
Exception {
final FtpClient client = getAbstractFileSystem().getClient();
try {
- OutputStream out = null;
+ final OutputStream out;
if (bAppend) {
out = client.appendFileStream(relPath);
} else {
@@ -606,7 +606,7 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
private void setFTPFile(final boolean flush) throws IOException {
synchronized (getFileSystem()) {
final FtpFileObject parent = (FtpFileObject)
FileObjectUtils.getAbstractFileObject(getParent());
- FTPFile newFileInfo;
+ final FTPFile newFileInfo;
if (parent != null) {
newFileInfo =
parent.getChildFile(UriParser.decode(getName().getBaseName()), flush);
} else {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileAttributes.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileAttributes.java
index fd8c819..0b9f1dc 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileAttributes.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileAttributes.java
@@ -56,5 +56,5 @@ public enum HdfsFileAttributes {
/**
* Modification time.
*/
- MODIFICATION_TIME;
+ MODIFICATION_TIME
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java
index f45caf8..ce1ea2d 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java
@@ -158,7 +158,7 @@ public class HdfsFileSystem extends AbstractFileSystem {
fileObject = null;
}
if (null == fileObject) {
- String path = null;
+ String path;
try {
path = URLDecoder.decode(name.getPath(), "UTF-8");
} catch (final UnsupportedEncodingException e) {
@@ -171,8 +171,8 @@ public class HdfsFileSystem extends AbstractFileSystem {
this.putFileToCache(fileObject);
}
}
- /**
- * resync the file information if requested
+ /*
+ resync the file information if requested
*/
if
(getFileSystemManager().getCacheStrategy().equals(CacheStrategy.ON_RESOLVE)) {
fileObject.refresh();
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java
index 08bcf97..fc2eb6a 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java
@@ -63,7 +63,7 @@ public final class HttpClientFactory {
public static HttpClient createConnection(final
HttpFileSystemConfigBuilder builder, final String scheme,
final String hostname, final int port, final String username,
final String password,
final FileSystemOptions fileSystemOptions) throws
FileSystemException {
- HttpClient client;
+ final HttpClient client;
try {
final HttpConnectionManager mgr = new
MultiThreadedHttpConnectionManager();
final HttpConnectionManagerParams connectionMgrParams =
mgr.getParams();
@@ -110,10 +110,10 @@ public final class HttpClientFactory {
client.getState().addCookies(cookies);
}
}
- /**
- * ConnectionManager set methods must be called after the host &
port and proxy host & port are set in the
- * HostConfiguration. They are all used as part of the key when
HttpConnectionManagerParams tries to locate
- * the host configuration.
+ /*
+ ConnectionManager set methods must be called after the host &
port and proxy host & port are set in the
+ HostConfiguration. They are all used as part of the key when
HttpConnectionManagerParams tries to locate
+ the host configuration.
*/
connectionMgrParams.setMaxConnectionsPerHost(config,
builder.getMaxConnectionsPerHost(fileSystemOptions));
connectionMgrParams.setMaxTotalConnections(builder.getMaxTotalConnections(fileSystemOptions));
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
index 0b13a41..83e3756 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
@@ -38,7 +38,7 @@ public class HttpFileContentInfoFactory implements
FileContentInfoFactory {
String contentType = null;
- HeadMethod headMethod;
+ final HeadMethod headMethod;
try (final HttpFileObject<HttpFileSystem> httpFile =
(HttpFileObject<HttpFileSystem>) FileObjectUtils
.getAbstractFileObject(fileContent.getFile())) {
headMethod = httpFile.getHeadMethod();
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
index a36306c..31d2b6a 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
@@ -127,8 +127,8 @@ public class Http4FileProvider extends
AbstractOriginatingFileProvider {
final GenericFileName rootName = (GenericFileName) name;
UserAuthenticationData authData = null;
- HttpClient httpClient = null;
- HttpClientContext httpClientContext = null;
+ HttpClient httpClient;
+ HttpClientContext httpClientContext;
try {
final Http4FileSystemConfigBuilder builder =
Http4FileSystemConfigBuilder.getInstance();
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
index 1d1e547..478f2f4 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
@@ -129,8 +129,8 @@ public class Http5FileProvider extends
AbstractOriginatingFileProvider {
final GenericFileName rootName = (GenericFileName) name;
UserAuthenticationData authData = null;
- HttpClient httpClient = null;
- HttpClientContext httpClientContext = null;
+ HttpClient httpClient;
+ HttpClientContext httpClientContext;
try {
final Http5FileSystemConfigBuilder builder =
Http5FileSystemConfigBuilder.getInstance();
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
index 12f2deb..92f365a 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
@@ -16,11 +16,8 @@
*/
package org.apache.commons.vfs2.provider.ram;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -98,7 +95,7 @@ public class RamFileSystem extends AbstractFileSystem
implements Serializable {
return null;
}
final Collection<RamFileData> children = data.getChildren();
- String[] names;
+ final String[] names;
synchronized (children) {
names = children.stream().map(childData ->
childData.getName().getBaseName()).toArray(String[]::new);
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
index 70a1de7..375cc2a 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
@@ -87,7 +87,7 @@ public final class SftpClientFactory {
addIdentities(jsch, sshDir, identities);
setConfigRepository(jsch, sshDir, configRepository, loadOpenSSHConfig);
- Session session;
+ final Session session;
try {
session = jsch.getSession(new String(username), hostname, port);
if (password != null) {
@@ -221,7 +221,7 @@ public final class SftpClientFactory {
private static Proxy createStreamProxy(final String proxyHost, final int
proxyPort,
final FileSystemOptions fileSystemOptions, final
SftpFileSystemConfigBuilder builder) {
- Proxy proxy;
+ final Proxy proxy;
// Use a stream proxy, i.e. it will use a remote host as a proxy
// and run a command (e.g. netcat) that forwards input/output
// to the target host.
@@ -268,7 +268,7 @@ public final class SftpClientFactory {
* @return The {@code .ssh} directory
*/
private static File findSshDir() {
- String sshDirPath;
+ final String sshDirPath;
sshDirPath = System.getProperty("vfs.sftp.sshdir");
if (sshDirPath != null) {
final File sshDir = new File(sshDirPath);
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
index 593cc82..a27fc07 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
@@ -443,7 +443,7 @@ public class SftpFileObject extends
AbstractFileObject<SftpFileSystem> {
* outstr.close(); return new
ByteArrayInputStream(outstr.toByteArray());
*/
- InputStream inputStream;
+ final InputStream inputStream;
try {
// VFS-210: sftp allows to gather an input stream even
from a directory and will
// fail on first read. So we need to check the type anyway
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
index a20e168..d65975f 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
@@ -355,7 +355,7 @@ public class SftpFileSystem extends AbstractFileSystem {
private boolean detectExecDisabled() {
try {
return getUId() == UNIDENTIFED;
- } catch(JSchException | IOException e) {
+ } catch(final JSchException | IOException e) {
LOG.debug("Cannot get UID, assuming no exec channel is present",
e);
return true;
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
index ef6336f..7ce2351 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
@@ -201,8 +201,8 @@ public class ZipFileSystem extends AbstractFileSystem {
return super.toString() + " for " + file;
}
- /**
- * will be called after all file-objects closed their streams. protected
void notifyAllStreamsClosed() {
- * closeCommunicationLink(); }
+ /*
+ will be called after all file-objects closed their streams. protected
void notifyAllStreamsClosed() {
+ closeCommunicationLink(); }
*/
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
index d96afcd..a3ab7cd 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
@@ -247,7 +247,7 @@ public abstract class AbstractSyncTask extends VfsTask {
if (rootFile.isFile()) {
// Build the destination file name
- String relName = null;
+ final String relName;
if (srcDirName == null || !srcDirIsBase) {
relName = rootName.getBaseName();
} else {
@@ -265,7 +265,7 @@ public abstract class AbstractSyncTask extends VfsTask {
for (final FileObject srcFile : files) {
// Build the destination file name
- String relName = null;
+ final String relName;
if (srcDirName == null || !srcDirIsBase) {
relName = rootName.getRelativeName(srcFile.getName());
} else {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DefaultCryptor.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DefaultCryptor.java
index 58a404c..53d9005 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DefaultCryptor.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DefaultCryptor.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.vfs2.util;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import javax.crypto.Cipher;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
index c31adf0..19ae6a8 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
@@ -309,7 +309,7 @@ public class DelegatingFileSystemOptionsBuilder {
*/
private void invokeSetter(final Class<?> valueParameter, final Context
ctx, final Method configSetter,
final Object values) throws FileSystemException {
- Object[] args;
+ final Object[] args;
if (valueParameter.isArray()) {
args = new Object[] { ctx.fso, values };
} else {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
index daf2ddb..326663e 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
@@ -139,11 +139,7 @@ public final class FileObjectUtils {
searchObject = ((DecoratedFileObject)
searchObject).getDecoratedFileObject();
}
- if (wantedClass.isInstance(searchObject)) {
- return true;
- }
-
- return false;
+ return wantedClass.isInstance(searchObject);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Messages.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Messages.java
index f6c1a46..6343095 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Messages.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Messages.java
@@ -31,7 +31,7 @@ public final class Messages {
/**
* Map from message code to MessageFormat object for the message.
*/
- private static ConcurrentMap<String, MessageFormat> messageMap = new
ConcurrentHashMap<>();
+ private static final ConcurrentMap<String, MessageFormat> messageMap = new
ConcurrentHashMap<>();
private static final ResourceBundle RESOURCES = new
CombinedResources("org.apache.commons.vfs2.Resources");
private Messages() {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java
index 18be01b..9eba68a 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java
@@ -19,6 +19,7 @@ package org.apache.commons.vfs2.util;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.BitSet;
import org.apache.commons.logging.Log;
@@ -57,11 +58,7 @@ public class URIUtils {
* @return The string representation of the byte array
*/
static String getAsciiString(final byte[] data, final int offset,
final int length) {
- try {
- return new String(data, offset, length, "US-ASCII");
- } catch (final UnsupportedEncodingException e) {
- throw new RuntimeException("US-ASCII charset is not
supported.");
- }
+ return new String(data, offset, length, StandardCharsets.US_ASCII);
}
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java
index e47949c..f4dd49a 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java
@@ -53,7 +53,7 @@ public abstract class AbstractFilesCacheTestsBase extends
AbstractProviderTestCa
}
/**
- * Basic Cache operations, work for all caches (besides {@link
NullFilesCache#testBasicCacheOps() NullFilesCache}).
+ * Basic Cache operations, work for all caches (besides {@link
NullFilesCacheTests#testBasicCacheOps() NullFilesCache}).
*/
@Test
public void testBasicCacheOps() throws Exception {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
index 9a52325..41395fc 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
@@ -28,7 +28,7 @@ import org.apache.commons.vfs2.test.CacheTestSuite;
import junit.framework.Test;
/**
- * Tests the {@link LRUFilesCache} using {@link LRUFilesCacheTestss}.
+ * Tests the {@link LRUFilesCache} using {@link LRUFilesCacheTests}.
*/
public class LRUFilesCacheTestCase extends AbstractProviderTestConfig {
public static Test suite() throws Exception {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
index 44048d3..99c9ec7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
@@ -36,13 +36,13 @@ import org.junit.Test;
// CHECKSTYLE:OFF Test code
public class AgeFileFilterTest extends BaseFilterTest {
- private static long DAY_MILLIS = 24 * 60 * 60 * 1000;
+ private static final long DAY_MILLIS = 24 * 60 * 60 * 1000;
- private static long NOW = System.currentTimeMillis();
+ private static final long NOW = System.currentTimeMillis();
- private static long TWO_DAYS_AGO = NOW - (2 * DAY_MILLIS);
+ private static final long TWO_DAYS_AGO = NOW - (2 * DAY_MILLIS);
- private static long TWO_DAYS_LATER = NOW + (2 * DAY_MILLIS);
+ private static final long TWO_DAYS_LATER = NOW + (2 * DAY_MILLIS);
private static File testDir;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
index b64111e..90ec462 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
@@ -103,7 +103,7 @@ public abstract class BaseFilterTest {
* Asserts that the array contains the given file names.
*
* @param files Array to check.
- * @param file names File names to find.
+ * @param fileNames names File names to find.
*/
protected void assertContains(final FileObject[] files, final String...
fileNames) {
for (final String fileName : fileNames) {
@@ -249,7 +249,7 @@ public abstract class BaseFilterTest {
throw new IllegalArgumentException("destFile cannot be null");
}
- try (final ZipOutputStream out = new ZipOutputStream(new
BufferedOutputStream(new FileOutputStream(destFile)));) {
+ try (final ZipOutputStream out = new ZipOutputStream(new
BufferedOutputStream(new FileOutputStream(destFile)))) {
zipDir(srcDir, filter, destPath, out);
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
index 10fb1a2..f3f7825 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
@@ -124,7 +124,7 @@ public class HiddenFileFilterTest extends BaseFilterTest {
public void testZipFile() throws FileSystemException {
// Same test with ZIP file
- FileObject[] files;
+ final FileObject[] files;
// TODO xxx In Java 6 there is no way to hide a file
// files = zipFileObj.findFiles(new
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/GetContentInfoFunctionalTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/GetContentInfoFunctionalTest.java
index d293f19..38348dc 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/GetContentInfoFunctionalTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/GetContentInfoFunctionalTest.java
@@ -46,7 +46,7 @@ public class GetContentInfoFunctionalTest {
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http://www.apache.org/licenses/LICENSE-2.0.txt";;
try (final FileObject fo = fsManager.resolveFile(uri,
getOptionsWithProxy());
- final FileContent content = fo.getContent();) {
+ final FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
// Used to NPE before fix:
content.getContentInfo();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/test/GetContentInfoFunctionalTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/test/GetContentInfoFunctionalTest.java
index ccb6f90..5846c54 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/test/GetContentInfoFunctionalTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/test/GetContentInfoFunctionalTest.java
@@ -48,7 +48,7 @@ public class GetContentInfoFunctionalTest {
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http://www.apache.org/licenses/LICENSE-2.0.txt";;
try (final FileObject fo = fsManager.resolveFile(uri,
getOptionsWithProxy());
- final FileContent content = fo.getContent();) {
+ final FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
// Used to NPE before fix:
content.getContentInfo();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/TempFileTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/TempFileTests.java
index 02ae90b..710091c 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/TempFileTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/TempFileTests.java
@@ -22,10 +22,7 @@ import java.net.URI;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
-import org.apache.commons.vfs2.VFS;
-import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.test.AbstractProviderTestCase;
-import org.junit.Assert;
import org.junit.Test;
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
index 3ed8ebc..ebf6868 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
@@ -36,7 +36,7 @@ public class RamProviderTestCase extends
AbstractProviderTestConfig {
private boolean inited = false;
/** logger */
- private static Log log = LogFactory.getLog(RamProviderTestCase.class);
+ private static final Log log =
LogFactory.getLog(RamProviderTestCase.class);
/**
* Creates the test suite for the ram file system.
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/FileLockTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/FileLockTestCase.java
index dda1cf6..ad2424b 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/FileLockTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/FileLockTestCase.java
@@ -20,6 +20,7 @@ package org.apache.commons.vfs2.provider.zip.test;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -69,7 +70,7 @@ public class FileLockTestCase {
}
private void readAndAssert(final InputStream inputStream) throws
IOException {
- final String string = IOUtils.toString(inputStream, "UTF-8");
+ final String string = IOUtils.toString(inputStream,
StandardCharsets.UTF_8);
Assert.assertNotNull(string);
Assert.assertEquals("This is a test file.", string);
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipFileObjectTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipFileObjectTestCase.java
index 0738803..78145fd 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipFileObjectTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipFileObjectTestCase.java
@@ -20,6 +20,7 @@ package org.apache.commons.vfs2.provider.zip.test;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -55,7 +56,7 @@ public class ZipFileObjectTestCase {
private void readAndAssert(final FileObject fileObject, final InputStream
inputStream, final String expectedId)
throws IOException {
- final String streamData = IOUtils.toString(inputStream, "UTF-8");
+ final String streamData = IOUtils.toString(inputStream,
StandardCharsets.UTF_8);
final String fileObjectString = fileObject.toString();
Assert.assertNotNull(fileObjectString, streamData);
Assert.assertEquals(
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java
index 905f894..0d3efec 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.AbstractVfsTestCase;
import org.apache.commons.vfs2.Capability;
@@ -224,7 +225,7 @@ public abstract class AbstractProviderTestCase extends
AbstractVfsTestCase {
*/
protected void assertSameURLContent(final String expected, final
URLConnection connection) throws Exception {
// Get file content as a binary stream
- final byte[] expectedBin = expected.getBytes("utf-8");
+ final byte[] expectedBin = expected.getBytes(StandardCharsets.UTF_8);
// Check lengths
assertEquals("same content length", expectedBin.length,
connection.getContentLength());
@@ -260,7 +261,7 @@ public abstract class AbstractProviderTestCase extends
AbstractVfsTestCase {
assertTrue(file.isFile());
// Get file content as a binary stream
- final byte[] expectedBin = expected.getBytes("utf-8");
+ final byte[] expectedBin = expected.getBytes(StandardCharsets.UTF_8);
// Check lengths
final FileContent content = file.getContent();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java
index de36e4d..3a8e7bc 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/PermissionsTests.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.test;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.vfs2.Capability;
@@ -146,7 +147,7 @@ public class PermissionsTests extends
AbstractProviderTestCase {
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
return file;
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderRenameTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderRenameTests.java
index 38c8d8a..afb34e8 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderRenameTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderRenameTests.java
@@ -19,6 +19,7 @@ package org.apache.commons.vfs2.test;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileObject;
@@ -75,7 +76,7 @@ public class ProviderRenameTests extends
AbstractProviderTestCase {
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
return content;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteAppendTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteAppendTests.java
index 6f38f65..19a773c 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteAppendTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteAppendTests.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.test;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileObject;
@@ -65,13 +66,13 @@ public class ProviderWriteAppendTests extends
AbstractProviderTestCase {
final String contentAppend = content + content;
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
// Append to the new file
try (OutputStream os2 = file.getContent().getOutputStream(true)) {
- os2.write(content.getBytes("utf-8"));
+ os2.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(contentAppend, file);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
index e863f12..a535a75 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.test;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Objects;
@@ -290,8 +291,8 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
assertFalse(file.exists());
}
- /**
- * Tests concurrent read and write on the same file fails.
+ /*
+ Tests concurrent read and write on the same file fails.
*/
/*
* ima...@apache.org leave this to some sort of LockManager public void
testConcurrentReadWrite() throws Exception {
@@ -306,8 +307,8 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
* instr.close(); } }
*/
- /**
- * Tests concurrent writes on the same file fails.
+ /*
+ Tests concurrent writes on the same file fails.
*/
/*
* ima...@apache.org leave this to some sort of LockManager public void
testConcurrentWrite() throws Exception {
@@ -341,7 +342,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
// Create the source file
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
@@ -368,7 +369,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
// Create the source file
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
@@ -401,7 +402,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
// Create the source file
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
@@ -657,7 +658,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
// Create the source file
final String expectedString = "Here is some sample content for the
file. Blah Blah Blah.";
try (OutputStream expectedOutputStream =
fileSource.getContent().getOutputStream()) {
- expectedOutputStream.write(expectedString.getBytes("utf-8"));
+
expectedOutputStream.write(expectedString.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(expectedString, fileSource);
@@ -705,7 +706,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
// Create the source file
final String content = "Here is some sample content for the file.
Blah Blah Blah.";
try (OutputStream os = file.getContent().getOutputStream()) {
- os.write(content.getBytes("utf-8"));
+ os.write(content.getBytes(StandardCharsets.UTF_8));
}
assertSameContent(content, file);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
index 52ad3b8..7deaaaa 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
@@ -104,7 +104,7 @@ public class DelegatingFileSystemOptionsBuilderTest {
}
}
- private static String[] schemes = new String[] { "http", "ftp", "file",
"zip", "tar", "tgz", "bz2", "gz",
+ private static final String[] schemes = new String[] { "http", "ftp",
"file", "zip", "tar", "tgz", "bz2", "gz",
"jar", "tmp", "ram" };
@Test
