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 2017/07/20 06:01:14 UTC
svn commit: r1802452 - in /commons/proper/vfs/trunk/core/src:
main/java/org/apache/commons/vfs2/ main/java/org/apache/commons/vfs2/impl/
main/java/org/apache/commons/vfs2/provider/
main/java/org/apache/commons/vfs2/provider/bzip2/ main/java/org/apache/...
Author: ggregory
Date: Thu Jul 20 06:01:13 2017
New Revision: 1802452
URL: http://svn.apache.org/viewvc?rev=1802452&view=rev
Log:
Use final.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/VFS.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileSystemManagerTest.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/VfsClassLoaderTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/WindowsFileNameTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/JackrabbitMain.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/VerifyingFileSelector.java
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java Thu Jul 20 06:01:13 2017
@@ -188,13 +188,13 @@ public final class FileSystemOptions imp
final Iterator<FileSystemOptionKey> optKeysIter = myOptions.keySet().iterator();
final Iterator<FileSystemOptionKey> otherKeysIter = theirOptions.keySet().iterator();
while(optKeysIter.hasNext()) {
- int comp = optKeysIter.next().compareTo(otherKeysIter.next());
+ final int comp = optKeysIter.next().compareTo(otherKeysIter.next());
if (comp != 0) {
return comp;
}
}
- Object[] array = new Object[propsSz];
+ final Object[] array = new Object[propsSz];
final int hash = Arrays.deepHashCode(myOptions.values().toArray(array));
final int hashFk = Arrays.deepHashCode(theirOptions.values().toArray(array));
if (hash < hashFk)
@@ -229,7 +229,7 @@ public final class FileSystemOptions imp
}
@Override
- public boolean equals(Object obj)
+ public boolean equals(final Object obj)
{
if (this == obj) {
return true;
@@ -240,7 +240,7 @@ public final class FileSystemOptions imp
if (getClass() != obj.getClass()) {
return false;
}
- FileSystemOptions other = (FileSystemOptions)obj;
+ final FileSystemOptions other = (FileSystemOptions)obj;
return compareTo(other) == 0;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/VFS.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/VFS.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/VFS.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/VFS.java Thu Jul 20 06:01:13 2017
@@ -120,7 +120,7 @@ public final class VFS
* @param manager the file system manager
* @since 2.2
*/
- public static void setManager(FileSystemManager manager) {
+ public static void setManager(final FileSystemManager manager) {
VFS.instance = manager;
}
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java Thu Jul 20 06:01:13 2017
@@ -478,7 +478,7 @@ public class StandardFileSystemManager
{
try
{
- Class<?> clazz = loadClass(className);
+ final Class<?> clazz = loadClass(className);
return clazz.newInstance();
}
catch (final Exception e)
@@ -492,7 +492,7 @@ public class StandardFileSystemManager
* @throws ClassNotFoundException if last {@code loadClass} failed.
* @see #findClassLoader()
*/
- private Class< ? > loadClass(String className) throws ClassNotFoundException
+ private Class< ? > loadClass(final String className) throws ClassNotFoundException
{
try
{
@@ -509,7 +509,7 @@ public class StandardFileSystemManager
* @throws IOException if {@code getResource} failed.
* @see #findClassLoader()
*/
- private Enumeration<URL> loadResources(String name) throws IOException
+ private Enumeration<URL> loadResources(final String name) throws IOException
{
Enumeration<URL> res = findClassLoader().getResources(name);
if (res == null || !res.hasMoreElements())
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java Thu Jul 20 06:01:13 2017
@@ -385,7 +385,7 @@ public class VFSClassLoader extends Secu
{
final List<URL> result = new ArrayList<>(2);
- for (FileObject baseFile : resources)
+ for (final FileObject baseFile : resources)
{
final FileObject file = baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF);
if (file.exists())
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java Thu Jul 20 06:01:13 2017
@@ -1435,7 +1435,7 @@ public abstract class AbstractFileObject
// Locate the parent of this file
if (parent == null)
{
- FileName name = fileName.getParent();
+ final FileName name = fileName.getParent();
if (name == null)
{
return null;
@@ -1882,7 +1882,7 @@ public abstract class AbstractFileObject
{
attach();
// remember type to avoid attach
- FileType srcType = getType();
+ final FileType srcType = getType();
doRename(destFile);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java Thu Jul 20 06:01:13 2017
@@ -90,7 +90,7 @@ public abstract class AbstractVfsContain
}
// Close all components
- for (Object component : toclose)
+ for (final Object component : toclose)
{
if (component instanceof VfsComponent)
{
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java Thu Jul 20 06:01:13 2017
@@ -469,7 +469,7 @@ public final class DefaultFileContent im
/*
if (getThreadData().getState() != STATE_NONE)
*/
- FileContentThreadData streams = getOrCreateThreadData();
+ final FileContentThreadData streams = getOrCreateThreadData();
if (streams.getOutstr() != null)
{
throw new FileSystemException("vfs.provider/write-in-use.error", fileObject);
@@ -479,7 +479,7 @@ public final class DefaultFileContent im
final OutputStream outstr = fileObject.getOutputStream(bAppend);
// Create and set wrapper
- FileContentOutputStream wrapped = new FileContentOutputStream(fileObject, outstr);
+ final FileContentOutputStream wrapped = new FileContentOutputStream(fileObject, outstr);
streams.setOutstr(wrapped);
streamOpened();
@@ -560,7 +560,7 @@ public final class DefaultFileContent im
*/
private void endInput(final FileContentInputStream instr)
{
- FileContentThreadData streams = threadData.get();
+ final FileContentThreadData streams = threadData.get();
if (streams != null)
{
streams.removeInstr(instr);
@@ -578,7 +578,7 @@ public final class DefaultFileContent im
*/
private void endRandomAccess(final RandomAccessContent rac)
{
- FileContentThreadData streams = threadData.get();
+ final FileContentThreadData streams = threadData.get();
if (streams != null)
{
streams.removeRastr(rac);
@@ -596,7 +596,7 @@ public final class DefaultFileContent im
*/
private void endOutput() throws Exception
{
- FileContentThreadData streams = threadData.get();
+ final FileContentThreadData streams = threadData.get();
if (streams != null)
{
streams.setOutstr(null);
@@ -620,7 +620,7 @@ public final class DefaultFileContent im
@Override
public boolean isOpen()
{
- FileContentThreadData streams = threadData.get();
+ final FileContentThreadData streams = threadData.get();
if (streams != null && streams.hasStreams())
{
return true;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java Thu Jul 20 06:01:13 2017
@@ -68,7 +68,7 @@ public class Bzip2FileObject extends Com
return new BZip2CompressorOutputStream(os);
}
- private static Bzip2FileSystem cast(CompressedFileFileSystem fs) {
+ private static Bzip2FileSystem cast(final CompressedFileFileSystem fs) {
if (fs instanceof Bzip2FileSystem) {
return (Bzip2FileSystem) fs;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java Thu Jul 20 06:01:13 2017
@@ -117,7 +117,7 @@ public class FTPClientWrapper implements
{
getFtpClient().quit();
}
- catch (IOException e)
+ catch (final IOException e)
{
LOG.debug("I/O exception while trying to quit, probably it's a timed out connection, ignoring.", e);
}
@@ -127,7 +127,7 @@ public class FTPClientWrapper implements
{
getFtpClient().disconnect();
}
- catch (IOException e)
+ catch (final IOException e)
{
LOG.warn("I/O exception while trying to disconnect, probably it's a closed connection, ignoring.", e);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java Thu Jul 20 06:01:13 2017
@@ -145,7 +145,7 @@ public final class FtpClientFactory
client.setParserFactory(myFactory);
}
- Boolean remoteVerification = builder.getRemoteVerification(fileSystemOptions);
+ final Boolean remoteVerification = builder.getRemoteVerification(fileSystemOptions);
if (remoteVerification != null)
{
client.setRemoteVerificationEnabled(remoteVerification.booleanValue());
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java Thu Jul 20 06:01:13 2017
@@ -194,7 +194,7 @@ public class FtpFileSystemConfigBuilder
* @param opts The FileSystemOptions.
* @return True if remote verification should be done.
*/
- public Boolean getRemoteVerification(FileSystemOptions opts)
+ public Boolean getRemoteVerification(final FileSystemOptions opts)
{
return getBoolean(opts, REMOTE_VERIFICATION);
}
@@ -370,7 +370,7 @@ public class FtpFileSystemConfigBuilder
* @param proxy the Proxy
* @since 2.1
*/
- public void setProxy(final FileSystemOptions opts, Proxy proxy)
+ public void setProxy(final FileSystemOptions opts, final Proxy proxy)
{
setParam(opts, PROXY, proxy);
}
@@ -392,7 +392,7 @@ public class FtpFileSystemConfigBuilder
* @param opts The FileSystemOptions.
* @param remoteVerification True if verification should be done.
*/
- public void setRemoteVerification(FileSystemOptions opts, boolean remoteVerification)
+ public void setRemoteVerification(final FileSystemOptions opts, final boolean remoteVerification)
{
setParam(opts, REMOTE_VERIFICATION, remoteVerification);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java Thu Jul 20 06:01:13 2017
@@ -60,7 +60,7 @@ public class GzipFileObject extends Comp
return new GZIPOutputStream(os);
}
- private static GzipFileSystem cast(CompressedFileFileSystem fs) {
+ private static GzipFileSystem cast(final CompressedFileFileSystem fs) {
if (fs instanceof GzipFileSystem) {
return (GzipFileSystem) fs;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystem.java Thu Jul 20 06:01:13 2017
@@ -126,7 +126,7 @@ public class HdfsFileSystem extends Abst
// no matter where they might come from
if (configNames != null)
{
- for (String configName : configNames)
+ for (final String configName : configNames)
{
log.debug("Adding HDFS configuration resource: " + configName);
conf.addResource(configName);
@@ -134,7 +134,7 @@ public class HdfsFileSystem extends Abst
}
if (configPaths != null)
{
- for (Path path : configPaths)
+ for (final Path path : configPaths)
{
log.debug("Adding HDFS configuration path: " + path);
conf.addResource(path);
@@ -142,7 +142,7 @@ public class HdfsFileSystem extends Abst
}
if (configURLs != null)
{
- for (URL url : configURLs)
+ for (final URL url : configURLs)
{
log.debug("Adding HDFS configuration URL: " + url);
conf.addResource(url);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java Thu Jul 20 06:01:13 2017
@@ -70,7 +70,7 @@ public final class HdfsFileSystemConfigB
*/
public String[] getConfigNames(final FileSystemOptions opts)
{
- String names = this.getString(opts, KEY_CONFIG_NAMES);
+ final String names = this.getString(opts, KEY_CONFIG_NAMES);
return names == null || names.isEmpty() ? null : names.split(",");
}
@@ -104,7 +104,7 @@ public final class HdfsFileSystemConfigB
}
else
{
- String previousNames = this.getString(opts, KEY_CONFIG_NAMES);
+ final String previousNames = this.getString(opts, KEY_CONFIG_NAMES);
if (previousNames == null || previousNames.isEmpty())
{
this.setParam(opts, KEY_CONFIG_NAMES, name);
@@ -125,13 +125,13 @@ public final class HdfsFileSystemConfigB
*/
public Path[] getConfigPaths(final FileSystemOptions opts)
{
- String pathNames = this.getString(opts, KEY_CONFIG_PATHS);
+ final String pathNames = this.getString(opts, KEY_CONFIG_PATHS);
if (pathNames == null || pathNames.isEmpty())
{
return null;
}
- String[] paths = pathNames.split(",");
- Path[] realPaths = new Path[paths.length];
+ final String[] paths = pathNames.split(",");
+ final Path[] realPaths = new Path[paths.length];
for (int i = 0; i < paths.length; i++)
{
realPaths[i] = new Path(paths[i]);
@@ -165,7 +165,7 @@ public final class HdfsFileSystemConfigB
}
else
{
- String previousPathNames = this.getString(opts, KEY_CONFIG_PATHS);
+ final String previousPathNames = this.getString(opts, KEY_CONFIG_PATHS);
if (previousPathNames == null || previousPathNames.isEmpty())
{
this.setParam(opts, KEY_CONFIG_PATHS, path.toString());
@@ -188,20 +188,20 @@ public final class HdfsFileSystemConfigB
{
try
{
- String urlNames = this.getString(opts, KEY_CONFIG_URLS);
+ final String urlNames = this.getString(opts, KEY_CONFIG_URLS);
if (urlNames == null || urlNames.isEmpty())
{
return null;
}
- String[] urls = urlNames.split(",");
- URL[] realURLs = new URL[urls.length];
+ final String[] urls = urlNames.split(",");
+ final URL[] realURLs = new URL[urls.length];
for (int i = 0; i < urls.length; i++)
{
realURLs[i] = new URL(urls[i]);
}
return realURLs;
}
- catch (MalformedURLException mue)
+ catch (final MalformedURLException mue)
{
// This should never happen because we save it in the proper form
}
@@ -234,7 +234,7 @@ public final class HdfsFileSystemConfigB
}
else
{
- String previousURLNames = this.getString(opts, KEY_CONFIG_URLS);
+ final String previousURLNames = this.getString(opts, KEY_CONFIG_URLS);
if (previousURLNames == null || previousURLNames.isEmpty())
{
this.setParam(opts, KEY_CONFIG_URLS, url.toString());
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/AbstractFilesCacheTestsBase.java Thu Jul 20 06:01:13 2017
@@ -38,7 +38,7 @@ public abstract class AbstractFilesCache
*/
public void testClearFiles() throws Exception
{
- FilesCache cache = getManager().getFilesCache();
+ final FilesCache cache = getManager().getFilesCache();
final FileObject fo1 = getWriteFolder().resolveFile("dir1");
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java Thu Jul 20 06:01:13 2017
@@ -33,8 +33,8 @@ public class DefaultFilesCacheTests exte
assertSame(dir1, dir1_2);
// now the same test, unreferenced (compare only hashCode)
- int hc1 = getFileHashCode();
- int hc2 = getFileHashCode();
+ final int hc1 = getFileHashCode();
+ final int hc2 = getFileHashCode();
assertEquals("Hashcode of file changed, so most likely new instance", hc1, hc2);
}
}
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileSystemManagerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileSystemManagerTest.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileSystemManagerTest.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileSystemManagerTest.java Thu Jul 20 06:01:13 2017
@@ -40,7 +40,7 @@ public class DefaultFileSystemManagerTes
@Test(expected = NullPointerException.class)
public void testResolveFileAbsoluteThrows() throws FileSystemException
{
- String absolute = new File("/").getAbsoluteFile().toURI().toString();
+ final String absolute = new File("/").getAbsoluteFile().toURI().toString();
VFS.getManager().resolveFile((File) null, absolute);
}
@@ -53,7 +53,7 @@ public class DefaultFileSystemManagerTes
@Test
public void testResolveFileObjectNullAbsolute() throws FileSystemException
{
- String absolute = new File("/").getAbsoluteFile().toURI().toString();
+ final String absolute = new File("/").getAbsoluteFile().toURI().toString();
VFS.getManager().resolveFile((FileObject) null, absolute);
}
}
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/VfsClassLoaderTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/VfsClassLoaderTests.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/VfsClassLoaderTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/VfsClassLoaderTests.java Thu Jul 20 06:01:13 2017
@@ -117,7 +117,7 @@ public class VfsClassLoaderTests
// hasProvider("file") cannot be used as it triggers default provider URL
manager.toFileObject(new File("."));
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
System.out.println("VfsClassLoaderTests no local file provider, skipping.");
return;
@@ -168,7 +168,7 @@ public class VfsClassLoaderTests
// hasProvider("file") cannot be used as it triggers default provider URL
manager.toFileObject(new File("."));
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
System.out.println("VfsClassLoaderTests no local file provider, skipping.");
return;
@@ -237,14 +237,14 @@ public class VfsClassLoaderTests
* VFSClassLoader#testGetResourcesJARs.
*/
@Override
- public Enumeration<URL> getResources(String name)
+ public Enumeration<URL> getResources(final String name)
throws IOException
{
return Collections.enumeration(Collections.<URL> emptyList());
}
@Override
- protected Class<?> findClass(String name)
+ protected Class<?> findClass(final String name)
throws ClassNotFoundException
{
fail("Not intended to be used for class loading.");
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java Thu Jul 20 06:01:13 2017
@@ -45,14 +45,14 @@ public class BasicOperationsTestCase
implements VfsComponent
{
@Override
- public void setLogger(Log logger)
+ public void setLogger(final Log logger)
{
assertNotNull("setLogger", logger);
ops |= 1;
}
@Override
- public void setContext(VfsComponentContext context)
+ public void setContext(final VfsComponentContext context)
{
assertNotNull("setContext", context);
ops |= 2;
@@ -87,8 +87,8 @@ public class BasicOperationsTestCase
int ops = 0; // bit array to record invocations (poor mans mock)
@Override
- public void collectOperations(Collection<Class< ? extends FileOperation>> operationsList,
- FileObject file)
+ public void collectOperations(final Collection<Class< ? extends FileOperation>> operationsList,
+ final FileObject file)
throws FileSystemException
{
assertNotNull("collect operationsList", operationsList);
@@ -97,7 +97,7 @@ public class BasicOperationsTestCase
}
@Override
- public FileOperation getOperation(FileObject file, Class< ? extends FileOperation> operationClass)
+ public FileOperation getOperation(final FileObject file, final Class< ? extends FileOperation> operationClass)
throws FileSystemException
{
assertNotNull("file object", file);
@@ -118,7 +118,7 @@ public class BasicOperationsTestCase
public void setUp() throws FileSystemException
{
manager = new DefaultFileSystemManager();
- FileProvider fp = new DefaultLocalFileProvider();
+ final FileProvider fp = new DefaultLocalFileProvider();
manager.addProvider("file", fp);
manager.init();
}
@@ -150,7 +150,7 @@ public class BasicOperationsTestCase
{
final MyFileOprationProviderBase myop = new MyFileOperationProviderNoncomp();
manager.addOperationProvider("file", myop);
- FileOperationProvider[] ops = manager.getOperationProviders("file");
+ final FileOperationProvider[] ops = manager.getOperationProviders("file");
assertSame("exactly one provider registered", 1, ops.length);
assertSame(myop, ops[0]);
assertEquals(0, myop.ops); // collect not invoked
@@ -165,12 +165,12 @@ public class BasicOperationsTestCase
{
final MyFileOprationProviderBase myop = new MyFileOperationProviderNoncomp();
manager.addOperationProvider("file", myop);
- FileObject fo = manager.toFileObject(new File("."));
+ final FileObject fo = manager.toFileObject(new File("."));
- FileOperations ops = fo.getFileOperations();
+ final FileOperations ops = fo.getFileOperations();
assertNotNull(ops);
- Class< ? extends FileOperation>[] oparray = ops.getOperations();
+ final Class< ? extends FileOperation>[] oparray = ops.getOperations();
assertSame("no ops should be found", 0, oparray.length);
assertSame(16, myop.ops); // collect
}
@@ -184,17 +184,17 @@ public class BasicOperationsTestCase
{
final MyFileOprationProviderBase myop = new MyFileOperationProviderNoncomp();
manager.addOperationProvider("file", myop);
- FileObject fo = manager.toFileObject(new File("."));
+ final FileObject fo = manager.toFileObject(new File("."));
- FileOperations ops = fo.getFileOperations();
+ final FileOperations ops = fo.getFileOperations();
assertNotNull(ops);
try
{
- FileOperation logop = ops.getOperation(VcsLog.class);
+ final FileOperation logop = ops.getOperation(VcsLog.class);
fail("Must throw but returned " + logop);
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
assertEquals("vfs.operation/operation-not-supported.error", e.getCode());
}
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java Thu Jul 20 06:01:13 2017
@@ -89,7 +89,7 @@ public class FtpProviderTestCase extends
* @throws FtpException
* @throws IOException
*/
- static void setUpClass(String rootDirectory, FileSystemFactory fileSystemFactory) throws FtpException, IOException
+ static void setUpClass(final String rootDirectory, final FileSystemFactory fileSystemFactory) throws FtpException, IOException
{
if (Server != null)
{
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderUserDirTestCase.java Thu Jul 20 06:01:13 2017
@@ -66,7 +66,7 @@ public class FtpProviderUserDirTestCase
FileUtils.copyDirectory(testDir, initialDir, new FileFilter()
{
@Override
- public boolean accept(File pathname)
+ public boolean accept(final File pathname)
{
return !pathname.getPath().contains(rootDir.getName());
}
@@ -75,9 +75,9 @@ public class FtpProviderUserDirTestCase
return new NativeFileSystemFactory()
{
@Override
- public FileSystemView createFileSystemView(User user) throws FtpException
+ public FileSystemView createFileSystemView(final User user) throws FtpException
{
- FileSystemView fsView = super.createFileSystemView(user);
+ final FileSystemView fsView = super.createFileSystemView(user);
fsView.changeWorkingDirectory("home/test");
return fsView;
}
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java Thu Jul 20 06:01:13 2017
@@ -78,7 +78,7 @@ public class HdfsFileProviderTest
Logger.getRootLogger().setLevel(Level.ERROR);
// Put the MiniDFSCluster directory in the target directory
- File data = new File("target/test/hdfstestdata").getAbsoluteFile();
+ final File data = new File("target/test/hdfstestdata").getAbsoluteFile();
data.mkdirs();
System.setProperty("test.build.data", data.toString());
FileUtils.cleanDirectory(data);
@@ -111,7 +111,7 @@ public class HdfsFileProviderTest
* <P>
* Will do nothing on Windows.
*/
- public static void setUmask(Configuration conf2)
+ public static void setUmask(final Configuration conf2)
{
if (Os.isFamily(Os.OS_FAMILY_WINDOWS))
{
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java Thu Jul 20 06:01:13 2017
@@ -93,7 +93,7 @@ public class HdfsFileProviderTestCase ex
Logger.getRootLogger().setLevel(Level.OFF);
// Put the MiniDFSCluster directory in the target directory
- File data = new File("target/test/hdfstestcasedata").getAbsoluteFile();
+ final File data = new File("target/test/hdfstestcasedata").getAbsoluteFile();
data.mkdirs();
System.setProperty("test.build.data", data.toString());
FileUtils.cleanDirectory(data);
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/WindowsFileNameTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/WindowsFileNameTests.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/WindowsFileNameTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/WindowsFileNameTests.java Thu Jul 20 06:01:13 2017
@@ -33,11 +33,11 @@ public class WindowsFileNameTests
public void testWindowsRoots() throws Exception
{
// valid URI forms of the filesystem root
- String[] tests = new String[] { "file:///C:/", "file://C:/", "file:/C:/", "file:C:/" };
+ final String[] tests = new String[] { "file:///C:/", "file://C:/", "file:/C:/", "file:C:/" };
- for(String name : tests)
+ for(final String name : tests)
{
- FileName fn = getManager().resolveFile(name).getName();
+ final FileName fn = getManager().resolveFile(name).getName();
// the following tests work for Windows file names only
assertSame(WindowsFileName.class, fn.getClass());
@@ -58,16 +58,16 @@ public class WindowsFileNameTests
public void testWindowsWrongRoots() throws Exception
{
- String[] tests = new String[] { "file:///C:", "file://C:", "file:/C:", "file:C:" };
+ final String[] tests = new String[] { "file:///C:", "file://C:", "file:/C:", "file:C:" };
- for(String name : tests)
+ for(final String name : tests)
{
try
{
- FileName fn = getManager().resolveFile(name).getName();
+ final FileName fn = getManager().resolveFile(name).getName();
fail("should not accept root " + name);
}
- catch (FileSystemException ex)
+ catch (final FileSystemException ex)
{
assertEquals("vfs.provider/invalid-absolute-uri.error", ex.getCode());
assertTrue(ex.toString().indexOf(name) >= 0);
@@ -80,7 +80,7 @@ public class WindowsFileNameTests
try
{
final String FILE = "file://///";
- FileObject fo = getManager().resolveFile(FILE);
+ final FileObject fo = getManager().resolveFile(FILE);
fail("Windows File Parser should not allow " + FILE + " " + fo);
}
catch(FileSystemException ex)
@@ -97,7 +97,7 @@ public class WindowsFileNameTests
try
{
final String FILE = "file://////";
- FileObject fo = getManager().resolveFile(FILE);
+ final FileObject fo = getManager().resolveFile(FILE);
fail("Windows File Parser should not allow " + FILE + " " + fo);
}
catch(FileSystemException ex)
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/JackrabbitMain.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/JackrabbitMain.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/JackrabbitMain.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/JackrabbitMain.java Thu Jul 20 06:01:13 2017
@@ -178,7 +178,7 @@ class JackrabbitMain
webapp.setWar(file.getPath());
webapp.setClassLoader(JackrabbitMain.class.getClassLoader());
// we use a modified web.xml which has some servlets remove (which produce random empty directories)
- URL res = getResource("/jcrweb.xml");
+ final URL res = getResource("/jcrweb.xml");
if (res != null) {
webapp.setDescriptor(res.toString());
}
@@ -197,7 +197,7 @@ class JackrabbitMain
}
/** Try to load a resource with various classloaders. */
- private URL getResource(String name)
+ private URL getResource(final String name)
{
URL res = Thread.currentThread().getContextClassLoader().getResource(name);
if (res == null)
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java Thu Jul 20 06:01:13 2017
@@ -303,7 +303,7 @@ public class ProviderReadTests extends A
final InputStream instr = file.getContent().getInputStream();
try
{
- byte[] buf = new byte[25];
+ final byte[] buf = new byte[25];
assertEquals(20, instr.read(buf));
for(int i=0;i<5;i++)
@@ -385,7 +385,7 @@ public class ProviderReadTests extends A
Assert.assertFalse("subdir4.jar/ must not be layerable", getManager().canCreateFileSystem(folder));
try
{
- FileObject ignored = getManager().createFileSystem(folder);
+ final FileObject ignored = getManager().createFileSystem(folder);
fail("Should not be able to create a layered filesystem on a directory. " + ignored);
}
catch (final FileSystemException e)
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java Thu Jul 20 06:01:13 2017
@@ -94,14 +94,14 @@ public class UrlTests
public void testURLContentProvider() throws Exception
{
// Test non-empty file
- FileObject file = getReadFolder().resolveFile("file1.txt");
+ final FileObject file = getReadFolder().resolveFile("file1.txt");
assertTrue(file.exists());
- String uri = file.getURL().toExternalForm();
- FileSystemOptions options = getReadFolder().getFileSystem().getFileSystemOptions();
+ final String uri = file.getURL().toExternalForm();
+ final FileSystemOptions options = getReadFolder().getFileSystem().getFileSystemOptions();
- FileObject f1 = getManager().resolveFile(uri, options);
- FileObject f2 = getManager().resolveFile(uri, options);
+ final FileObject f1 = getManager().resolveFile(uri, options);
+ final FileObject f2 = getManager().resolveFile(uri, options);
assertEquals("Two files resolved by URI must be equals on " + uri, f1, f2);
assertSame("Resolving two times should not produce new filesystem on " + uri, f1.getFileSystem(), f2.getFileSystem());
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/VerifyingFileSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/VerifyingFileSelector.java?rev=1802452&r1=1802451&r2=1802452&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/VerifyingFileSelector.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/VerifyingFileSelector.java Thu Jul 20 06:01:13 2017
@@ -103,7 +103,7 @@ public class VerifyingFileSelector
}
else
{
- AbstractFileObject parent = FileObjectUtils.getAbstractFileObject(folder.getParent());
+ final AbstractFileObject parent = FileObjectUtils.getAbstractFileObject(folder.getParent());
assertSame(currentFolder, parent);
// Locate the info for the child, and make sure it is folder