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 2021/11/26 17:10:04 UTC

[commons-vfs] 01/16: Misc clean ups.

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

commit b4d682fa1e993d2914aa37a1b428a45443b575ec
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 09:40:21 2021 -0500

    Misc clean ups.
---
 .../main/java/org/apache/commons/vfs2/example/Shell.java   |  2 +-
 .../commons/vfs2/provider/webdav/WebdavFileObject.java     |  4 ++--
 .../commons/vfs2/provider/webdav/WebdavFileProvider.java   |  2 +-
 .../vfs2/provider/webdav/test/WebdavProviderTestCase.java  |  8 ++------
 .../commons/vfs2/provider/webdav4/Webdav4FileObject.java   |  4 ++--
 .../commons/vfs2/provider/webdav4/Webdav4FileProvider.java |  2 +-
 .../provider/webdav4/test/Webdav4ProviderTestCase.java     |  6 +-----
 .../src/main/java/org/apache/commons/vfs2/FileName.java    |  2 +-
 .../src/main/java/org/apache/commons/vfs2/FileObject.java  |  2 +-
 .../org/apache/commons/vfs2/FileSystemConfigBuilder.java   |  4 ++--
 .../apache/commons/vfs2/impl/DefaultFileReplicator.java    |  2 +-
 .../commons/vfs2/operations/FileOperationProvider.java     |  2 +-
 .../org/apache/commons/vfs2/provider/AbstractFileName.java |  8 +++-----
 .../apache/commons/vfs2/provider/AbstractFileProvider.java |  2 +-
 .../apache/commons/vfs2/provider/AbstractFileSystem.java   |  2 +-
 .../apache/commons/vfs2/provider/DefaultFileContent.java   |  2 +-
 .../java/org/apache/commons/vfs2/provider/RFC2396.java     |  2 +-
 .../apache/commons/vfs2/provider/ftp/FtpFileProvider.java  |  2 +-
 .../commons/vfs2/provider/http/HttpFileProvider.java       |  4 ++--
 .../commons/vfs2/provider/http4/Http4FileProvider.java     | 10 +++++-----
 .../commons/vfs2/provider/http5/Http5FileProvider.java     | 10 +++++-----
 .../org/apache/commons/vfs2/provider/local/LocalFile.java  |  4 ++--
 .../commons/vfs2/provider/sftp/SftpFileProvider.java       |  2 +-
 .../vfs2/provider/sftp/SftpFileSystemConfigBuilder.java    |  4 ++--
 .../apache/commons/vfs2/provider/tar/Tbz2FileProvider.java |  2 +-
 .../apache/commons/vfs2/provider/tar/TgzFileProvider.java  |  2 +-
 .../java/org/apache/commons/vfs2/tasks/DeleteTask.java     |  2 +-
 .../org/apache/commons/vfs2/util/CombinedResources.java    |  2 +-
 .../src/main/java/org/apache/commons/vfs2/util/Os.java     |  2 +-
 .../main/java/org/apache/commons/vfs2/util/OsFamily.java   |  2 +-
 .../java/org/apache/commons/vfs2/AbstractTestSuite.java    |  4 ++--
 .../commons/vfs2/FileObjectEscapeCharacterInPathTest.java  | 14 +++++++-------
 .../java/org/apache/commons/vfs2/ProviderDeleteTests.java  |  2 +-
 .../src/test/java/org/apache/commons/vfs2/RunTest.java     |  2 +-
 .../apache/commons/vfs2/impl/DefaultFileMonitorTest.java   |  1 -
 .../commons/vfs2/impl/DefaultFileSystemManagerTest.java    |  4 ++--
 .../org/apache/commons/vfs2/impl/VfsClassLoaderTests.java  |  4 ++--
 .../commons/vfs2/provider/local/WindowsFileNameTests.java  |  4 ++--
 .../commons/vfs2/provider/ram/CustomRamProviderTest.java   |  2 +-
 .../vfs2/util/DelegatingFileSystemOptionsBuilderTest.java  |  4 ++--
 40 files changed, 67 insertions(+), 78 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 eda480b..63dbf34 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
@@ -56,7 +56,7 @@ public final class Shell {
 
     private Shell() throws IOException {
         final String providers = System.getProperty("providers");
-        final URL providersUrl = (providers != null) ? Shell.class.getResource("/" + providers) : null;
+        final URL providersUrl = providers != null ? Shell.class.getResource("/" + providers) : null;
 
         if (providersUrl != null) {
             mgr = new StandardFileSystemManager();
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 0783f7c..19ec04b 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 final WebdavFileObject[] EMPTY_ARRAY = new WebdavFileObject[0];
+    private static final WebdavFileObject[] EMPTY_ARRAY = {};
 
     /**
      * An OutputStream that writes to a Webdav resource.
@@ -230,7 +230,7 @@ public class WebdavFileObject extends HttpFileObject<WebdavFileSystem> {
         builder = (WebdavFileSystemConfigBuilder) WebdavFileSystemConfigBuilder.getInstance();
     }
 
-    void log(Exception ex) {
+    void log(final Exception ex) {
         // TODO Consider logging.
     }
 
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 9d6c162..37a557b 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
@@ -47,7 +47,7 @@ public class WebdavFileProvider extends HttpFileProvider {
      * @deprecated Might be removed in the next major version.
      */
     @Deprecated
-    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = new UserAuthenticationData.Type[] {
+    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = {
             UserAuthenticationData.USERNAME, UserAuthenticationData.PASSWORD };
 
     /** The capabilities of the WebDAV provider */
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 38ed437..a2f086b 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
@@ -52,7 +52,7 @@ import junit.framework.Test;
  *
  */
 public class WebdavProviderTestCase extends AbstractProviderTestConfig {
-    private static final char[] PASSWORD = new char[0];
+    private static final char[] PASSWORD = {};
 
     private static final String USER_ID = "admin";
 
@@ -110,11 +110,7 @@ public class WebdavProviderTestCase extends AbstractProviderTestConfig {
         // First output the node path
         message(node.getPath());
         // Skip the virtual (and large!) jcr:system subtree
-        if (node.getName().equals("jcr:system")) {
-            return;
-        }
-
-        if (node.getName().equals("jcr:content")) {
+        if (node.getName().equals("jcr:system") || node.getName().equals("jcr:content")) {
             return;
         }
 
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 3d29fa1..9da008d 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 final Webdav4FileObject[] EMPTY_ARRAY = new Webdav4FileObject[0];
+    private static final Webdav4FileObject[] EMPTY_ARRAY = {};
 
     /**
      * An OutputStream that writes to a Webdav resource.
@@ -228,7 +228,7 @@ public class Webdav4FileObject extends Http4FileObject<Webdav4FileSystem> {
         this(name, fileSystem, Webdav4FileSystemConfigBuilder.getInstance());
     }
 
-    void log(Exception ex) {
+    void log(final Exception ex) {
         // TODO Consider logging
     }
 
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 f1919aa..d0e5cb6 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
@@ -47,7 +47,7 @@ public class Webdav4FileProvider extends Http4FileProvider {
      * @deprecated Might be removed in the next major version.
      */
     @Deprecated
-    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = new UserAuthenticationData.Type[] {
+    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = {
             UserAuthenticationData.USERNAME, UserAuthenticationData.PASSWORD };
 
     /** The capabilities of the WebDAV provider */
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 1dcfe90..b411e03 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
@@ -114,11 +114,7 @@ public class Webdav4ProviderTestCase extends AbstractProviderTestConfig {
         // First output the node path
         message(node.getPath());
         // Skip the virtual (and large!) jcr:system subtree
-        if (node.getName().equals("jcr:system")) {
-            return;
-        }
-
-        if (node.getName().equals("jcr:content")) {
+        if (node.getName().equals("jcr:system") || node.getName().equals("jcr:content")) {
             return;
         }
 
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
index e0cfa55..a31fd86 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
@@ -43,7 +43,7 @@ public interface FileName extends Comparable<FileName> {
      *
      * @since 2.8.0
      */
-    FileName[] EMPTY_ARRAY = new FileName[0];
+    FileName[] EMPTY_ARRAY = {};
 
     /**
      * Gets the base name of this file. The base name is the last element of the file name. For example the base name
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
index 63f50ac..3c390da 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
@@ -100,7 +100,7 @@ public interface FileObject extends Comparable<FileObject>, Iterable<FileObject>
      *
      * @since 2.8.0
      */
-    FileObject[] EMPTY_ARRAY = new FileObject[0];
+    FileObject[] EMPTY_ARRAY = {};
 
     /**
      * Queries the file if it is possible to rename it to newfile.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
index 86567a5..d448c39 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
@@ -234,7 +234,7 @@ public abstract class FileSystemConfigBuilder {
      */
     protected double getDouble(final FileSystemOptions fileSystemOptions, final String name,
         final double defaultValue) {
-        return getDouble(fileSystemOptions, name, new Double(defaultValue)).doubleValue();
+        return getDouble(fileSystemOptions, name, Double.valueOf(defaultValue)).doubleValue();
     }
 
     /**
@@ -383,7 +383,7 @@ public abstract class FileSystemConfigBuilder {
      * @since 2.0
      */
     protected float getFloat(final FileSystemOptions fileSystemOptions, final String name, final float defaultValue) {
-        return getFloat(fileSystemOptions, name, new Float(defaultValue)).floatValue();
+        return getFloat(fileSystemOptions, name, Float.valueOf(defaultValue)).floatValue();
     }
 
     /**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
index 4154ccd..be03ab8 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
@@ -41,7 +41,7 @@ public class DefaultFileReplicator extends AbstractVfsComponent implements FileR
 
     private static final Random random = new Random();
 
-    private static final char[] TMP_RESERVED_CHARS = new char[] { '?', '/', '\\', ' ', '&', '"', '\'', '*', '#', ';',
+    private static final char[] TMP_RESERVED_CHARS = { '?', '/', '\\', ' ', '&', '"', '\'', '*', '#', ';',
             ':', '<', '>', '|' };
 
     private final ArrayList<Object> copies = new ArrayList<>();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
index d987a7e..bd6f016 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
@@ -27,7 +27,7 @@ import org.apache.commons.vfs2.FileSystemException;
  * @since 0.1
  */
 public interface FileOperationProvider {
-    
+
     /**
      * Empty array.
      *
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 520509e..874f062 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
@@ -61,12 +61,10 @@ public abstract class AbstractFileName implements FileName {
         this.type = type;
         if (StringUtils.isEmpty(absPath)) {
             this.absPath = ROOT_PATH;
+        } else if (absPath.length() > 1 && absPath.endsWith("/")) {
+            this.absPath = absPath.substring(0, absPath.length() - 1);
         } else {
-            if (absPath.length() > 1 && absPath.endsWith("/")) {
-                this.absPath = absPath.substring(0, absPath.length() - 1);
-            } else {
-                this.absPath = absPath;
-            }
+            this.absPath = absPath;
         }
     }
 
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 59dc332..3c26f10 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
@@ -33,7 +33,7 @@ import org.apache.commons.vfs2.provider.local.GenericFileNameParser;
  */
 public abstract class AbstractFileProvider extends AbstractVfsContainer implements FileProvider {
 
-    private static final AbstractFileSystem[] EMPTY_ABSTRACT_FILE_SYSTEMS = new AbstractFileSystem[0];
+    private static final AbstractFileSystem[] EMPTY_ABSTRACT_FILE_SYSTEMS = {};
 
     /**
      * The cached file systems.
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 d69fbe6..819b185 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
@@ -60,7 +60,7 @@ public abstract class AbstractFileSystem extends AbstractVfsComponent implements
         this(null, null, null);
     }
 
-    private static final FileListener[] EMPTY_FILE_LISTENER_ARRAY = new FileListener[0];
+    private static final FileListener[] EMPTY_FILE_LISTENER_ARRAY = {};
 
     private static final Log LOG = LogFactory.getLog(AbstractFileSystem.class);
 
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 59a456b..7f3db1c 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
@@ -48,7 +48,7 @@ public final class DefaultFileContent implements FileContent {
      * final int STATE_RANDOM_ACCESS = 3;
      */
 
-    private static final Certificate[] EMPTY_CERTIFICATE_ARRAY = new Certificate[0];
+    private static final Certificate[] EMPTY_CERTIFICATE_ARRAY = {};
     static final int STATE_CLOSED = 0;
     static final int STATE_OPENED = 1;
 
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/RFC2396.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/RFC2396.java
index 3fb6fca..baae1ae 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/RFC2396.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/RFC2396.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.ArrayUtils;
  * The RFC 2396 Collected BNF for URI from <a href="https://datatracker.ietf.org/doc/html/rfc2396#appendix-A">Appendix
  * A</a>:
  * </p>
- * 
+ *
  * <pre>
       URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
       absoluteURI   = scheme ":" ( hier_part | opaque_part )
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java
index 63cac0b..6b6d4f0 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java
@@ -43,7 +43,7 @@ public class FtpFileProvider extends AbstractOriginatingFileProvider {
     /**
      * Authenticator types.
      */
-    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = new UserAuthenticationData.Type[] {
+    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = {
             UserAuthenticationData.USERNAME, UserAuthenticationData.PASSWORD };
 
     static final Collection<Capability> CAPABILITIES = Collections
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileProvider.java
index 3d6b51b..57ba1bc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileProvider.java
@@ -38,7 +38,7 @@ import org.apache.commons.vfs2.util.UserAuthenticatorUtils;
 public class HttpFileProvider extends AbstractOriginatingFileProvider {
 
     /** Authenticator information. */
-    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = new UserAuthenticationData.Type[] {
+    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = {
             UserAuthenticationData.USERNAME, UserAuthenticationData.PASSWORD };
 
     static final Collection<Capability> CAPABILITIES = Collections
@@ -68,7 +68,7 @@ public class HttpFileProvider extends AbstractOriginatingFileProvider {
 
             final String fileScheme = rootName.getScheme();
             final char lastChar = fileScheme.charAt(fileScheme.length() - 1);
-            final String internalScheme = (lastChar == 's' || lastChar == 'S') ? "https" : "http";
+            final String internalScheme = lastChar == 's' || lastChar == 'S' ? "https" : "http";
 
             httpClient = HttpClientFactory.createConnection(internalScheme, rootName.getHostName(),
                     rootName.getPort(),
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 676ef21..fa043b8 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
@@ -93,10 +93,10 @@ public class Http4FileProvider extends AbstractOriginatingFileProvider {
 
     /** Authenticator information. */
     static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES =
-            new UserAuthenticationData.Type[] {
-                    UserAuthenticationData.USERNAME,
-                    UserAuthenticationData.PASSWORD
-                    };
+            {
+            UserAuthenticationData.USERNAME,
+            UserAuthenticationData.PASSWORD
+            };
 
     /** FileProvider capabilities */
     static final Collection<Capability> CAPABILITIES =
@@ -315,7 +315,7 @@ public class Http4FileProvider extends AbstractOriginatingFileProvider {
 
             if (keystoreFileObject != null && keystoreFileObject.exists()) {
                 final String keystorePass = builder.getKeyStorePass(fileSystemOptions);
-                final char[] keystorePassChars = (keystorePass != null) ? keystorePass.toCharArray() : null;
+                final char[] keystorePassChars = keystorePass != null ? keystorePass.toCharArray() : null;
                 sslContextBuilder.loadTrustMaterial(keystoreFileObject, keystorePassChars, TrustAllStrategy.INSTANCE);
             } else {
                 sslContextBuilder.loadTrustMaterial(TrustAllStrategy.INSTANCE);
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 aaf859e..0602fcb 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
@@ -89,10 +89,10 @@ public class Http5FileProvider extends AbstractOriginatingFileProvider {
 
     /** Authenticator information. */
     static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES =
-            new UserAuthenticationData.Type[] {
-                    UserAuthenticationData.USERNAME,
-                    UserAuthenticationData.PASSWORD
-                    };
+            {
+            UserAuthenticationData.USERNAME,
+            UserAuthenticationData.PASSWORD
+            };
 
     /** FileProvider capabilities */
     static final Collection<Capability> CAPABILITIES =
@@ -311,7 +311,7 @@ public class Http5FileProvider extends AbstractOriginatingFileProvider {
 
             if (keystoreFileObject != null && keystoreFileObject.exists()) {
                 final String keystorePass = builder.getKeyStorePass(fileSystemOptions);
-                final char[] keystorePassChars = (keystorePass != null) ? keystorePass.toCharArray() : null;
+                final char[] keystorePassChars = keystorePass != null ? keystorePass.toCharArray() : null;
                 sslContextBuilder.loadTrustMaterial(keystoreFileObject, keystorePassChars, TrustAllStrategy.INSTANCE);
             } else {
                 sslContextBuilder.loadTrustMaterial(TrustAllStrategy.INSTANCE);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
index 5896eac..3047625 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
@@ -128,7 +128,7 @@ public class LocalFile extends AbstractFileObject<LocalFileSystem> {
         // TODO Reuse Apache Commons IO
         // @formatter:off
         return Files.newOutputStream(file.toPath(), append ?
-            new OpenOption[] {StandardOpenOption.CREATE, StandardOpenOption.APPEND} : 
+            new OpenOption[] {StandardOpenOption.CREATE, StandardOpenOption.APPEND} :
             new OpenOption[] {StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING});
         // @formatter:on
     }
@@ -196,7 +196,7 @@ public class LocalFile extends AbstractFileObject<LocalFileSystem> {
 
     /**
      * Determines if this file is a symbolic link.
-     * 
+     *
      * @since 2.4
      */
     @Override
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java
index e19fb60..62c0101 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java
@@ -42,7 +42,7 @@ public class SftpFileProvider extends AbstractOriginatingFileProvider {
     public static final String ATTR_USER_INFO = "UI";
 
     /** Authentication types. */
-    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = new UserAuthenticationData.Type[] {
+    public static final UserAuthenticationData.Type[] AUTHENTICATOR_TYPES = {
             UserAuthenticationData.USERNAME, UserAuthenticationData.PASSWORD };
 
     /** The provider's capabilities. */
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
index 54c477f..b2792b7 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
@@ -778,8 +778,8 @@ public final class SftpFileSystemConfigBuilder extends FileSystemConfigBuilder {
      */
     public void setStrictHostKeyChecking(final FileSystemOptions options, final String hostKeyChecking)
             throws FileSystemException {
-        if (hostKeyChecking == null || (!hostKeyChecking.equals(HOST_KEY_CHECK_ASK)
-                && !hostKeyChecking.equals(HOST_KEY_CHECK_NO) && !hostKeyChecking.equals(HOST_KEY_CHECK_YES))) {
+        if (hostKeyChecking == null || !hostKeyChecking.equals(HOST_KEY_CHECK_ASK)
+                && !hostKeyChecking.equals(HOST_KEY_CHECK_NO) && !hostKeyChecking.equals(HOST_KEY_CHECK_YES)) {
             throw new FileSystemException("vfs.provider.sftp/StrictHostKeyChecking-arg.error", hostKeyChecking);
         }
 
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/Tbz2FileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/Tbz2FileProvider.java
index 94574cc..bd95861 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/Tbz2FileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/Tbz2FileProvider.java
@@ -29,7 +29,7 @@ public class Tbz2FileProvider extends CompositeFileProvider {
     /** The provider's capabilities */
     protected static final Collection<Capability> capabilities = TarFileProvider.capabilities;
 
-    private static final String[] SCHEMES = new String[] { "bz2", "tar" };
+    private static final String[] SCHEMES = { "bz2", "tar" };
 
     public Tbz2FileProvider() {
     }
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TgzFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TgzFileProvider.java
index a29e44f..36649a0 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TgzFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TgzFileProvider.java
@@ -29,7 +29,7 @@ public class TgzFileProvider extends CompositeFileProvider {
     /** The provider's capabilities */
     protected static final Collection<Capability> capabilities = TarFileProvider.capabilities;
 
-    private static final String[] SCHEMES = new String[] { "gz", "tar" };
+    private static final String[] SCHEMES = { "gz", "tar" };
 
     public TgzFileProvider() {
     }
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
index 5f09109..f45c1ff 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
@@ -67,7 +67,7 @@ public class DeleteTask extends VfsTask {
      */
     @Override
     public void execute() throws BuildException {
-        if ((file == null && srcDirUrl == null) || (srcDirUrl != null && filesList == null)) {
+        if ((srcDirUrl == null ? file == null : filesList == null)) {
             final String message = Messages.getString("vfs.tasks/delete.no-source-files.error");
             throw new BuildException(message);
         }
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
index 642b4a0..2023bff 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
@@ -83,7 +83,7 @@ public class CombinedResources extends ResourceBundle {
         if (locale == null) {
             return;
         }
-        final String[] parts = new String[] {locale.getLanguage(), locale.getCountry(), locale.getVariant()};
+        final String[] parts = {locale.getLanguage(), locale.getCountry(), locale.getVariant()};
         final StringBuilder sb = new StringBuilder();
         for (int i = 0; i < 3; i++) {
             sb.append(getResourceName());
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
index 0e64918..5168b50 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
@@ -87,7 +87,7 @@ public final class Os {
     private static final OsFamily OS_FAMILY;
     private static final OsFamily[] OS_ALL_FAMILIES;
 
-    private static final OsFamily[] ALL_FAMILIES = new OsFamily[] { OS_FAMILY_DOS, OS_FAMILY_MAC, OS_FAMILY_NETWARE,
+    private static final OsFamily[] ALL_FAMILIES = { OS_FAMILY_DOS, OS_FAMILY_MAC, OS_FAMILY_NETWARE,
             OS_FAMILY_OS2, OS_FAMILY_OSX, OS_FAMILY_UNIX, OS_FAMILY_WINDOWS, OS_FAMILY_WINNT, OS_FAMILY_WIN9X };
 
     static {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/OsFamily.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/OsFamily.java
index 1ec92f0..50856ca 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/OsFamily.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/OsFamily.java
@@ -28,7 +28,7 @@ public final class OsFamily {
 
     private final String name;
     private final OsFamily[] families;
-    static final OsFamily[] EMPTY_OS_FAMILY_ARRAY = new OsFamily[0];
+    static final OsFamily[] EMPTY_OS_FAMILY_ARRAY = {};
 
     OsFamily(final String name) {
         this.name = name;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
index 038ec34..4d9d442 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
@@ -45,7 +45,7 @@ import junit.framework.TestSuite;
  */
 public abstract class AbstractTestSuite extends TestSetup {
 
-    private static final Thread[] EMPTY_THREAD_ARRAY = new Thread[0];
+    private static final Thread[] EMPTY_THREAD_ARRAY = {};
     public static final String WRITE_TESTS_FOLDER = "write-tests";
     public static final String READ_TESTS_FOLDER = "read-tests";
 
@@ -163,7 +163,7 @@ public abstract class AbstractTestSuite extends TestSetup {
         if (ArrayUtils.isEmpty(threadSnapshot)) {
             return StringUtils.EMPTY;
         }
-        final StringBuffer sb = new StringBuffer(256);
+        final StringBuilder sb = new StringBuilder(256);
         sb.append("Threads still running (" + threadSnapshot.length + ") at " + Instant.now() + ", live threads:");
         sb.append(System.lineSeparator());
 
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
index 96e4cda..f109c56 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
@@ -50,17 +50,17 @@ public class FileObjectEscapeCharacterInPathTest {
     /**
      * Test file paths.
      */
-    public static final String[] TEST_FILE_PATHS = new String[] {REL_PATH_SPACE, REL_PATH_GREAT};
+    public static final String[] TEST_FILE_PATHS = {REL_PATH_SPACE, REL_PATH_GREAT};
 
     private static StandardFileSystemManager loadFileSystemManager() throws FileSystemException {
-        StandardFileSystemManager fileSystemManager = new StandardFileSystemManager();
+        final StandardFileSystemManager fileSystemManager = new StandardFileSystemManager();
         fileSystemManager.setLogger(null);
         fileSystemManager.init();
         fileSystemManager.setBaseFile(SystemUtils.getUserDir());
         return fileSystemManager;
     }
 
-    private static File toFile2(FileObject fileObject) throws FileSystemException {
+    private static File toFile2(final FileObject fileObject) throws FileSystemException {
         if (fileObject == null || !"file".equals(fileObject.getURL().getProtocol())) {
             return null;
         }
@@ -68,7 +68,7 @@ public class FileObjectEscapeCharacterInPathTest {
     }
 
     @SuppressWarnings("resource")
-    private void testProviderGetPath(String relPathStr) throws URISyntaxException {
+    private void testProviderGetPath(final String relPathStr) throws URISyntaxException {
         FileSystems.getDefault().provider().getPath(new URI(Paths.get(relPathStr).toAbsolutePath().toUri().toString()));
     }
 
@@ -93,8 +93,8 @@ public class FileObjectEscapeCharacterInPathTest {
         testToFile(fileObject -> fileObject.getPath().toFile());
     }
 
-    private void testToFile(FailableFunction<FileObject, File, IOException> function) throws IOException {
-        for (String testFilePath : TEST_FILE_PATHS) {
+    private void testToFile(final FailableFunction<FileObject, File, IOException> function) throws IOException {
+        for (final String testFilePath : TEST_FILE_PATHS) {
             try (FileSystemManager fileSystemManager = loadFileSystemManager();
                 FileObject fileObject = fileSystemManager.resolveFile(testFilePath)) {
                 assertNotNull(fileObject);
@@ -102,7 +102,7 @@ public class FileObjectEscapeCharacterInPathTest {
                     InputStream inputStream = content.getInputStream()) {
                     assertEquals(TEST_FILE_CONTENT, IOUtils.toString(inputStream, StandardCharsets.UTF_8));
                 }
-                File file = function.apply(fileObject);
+                final File file = function.apply(fileObject);
                 assertNotNull(file);
                 assertEquals(TEST_FILE_CONTENT, FileUtils.readFileToString(file, StandardCharsets.UTF_8));
             }
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
index f3edd5a..8c54709 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
@@ -23,7 +23,7 @@ import org.junit.Test;
  */
 public class ProviderDeleteTests extends AbstractProviderTestCase {
 
-    private class FileNameSelector implements FileSelector {
+    private static class FileNameSelector implements FileSelector {
         final String basename;
 
         private FileNameSelector(final String basename) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
index b9c306a..64ca769 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
@@ -40,7 +40,7 @@ public class RunTest {
         //props.setProperty("test.webdav.uri", "webdav://vfsusr:vfs%2f%25\\te:st@" + ip + "/vfstest");
         props.setProperty("test.sftp.uri", "sftp://vfsusr:vfs%2f%25\\te:st@" + ip + "/vfstest");
 
-        final Test[] tests = new Test[] {
+        final Test[] tests = {
                 // LocalProviderTestCase.suite(),
                 // FtpProviderTestCase.suite(),
                 // UrlProviderHttpTestCase.suite(),
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
index 6a7da1f..ac9467b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.vfs2.FileSystemManager;
 import org.apache.commons.vfs2.VFS;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
index 7667fe7..2399bca 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
@@ -88,8 +88,8 @@ public class DefaultFileSystemManagerTest {
         testCreateFileSystem("src/test/resources/test-data/bla.txt.bz2", Bzip2FileObject.class);
     }
 
-    private void testCreateFileSystem(final String path, Class<?> clazz) throws FileSystemException {
-        FileSystemManager manager = VFS.getManager();
+    private void testCreateFileSystem(final String path, final Class<?> clazz) throws FileSystemException {
+        final FileSystemManager manager = VFS.getManager();
         try (FileObject localFileObject = manager.resolveFile(new File(path).getAbsolutePath());
                 FileObject fileObject = manager.createFileSystem(localFileObject)) {
             Assert.assertEquals(clazz, fileObject.getClass());
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java
index 75323eb..e097237 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java
@@ -113,7 +113,7 @@ public class VfsClassLoaderTests extends AbstractProviderTestCase {
         // to returning resources for META-INF/MANIFEST.MF (see VFS-500)
         // so we use our own which is guaranteed to not return any hit
         final ClassLoader mockClassloader = new MockClassloader();
-        final FileObject[] search = new FileObject[] { nestedJar, testJar };
+        final FileObject[] search = { nestedJar, testJar };
         final VFSClassLoader loader = new VFSClassLoader(search, getManager(), mockClassloader);
 
         final Enumeration<URL> urls = loader.getResources("META-INF/MANIFEST.MF");
@@ -150,7 +150,7 @@ public class VfsClassLoaderTests extends AbstractProviderTestCase {
         assertFalse(manager.canCreateFileSystem(dir));
 
         // prepare classloader
-        final FileObject[] search = new FileObject[] { dir };
+        final FileObject[] search = { dir };
         final ClassLoader mockClassloader = new MockClassloader();
         final VFSClassLoader loader = new VFSClassLoader(search, getManager(), mockClassloader);
 
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 e938e7a..3a35ea4 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
@@ -65,7 +65,7 @@ public class WindowsFileNameTests extends AbstractProviderTestCase {
     @Test
     public void testWindowsRoots() throws Exception {
         // valid URI forms of the filesystem root
-        final String[] tests = new String[] { "file:///C:/", "file://C:/", "file:/C:/", "file:C:/" };
+        final String[] tests = { "file:///C:/", "file://C:/", "file:/C:/", "file:C:/" };
 
         for (final String name : tests) {
             final DefaultFileSystemManager manager = getManager();
@@ -91,7 +91,7 @@ public class WindowsFileNameTests extends AbstractProviderTestCase {
 
     @Test
     public void testWindowsWrongRoots() throws Exception {
-        final String[] tests = new String[] { "file:///C:", "file://C:", "file:/C:", "file:C:" };
+        final String[] tests = { "file:///C:", "file://C:", "file:/C:", "file:C:" };
 
         for (final String name : tests) {
             try {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
index b089873..48ce1f8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
  * Custom tests for RamProvider.
  */
 public class CustomRamProviderTest {
-    private static final byte[] NON_EMPTY_FILE_CONTENT = new byte[] { 1, 2, 3 };
+    private static final byte[] NON_EMPTY_FILE_CONTENT = { 1, 2, 3 };
 
     /** List of URL special characters encoded for AbstractFileObject#getChild */
     final char[] ENC = { /*'#',*/ '!', '?'};
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 2b0c666..4a7271e 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
@@ -39,7 +39,7 @@ import org.junit.Test;
  * Some tests for the DelegatingFileSystemOptionsBuilder
  */
 public class DelegatingFileSystemOptionsBuilderTest {
-    private static final String[] schemes = new String[] { "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz",
+    private static final String[] schemes = { "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz",
             "jar", "tmp", "ram" };
 
     private StandardFileSystemManager fsm;
@@ -90,7 +90,7 @@ public class DelegatingFileSystemOptionsBuilderTest {
 
     @Test
     public void testDelegatingGood() throws Throwable {
-        final String[] identityPaths = new String[] { "/file1", "/file2", };
+        final String[] identityPaths = { "/file1", "/file2", };
 
         final FileSystemOptions opts = new FileSystemOptions();
         final DelegatingFileSystemOptionsBuilder delgate = new DelegatingFileSystemOptionsBuilder(fsm);