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 4a488cb Organize imports.
4a488cb is described below
commit 4a488cbd2770dfec8a12a0a406822e5a9b6ed953
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Oct 17 12:11:06 2019 -0400
Organize imports.
---
.../vfs2/provider/webdav/test/WebdavProviderTestCase.java | 5 ++---
.../vfs2/provider/webdav/test/WebdavVersioningTests.java | 1 -
.../vfs2/provider/webdav4/test/Webdav4VersioningTests.java | 1 -
.../org/apache/commons/vfs2/provider/smb/SmbFileObject.java | 12 ++++++------
.../vfs2/provider/smb/SmbFileRandomAccessContent.java | 8 ++++----
.../org/apache/commons/vfs2/util/RACRandomAccessFile.java | 1 +
.../commons/vfs2/provider/smb/test/SmbProviderTestCase.java | 4 ++--
.../java/org/apache/commons/vfs2/impl/VFSClassLoader.java | 1 -
.../org/apache/commons/vfs2/provider/AbstractFileObject.java | 1 -
.../apache/commons/vfs2/provider/CompositeFileProvider.java | 1 -
.../commons/vfs2/provider/DefaultURLStreamHandler.java | 1 -
.../apache/commons/vfs2/provider/LayeredFileNameParser.java | 1 -
.../java/org/apache/commons/vfs2/provider/UriParser.java | 1 -
.../apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java | 1 +
.../apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java | 2 +-
.../vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java | 1 +
.../commons/vfs2/provider/local/LocalFileNameParser.java | 2 --
.../commons/vfs2/provider/res/ResourceFileProvider.java | 2 --
.../apache/commons/vfs2/provider/sftp/SftpFileSystem.java | 2 --
.../commons/vfs2/provider/temp/TemporaryFileProvider.java | 1 -
.../apache/commons/vfs2/provider/zip/ZipFileProvider.java | 1 -
.../java/org/apache/commons/vfs2/util/FileObjectUtils.java | 1 -
.../test/java/org/apache/commons/AbstractVfsTestCase.java | 4 ++--
.../commons/vfs2/operations/BasicOperationsTestCase.java | 5 ++++-
.../apache/commons/vfs2/provider/DefaultFileContentTest.java | 12 ++++++------
.../vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java | 7 ++++---
.../provider/ftps/test/FtpsProviderExplicitTestCase.java | 4 ++--
.../provider/ftps/test/FtpsProviderImplicitTestCase.java | 4 ++--
.../vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java | 4 ++--
.../vfs2/provider/http/test/HttpFilesCacheTestCase.java | 4 ++--
.../vfs2/provider/http/test/HttpProviderTestCase.java | 4 ++--
.../commons/vfs2/provider/local/test/FileNameTests.java | 2 +-
.../commons/vfs2/provider/res/test/ResSchemeTestCase.java | 1 -
.../vfs2/provider/res/test/ResourceProviderTestCase.java | 4 ++--
.../commons/vfs2/provider/test/VirtualProviderTestCase.java | 4 ++--
.../vfs2/provider/url/test/UrlHttpProviderTestCase.java | 4 ++--
.../vfs2/provider/url/test/UrlProviderHttpTestCase.java | 4 ++--
.../commons/vfs2/provider/url/test/UrlProviderTestCase.java | 4 ++--
.../apache/commons/vfs2/provider/zip/Jira733TestCase.java | 1 -
.../vfs2/provider/zip/ZipProviderWithCharsetTestCase.java | 3 ---
.../test/java/org/apache/commons/vfs2/test/ContentTests.java | 1 -
.../java/org/apache/commons/vfs2/test/PermissionsTests.java | 2 +-
42 files changed, 56 insertions(+), 73 deletions(-)
diff --git
a/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
b/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
index 4a844dc..2668a8c 100644
---
a/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
+++
b/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
@@ -30,9 +30,6 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.Value;
-import junit.framework.Test;
-
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.io.FileUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -48,6 +45,8 @@ import org.apache.jackrabbit.core.TransientRepository;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import junit.framework.Test;
+
/**
* Test cases for the WebDAV provider.
*
diff --git
a/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
b/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
index a11c5d3..9bdaf53 100644
---
a/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
+++
b/commons-vfs2-jackrabbit/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavVersioningTests.java
@@ -28,7 +28,6 @@ import
org.apache.commons.vfs2.provider.webdav.WebdavFileSystemConfigBuilder;
import org.apache.commons.vfs2.test.AbstractProviderTestCase;
import org.apache.jackrabbit.webdav.version.DeltaVConstants;
import org.apache.jackrabbit.webdav.version.VersionControlledResource;
-import org.junit.Assert;
/**
* Test to verify Webdav Versioning support
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 0174ea2..da81869 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
@@ -28,7 +28,6 @@ import
org.apache.commons.vfs2.provider.webdav4.Webdav4FileSystemConfigBuilder;
import org.apache.commons.vfs2.test.AbstractProviderTestCase;
import org.apache.jackrabbit.webdav.version.DeltaVConstants;
import org.apache.jackrabbit.webdav.version.VersionControlledResource;
-import org.junit.Assert;
/**
* Test to verify Webdav Versioning support
diff --git
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
index 6634914..215f263 100644
---
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
+++
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
@@ -20,12 +20,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
-import jcifs.smb.NtlmPasswordAuthentication;
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
-import jcifs.smb.SmbFileInputStream;
-import jcifs.smb.SmbFileOutputStream;
-
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
@@ -39,6 +33,12 @@ import org.apache.commons.vfs2.provider.UriParser;
import org.apache.commons.vfs2.util.RandomAccessMode;
import org.apache.commons.vfs2.util.UserAuthenticatorUtils;
+import jcifs.smb.NtlmPasswordAuthentication;
+import jcifs.smb.SmbException;
+import jcifs.smb.SmbFile;
+import jcifs.smb.SmbFileInputStream;
+import jcifs.smb.SmbFileOutputStream;
+
/**
* A file in an SMB file system.
*/
diff --git
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java
index 514c3bf..4dced31 100644
---
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java
+++
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java
@@ -21,14 +21,14 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
-import jcifs.smb.SmbRandomAccessFile;
-
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.provider.AbstractRandomAccessContent;
import org.apache.commons.vfs2.util.RandomAccessMode;
+import jcifs.smb.SmbException;
+import jcifs.smb.SmbFile;
+import jcifs.smb.SmbRandomAccessFile;
+
/**
* RandomAccess for smb files
*/
diff --git
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
index e0d3d7c..125e22e 100644
---
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
+++
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
@@ -19,6 +19,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
+
import org.apache.commons.vfs2.RandomAccessContent;
/**
diff --git
a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
index 2ce3662..e43a52a 100644
---
a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
+++
b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.vfs2.provider.smb.test;
-import junit.framework.Test;
-
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
@@ -26,6 +24,8 @@ import
org.apache.commons.vfs2.test.AbstractProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestSuite;
+import junit.framework.Test;
+
/**
* Tests for the SMB file system.
*/
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
index d0023c0..9a1f25c 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
@@ -35,7 +35,6 @@ import java.util.jar.Attributes.Name;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
-import org.apache.commons.vfs2.FileUtil;
import org.apache.commons.vfs2.NameScope;
import org.apache.commons.vfs2.util.FileObjectUtils;
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 3c1e61a..f27c4de 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
@@ -47,7 +47,6 @@ import org.apache.commons.vfs2.FileUtil;
import org.apache.commons.vfs2.NameScope;
import org.apache.commons.vfs2.RandomAccessContent;
import org.apache.commons.vfs2.Selectors;
-import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.operations.DefaultFileOperations;
import org.apache.commons.vfs2.operations.FileOperations;
import org.apache.commons.vfs2.util.FileObjectUtils;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
index 8ac81d5..607b0bc 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
@@ -19,7 +19,6 @@ package org.apache.commons.vfs2.provider;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.apache.commons.vfs2.VFS;
/**
* Description.
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 a352b80..78b0d22 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
@@ -24,7 +24,6 @@ import java.net.URLStreamHandler;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.apache.commons.vfs2.VFS;
/**
* A default URL stream handler that will work for most file systems.
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
index 57c286f..a278534 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
@@ -19,7 +19,6 @@ package org.apache.commons.vfs2.provider;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileType;
-import org.apache.commons.vfs2.VFS;
/**
* Implementation for layered file systems.
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
index 177a883..4ef97c5 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.vfs2.provider;
-import java.util.Set;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileType;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java
index 6e30c8d..1bfc450 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.provider.ftps;
import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPSClient;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.UserAuthenticationData;
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 6ef164b..19e89b5 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
@@ -16,8 +16,8 @@
*/
package org.apache.commons.vfs2.provider.hdfs;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLDecoder;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
index ec40683..de28927 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
@@ -19,6 +19,7 @@ package org.apache.commons.vfs2.provider.hdfs;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemConfigBuilder;
import org.apache.commons.vfs2.FileSystemOptions;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
index 46fba3f..44c609c 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
@@ -20,9 +20,7 @@ import java.net.URI;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileSystemException;
-import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileType;
-import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.AbstractFileNameParser;
import org.apache.commons.vfs2.provider.UriParser;
import org.apache.commons.vfs2.provider.VfsComponentContext;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
index 37ff822..18faa7d 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
@@ -28,9 +28,7 @@ import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemConfigBuilder;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.AbstractFileProvider;
-import org.apache.commons.vfs2.provider.UriParser;
/**
* The Resource provider.
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 0a4930c..e8c204f 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
@@ -25,11 +25,9 @@ import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.apache.commons.vfs2.UserAuthenticationData;
import org.apache.commons.vfs2.provider.AbstractFileName;
import org.apache.commons.vfs2.provider.AbstractFileSystem;
import org.apache.commons.vfs2.provider.GenericFileName;
-import org.apache.commons.vfs2.util.UserAuthenticatorUtils;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.ChannelSftp;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
index f9c7952..eb29457 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
@@ -25,7 +25,6 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.AbstractFileProvider;
import org.apache.commons.vfs2.provider.UriParser;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java
index 7fb9bc1..e6122fa 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java
@@ -31,7 +31,6 @@ import org.apache.commons.vfs2.FileType;
import org.apache.commons.vfs2.provider.AbstractFileName;
import org.apache.commons.vfs2.provider.AbstractLayeredFileProvider;
import org.apache.commons.vfs2.provider.LayeredFileName;
-import org.apache.commons.vfs2.provider.hdfs.HdfsFileSystemConfigBuilder;
/**
* A file system provider for ZIP files. Provides read-only file systems.
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 a311048..86074e9 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
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
-import org.apache.commons.vfs2.FileUtil;
import org.apache.commons.vfs2.impl.DecoratedFileObject;
import org.apache.commons.vfs2.provider.AbstractFileObject;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/AbstractVfsTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/AbstractVfsTestCase.java
index 0406fd4..c996848 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/AbstractVfsTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/AbstractVfsTestCase.java
@@ -24,11 +24,11 @@ import java.net.URISyntaxException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.TestCase;
-
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.util.Messages;
+import junit.framework.TestCase;
+
/**
* A base class for VFS tests. Provides utility methods for locating test
resources.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
index af42058..6510f43 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
@@ -16,7 +16,10 @@
*/
package org.apache.commons.vfs2.operations;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
import java.io.File;
import java.util.Collection;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
index 17f84c4..71f426f 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.commons.vfs2.provider;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.vfs2.FileContent;
@@ -25,12 +31,6 @@ import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
import org.junit.Test;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-
/**
* {@code DefaultFileContentTest} tests for bug-VFS-614. This bug involves the
stream implementation closing the stream
* after reading to the end of the buffer, which broke marking.
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java
index a35f415..7e8d290 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.vfs2.provider.ftp.test;
-import junit.framework.Test;
+import java.io.File;
+import java.io.IOException;
+
import org.apache.commons.io.FileUtils;
import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
import org.apache.ftpserver.ftplet.FileSystemFactory;
@@ -24,8 +26,7 @@ import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
-import java.io.File;
-import java.io.IOException;
+import junit.framework.Test;
/**
* Tests for FTP file systems (with homeDirIsRoot=true).
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderExplicitTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderExplicitTestCase.java
index de56ab4..47c1daa 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderExplicitTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderExplicitTestCase.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.vfs2.provider.ftps.test;
-import junit.framework.Test;
-
import org.apache.commons.vfs2.provider.ftps.FtpsDataChannelProtectionLevel;
import org.apache.commons.vfs2.provider.ftps.FtpsFileSystemConfigBuilder;
import org.apache.commons.vfs2.provider.ftps.FtpsMode;
+import junit.framework.Test;
+
/**
* Tests for FTPS file systems with explicit FTPS connection.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderImplicitTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderImplicitTestCase.java
index fb2607b..c5fd12e 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderImplicitTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderImplicitTestCase.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.vfs2.provider.ftps.test;
-import junit.framework.Test;
-
import org.apache.commons.vfs2.provider.ftps.FtpsFileSystemConfigBuilder;
import org.apache.commons.vfs2.provider.ftps.FtpsMode;
+import junit.framework.Test;
+
/**
* Tests for FTPS file systems with implicit FTPS connection.
*
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
index a545e34..0107470 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
@@ -19,8 +19,6 @@ package org.apache.commons.vfs2.provider.hdfs.test;
import java.io.File;
import java.io.IOException;
-import junit.framework.Test;
-
import org.apache.commons.AbstractVfsTestCase;
import org.apache.commons.io.FileUtils;
import org.apache.commons.vfs2.FileObject;
@@ -38,6 +36,8 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import junit.framework.Test;
+
/**
* This test class uses the Hadoop MiniDFSCluster class to create an embedded
Hadoop cluster.
* <P>
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
index bd69921..a5da89b 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.vfs2.provider.http.test;
-import junit.framework.TestCase;
-
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
@@ -25,6 +23,8 @@ import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
import org.junit.Test;
+import junit.framework.TestCase;
+
/**
* Tests https://issues.apache.org/jira/browse/VFS-426
*
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
index 39c455a..86c8d91 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
@@ -20,8 +20,6 @@ import java.io.File;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import junit.framework.Test;
-
import org.apache.commons.vfs2.FileNotFolderException;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
@@ -37,6 +35,8 @@ import org.apache.commons.vfs2.util.FreeSocketPortUtil;
import org.apache.commons.vfs2.util.NHttpFileServer;
import org.junit.Assert;
+import junit.framework.Test;
+
/**
* Test cases for the HTTP provider.
*
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/FileNameTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/FileNameTests.java
index bd674c9..8104d8a 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/FileNameTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/test/FileNameTests.java
@@ -17,7 +17,7 @@
package org.apache.commons.vfs2.provider.local.test;
import java.io.File;
-import org.apache.commons.vfs2.FileName;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.test.AbstractProviderTestCase;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResSchemeTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResSchemeTestCase.java
index 80e77a0..cb29793 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResSchemeTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResSchemeTestCase.java
@@ -23,7 +23,6 @@ import java.net.URISyntaxException;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class ResSchemeTestCase {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
index 760a239..771e22c 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
@@ -17,8 +17,6 @@
package org.apache.commons.vfs2.provider.res.test;
-import junit.framework.Test;
-
import org.apache.commons.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -29,6 +27,8 @@ import org.apache.commons.vfs2.provider.url.UrlFileProvider;
import org.apache.commons.vfs2.test.AbstractProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestSuite;
+import junit.framework.Test;
+
/**
* Test cases for the resource provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
index 94cb321..5c51391 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.test;
import java.io.File;
-import junit.framework.Test;
-
import org.apache.commons.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.test.AbstractProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestSuite;
+import junit.framework.Test;
+
/**
* Test cases for the virtual file system provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
index 12eb7e3..fd498be 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
@@ -18,8 +18,6 @@ package org.apache.commons.vfs2.provider.url.test;
import java.io.File;
-import junit.framework.Test;
-
import org.apache.commons.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -28,6 +26,8 @@ import org.apache.commons.vfs2.provider.url.UrlFileProvider;
import org.apache.commons.vfs2.test.AbstractProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestSuite;
+import junit.framework.Test;
+
/**
* Test cases for the generic provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
index 2b1d8f4..e4ede78 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
@@ -20,8 +20,6 @@ import java.io.File;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import junit.framework.Test;
-
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
@@ -31,6 +29,8 @@ import org.apache.commons.vfs2.test.ProviderTestSuite;
import org.apache.commons.vfs2.util.FreeSocketPortUtil;
import org.apache.commons.vfs2.util.NHttpFileServer;
+import junit.framework.Test;
+
/**
* Test cases for HTTP with the default provider.
*
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
index ed244c3..8a22cef 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
@@ -18,8 +18,6 @@ package org.apache.commons.vfs2.provider.url.test;
import java.io.File;
-import junit.framework.Test;
-
import org.apache.commons.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -28,6 +26,8 @@ import org.apache.commons.vfs2.provider.url.UrlFileProvider;
import org.apache.commons.vfs2.test.AbstractProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestSuite;
+import junit.framework.Test;
+
/**
* Test cases for the generic provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
index d75502f..6a45dbd 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
@@ -27,7 +27,6 @@ import org.apache.commons.vfs2.function.VfsConsumer;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class Jira733TestCase {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
index b551841..91451f5 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
@@ -25,9 +25,6 @@ import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import org.apache.commons.vfs2.provider.zip.ZipFileProvider;
-import org.apache.commons.vfs2.provider.zip.ZipFileSystem;
-import org.apache.commons.vfs2.provider.zip.ZipFileSystemConfigBuilder;
import org.apache.commons.vfs2.test.AbstractProviderTestConfig;
import org.apache.commons.vfs2.test.ProviderTestSuite;
import org.junit.Assert;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ContentTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ContentTests.java
index 3d16aed..ca65d78 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ContentTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ContentTests.java
@@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
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 419265a..11f092d 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
@@ -18,12 +18,12 @@ package org.apache.commons.vfs2.test;
import java.io.OutputStream;
-import org.junit.Assert;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.Selectors;
import org.apache.commons.vfs2.provider.local.LocalFileSystem;
+import org.junit.Assert;
/**
* Additional file permission tests.
