Author: ggregory
Date: Fri Jul 1 04:56:23 2016
New Revision: 1750873
URL: http://svn.apache.org/viewvc?rev=1750873&view=rev
Log:
Redundant specification of type arguments.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
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/UserAuthenticationData.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/WeakRefFilesCache.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/FileTypeMap.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/ProviderConfiguration.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/impl/VirtualFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.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/AbstractFileProvider.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.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/DelegateFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileInfo.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/ProviderWriteTests.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/FileExtensionSelector.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
Fri Jul 1 04:56:23 2016
@@ -39,7 +39,7 @@ public class FileExtensionSelector imple
/**
* The extensions to select.
*/
- private final Set<String> extensions = new HashSet<String>();
+ private final Set<String> extensions = new HashSet<>();
/**
* Creates a new selector for the given extensions.
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -180,11 +180,11 @@ public final class FileSystemOptions imp
final SortedMap<FileSystemOptionKey, Object> myOptions =
options instanceof SortedMap
? (SortedMap<FileSystemOptionKey, Object>)options
- : new TreeMap<FileSystemOptionKey, Object>(options);
+ : new TreeMap<>(options);
final SortedMap<FileSystemOptionKey, Object> theirOptions =
other.options instanceof SortedMap
? (SortedMap<FileSystemOptionKey, Object>)other.options
- : new TreeMap<FileSystemOptionKey, Object>(other.options);
+ : new TreeMap<>(other.options);
final Iterator<FileSystemOptionKey> optKeysIter =
myOptions.keySet().iterator();
final Iterator<FileSystemOptionKey> otherKeysIter =
theirOptions.keySet().iterator();
while(optKeysIter.hasNext()) {
@@ -221,7 +221,7 @@ public final class FileSystemOptions imp
final SortedMap<FileSystemOptionKey, Object> myOptions =
options instanceof SortedMap
? (SortedMap<FileSystemOptionKey, Object>)options
- : new TreeMap<FileSystemOptionKey, Object>(options);
+ : new TreeMap<>(options);
result = prime * result + myOptions.keySet().hashCode();
result = prime * result +
Arrays.deepHashCode(myOptions.values().toArray(new Object[options.size()]));
}
@@ -253,7 +253,7 @@ public final class FileSystemOptions imp
@Override
public Object clone()
{
- return new FileSystemOptions(new TreeMap<FileSystemOptionKey,
Object>(options));
+ return new FileSystemOptions(new TreeMap<>(options));
}
@Override
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/UserAuthenticationData.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/UserAuthenticationData.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/UserAuthenticationData.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/UserAuthenticationData.java
Fri Jul 1 04:56:23 2016
@@ -102,7 +102,7 @@ public class UserAuthenticationData
public static final Type DOMAIN = new Type("domain");
/** The authentication data. */
- private final Map<Type, char[]> authenticationData = new TreeMap<Type,
char[]>();
+ private final Map<Type, char[]> authenticationData = new TreeMap<>();
/**
* Creates a new uninitialized instance.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
Fri Jul 1 04:56:23 2016
@@ -45,7 +45,7 @@ public class DefaultFilesCache extends A
{
/** The FileSystem cache. Keeps one Map for each FileSystem. */
private final ConcurrentMap<FileSystem, ConcurrentMap<FileName,
FileObject>> filesystemCache =
- new ConcurrentHashMap<FileSystem, ConcurrentMap<FileName,
FileObject>>(10);
+ new ConcurrentHashMap<>(10);
@Override
public void putFile(final FileObject file)
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
Fri Jul 1 04:56:23 2016
@@ -49,7 +49,7 @@ public class LRUFilesCache extends Abstr
/** The FileSystem cache */
private final ConcurrentMap<FileSystem, Map<FileName, FileObject>>
filesystemCache =
- new ConcurrentHashMap<FileSystem, Map<FileName, FileObject>>(10);
+ new ConcurrentHashMap<>(10);
/** The size of the cache */
private final int lruSize;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
Fri Jul 1 04:56:23 2016
@@ -50,10 +50,10 @@ public class SoftRefFilesCache extends A
private static final Log log = LogFactory.getLog(SoftRefFilesCache.class);
private final ConcurrentMap<FileSystem, Map<FileName,
Reference<FileObject>>> fileSystemCache =
- new ConcurrentHashMap<FileSystem, Map<FileName,
Reference<FileObject>>>();
+ new ConcurrentHashMap<>();
private final Map<Reference<FileObject>, FileSystemAndNameKey>
refReverseMap =
- new HashMap<Reference<FileObject>, FileSystemAndNameKey>(100);
- private final ReferenceQueue<FileObject> refQueue = new
ReferenceQueue<FileObject>();
+ new HashMap<>(100);
+ private final ReferenceQueue<FileObject> refQueue = new ReferenceQueue<>();
private volatile SoftRefReleaseThread softRefReleaseThread = null; //
@GuardedBy("lock")
@@ -226,7 +226,7 @@ public class SoftRefFilesCache extends A
protected Reference<FileObject> createReference(final FileObject file,
final ReferenceQueue<FileObject> refqueue)
{
- return new SoftReference<FileObject>(file, refqueue);
+ return new SoftReference<>(file, refqueue);
}
@Override
@@ -379,7 +379,7 @@ public class SoftRefFilesCache extends A
{
break;
}
- files = new HashMap<FileName, Reference<FileObject>>();
+ files = new HashMap<>();
} while (fileSystemCache.putIfAbsent(fileSystem, files) == null);
return files;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/WeakRefFilesCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/WeakRefFilesCache.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/WeakRefFilesCache.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/WeakRefFilesCache.java
Fri Jul 1 04:56:23 2016
@@ -35,6 +35,6 @@ public class WeakRefFilesCache extends S
@Override
protected Reference<FileObject> createReference(final FileObject file,
final ReferenceQueue<FileObject> refqueue)
{
- return new WeakReference<FileObject>(file, refqueue);
+ return new WeakReference<>(file, refqueue);
}
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
Fri Jul 1 04:56:23 2016
@@ -83,7 +83,7 @@ public class DefaultFileMonitor implemen
/**
* Map from FileName to FileObject being monitored.
*/
- private final Map<FileName, FileMonitorAgent> monitorMap = new
HashMap<FileName, FileMonitorAgent>();
+ private final Map<FileName, FileMonitorAgent> monitorMap = new HashMap<>();
/**
* The low priority thread used for checking the files being monitored.
@@ -93,12 +93,12 @@ public class DefaultFileMonitor implemen
/**
* File objects to be removed from the monitor map.
*/
- private final Stack<FileObject> deleteStack = new Stack<FileObject>();
+ private final Stack<FileObject> deleteStack = new Stack<>();
/**
* File objects to be added to the monitor map.
*/
- private final Stack<FileObject> addStack = new Stack<FileObject>();
+ private final Stack<FileObject> addStack = new Stack<>();
/**
* A flag used to determine if the monitor thread should be running.
@@ -466,7 +466,7 @@ public class DefaultFileMonitor implemen
{
if (this.file.getType().hasChildren())
{
- this.children = new HashMap<FileName, Object>();
+ this.children = new HashMap<>();
final FileObject[] childrenList = this.file.getChildren();
for (final FileObject element : childrenList)
{
@@ -554,8 +554,8 @@ public class DefaultFileMonitor implemen
if (this.children != null)
{
// See which new children are not listed in the
current children map.
- final Map<FileName, Object> newChildrenMap = new
HashMap<FileName, Object>();
- final Stack<FileObject> missingChildren = new
Stack<FileObject>();
+ final Map<FileName, Object> newChildrenMap = new
HashMap<>();
+ final Stack<FileObject> missingChildren = new
Stack<>();
for (int i = 0; i < newChildren.length; i++)
{
@@ -588,7 +588,7 @@ public class DefaultFileMonitor implemen
// First set of children - Break out the cigars
if (newChildren.length > 0)
{
- this.children = new HashMap<FileName, Object>();
+ this.children = new HashMap<>();
}
for (final FileObject element : newChildren)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
Fri Jul 1 04:56:23 2016
@@ -49,7 +49,7 @@ public class DefaultFileReplicator
'?', '/', '\\', ' ', '&', '"', '\'', '*', '#', ';', ':', '<', '>',
'|'
};
- private final ArrayList<Object> copies = new ArrayList<Object>();
+ private final ArrayList<Object> copies = new ArrayList<>();
private long filecount;
private File tempDir;
private boolean tempDirMessageLogged;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
Fri Jul 1 04:56:23 2016
@@ -65,12 +65,12 @@ public class DefaultFileSystemManager im
/**
* Mapping from URI scheme to FileProvider.
*/
- private final Map<String, FileProvider> providers = new HashMap<String,
FileProvider>();
+ private final Map<String, FileProvider> providers = new HashMap<>();
/**
* All components used by this manager.
*/
- private final ArrayList<Object> components = new ArrayList<Object>();
+ private final ArrayList<Object> components = new ArrayList<>();
/**
* The context to pass to providers.
@@ -81,7 +81,7 @@ public class DefaultFileSystemManager im
* Operations providers added to this manager.
*/
private final Map<String, List<FileOperationProvider>> operationProviders =
- new HashMap<String, List<FileOperationProvider>>();
+ new HashMap<>();
/**
* Mappings of file types.
@@ -1259,7 +1259,7 @@ public class DefaultFileSystemManager im
{
if (!operationProviders.containsKey(scheme))
{
- final List<FileOperationProvider> providers = new
ArrayList<FileOperationProvider>();
+ final List<FileOperationProvider> providers = new
ArrayList<>();
operationProviders.put(scheme, providers);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/FileTypeMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/FileTypeMap.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/FileTypeMap.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/FileTypeMap.java
Fri Jul 1 04:56:23 2016
@@ -28,8 +28,8 @@ import org.apache.commons.vfs2.FileSyste
*/
class FileTypeMap
{
- private final Map<String, String> mimeTypeMap = new HashMap<String,
String>();
- private final Map<String, String> extensionMap = new HashMap<String,
String>();
+ private final Map<String, String> mimeTypeMap = new HashMap<>();
+ private final Map<String, String> extensionMap = new HashMap<>();
/**
* Adds a MIME type mapping.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/ProviderConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/ProviderConfiguration.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/ProviderConfiguration.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/ProviderConfiguration.java
Fri Jul 1 04:56:23 2016
@@ -27,8 +27,8 @@ import java.util.List;
public class ProviderConfiguration
{
private String className;
- private final List<String> schemes = new ArrayList<String>(10);
- private final List<String> dependenies = new ArrayList<String>(10);
+ private final List<String> schemes = new ArrayList<>(10);
+ private final List<String> dependenies = new ArrayList<>(10);
public ProviderConfiguration()
{
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -419,7 +419,7 @@ public class StandardFileSystemManager
*/
private String[] getRequiredClasses(final Element providerDef)
{
- final ArrayList<String> classes = new ArrayList<String>();
+ final ArrayList<String> classes = new ArrayList<>();
final NodeList deps = providerDef.getElementsByTagName("if-available");
final int count = deps.getLength();
for (int i = 0; i < count; i++)
@@ -439,7 +439,7 @@ public class StandardFileSystemManager
*/
private String[] getRequiredSchemes(final Element providerDef)
{
- final ArrayList<String> schemes = new ArrayList<String>();
+ final ArrayList<String> schemes = new ArrayList<>();
final NodeList deps = providerDef.getElementsByTagName("if-available");
final int count = deps.getLength();
for (int i = 0; i < count; i++)
@@ -459,7 +459,7 @@ public class StandardFileSystemManager
*/
private String[] getSchemas(final Element provider)
{
- final ArrayList<String> schemas = new ArrayList<String>();
+ final ArrayList<String> schemas = new ArrayList<>();
final NodeList schemaElements =
provider.getElementsByTagName("scheme");
final int count = schemaElements.getLength();
for (int i = 0; i < count; i++)
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -51,7 +51,7 @@ import org.apache.commons.vfs2.NameScope
*/
public class VFSClassLoader extends SecureClassLoader
{
- private final ArrayList<FileObject> resources = new
ArrayList<FileObject>();
+ private final ArrayList<FileObject> resources = new ArrayList<>();
/**
* Constructors a new VFSClassLoader for the given file.
@@ -383,7 +383,7 @@ public class VFSClassLoader extends Secu
@Override
protected Enumeration<URL> findResources(final String name) throws
IOException
{
- final List<URL> result = new ArrayList<URL>(2);
+ final List<URL> result = new ArrayList<>(2);
for (FileObject baseFile : resources)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
Fri Jul 1 04:56:23 2016
@@ -39,7 +39,7 @@ import org.apache.commons.vfs2.provider.
*/
public class VirtualFileSystem extends AbstractFileSystem
{
- private final Map<FileName, FileObject> junctions = new HashMap<FileName,
FileObject>();
+ private final Map<FileName, FileObject> junctions = new HashMap<>();
public VirtualFileSystem(final AbstractFileName rootName, final
FileSystemOptions fileSystemOptions)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java
Fri Jul 1 04:56:23 2016
@@ -38,7 +38,7 @@ public abstract class AbstractFileOperat
* Collection of operations that are available for that scheme.
*/
private final Collection<Class<? extends FileOperation>> operations =
- new ArrayList<Class<? extends FileOperation>>();
+ new ArrayList<>();
/**
* Gather available operations for the specified FileObject and put them
into
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
Fri Jul 1 04:56:23 2016
@@ -65,7 +65,7 @@ public class DefaultFileOperations imple
return null;
}
- final List<Class<? extends FileOperation>> operations = new
ArrayList<Class<? extends FileOperation>>();
+ final List<Class<? extends FileOperation>> operations = new
ArrayList<>();
for (final FileOperationProvider provider : providers)
{
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -220,7 +220,7 @@ public abstract class AbstractFileObject
if (children != null && childName != null && newType != null)
{
// TODO - figure out if children[] can be replaced by list
- final ArrayList<FileName> list = new
ArrayList<FileName>(Arrays.asList(children));
+ final ArrayList<FileName> list = new
ArrayList<>(Arrays.asList(children));
if (newType.equals(FileType.IMAGINARY))
{
list.remove(childName);
@@ -311,7 +311,7 @@ public abstract class AbstractFileObject
}
// Locate the files to copy across
- final ArrayList<FileObject> files = new ArrayList<FileObject>();
+ final ArrayList<FileObject> files = new ArrayList<>();
file.findFiles(selector, false, files);
// Copy everything across
@@ -473,7 +473,7 @@ public abstract class AbstractFileObject
*/
// Locate all the files to delete
- final ArrayList<FileObject> files = new ArrayList<FileObject>();
+ final ArrayList<FileObject> files = new ArrayList<>();
findFiles(selector, true, files);
// Delete 'em
@@ -1640,7 +1640,7 @@ public abstract class AbstractFileObject
{
if (objects == null)
{
- objects = new ArrayList<Object>(INITIAL_LIST_SIZE);
+ objects = new ArrayList<>(INITIAL_LIST_SIZE);
}
objects.add(strongRef);
}
@@ -1839,7 +1839,7 @@ public abstract class AbstractFileObject
return null;
}
- final ArrayList<FileObject> list = new ArrayList<FileObject>();
+ final ArrayList<FileObject> list = new ArrayList<>();
this.findFiles(selector, true, list);
return list;
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
Fri Jul 1 04:56:23 2016
@@ -44,7 +44,7 @@ public abstract class AbstractFileProvid
* to {@link FileSystem}.
*/
private final Map<FileSystemKey, FileSystem> fileSystems
- = new TreeMap<FileSystemKey, FileSystem>(); // @GuardedBy("self")
+ = new TreeMap<>(); // @GuardedBy("self")
private FileNameParser parser;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
Fri Jul 1 04:56:23 2016
@@ -70,14 +70,14 @@ public abstract class AbstractFileSystem
*/
private final String rootURI;
- private final Collection<Capability> caps = new HashSet<Capability>();
+ private final Collection<Capability> caps = new HashSet<>();
private FileObject parentLayer;
/**
* Map from FileName to an ArrayList of listeners for that file.
*/
- private final Map<FileName, ArrayList<FileListener>> listenerMap = new
HashMap<FileName, ArrayList<FileListener>>();
+ private final Map<FileName, ArrayList<FileListener>> listenerMap = new
HashMap<>();
/**
* FileSystemOptions used for configuration
@@ -512,7 +512,7 @@ public abstract class AbstractFileSystem
ArrayList<FileListener> listeners =
listenerMap.get(file.getName());
if (listeners == null)
{
- listeners = new ArrayList<FileListener>();
+ listeners = new ArrayList<>();
listenerMap.put(file.getName(), listeners);
}
listeners.add(listener);
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -30,7 +30,7 @@ public abstract class AbstractVfsContain
* The components contained by this component.
*/
private final ArrayList<Object> components
- = new ArrayList<Object>(); // @GuardedBy("self")
+ = new ArrayList<>(); // @GuardedBy("self")
/**
* Adds a sub-component to this component.
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -61,7 +61,7 @@ public final class DefaultFileContent im
private FileContentInfo fileContentInfo;
private final FileContentInfoFactory fileContentInfoFactory;
- private final ThreadLocal<FileContentThreadData> threadData = new
ThreadLocal<FileContentThreadData>();
+ private final ThreadLocal<FileContentThreadData> threadData = new
ThreadLocal<>();
private boolean resetAttributes;
/**
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
Fri Jul 1 04:56:23 2016
@@ -45,7 +45,7 @@ import org.apache.commons.vfs2.util.Weak
public class DelegateFileObject<AFS extends AbstractFileSystem> extends
AbstractFileObject<AFS> implements FileListener
{
private FileObject file;
- private final Set<String> children = new HashSet<String>();
+ private final Set<String> children = new HashSet<>();
private boolean ignoreEvent;
public DelegateFileObject(final AbstractFileName name,
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
Fri Jul 1 04:56:23 2016
@@ -29,8 +29,8 @@ class FileContentThreadData
{
// private int state = DefaultFileContent.STATE_CLOSED;
- private final ArrayList<InputStream> instrs = new ArrayList<InputStream>();
- private final ArrayList<RandomAccessContent> rastrs = new
ArrayList<RandomAccessContent>();
+ private final ArrayList<InputStream> instrs = new ArrayList<>();
+ private final ArrayList<RandomAccessContent> rastrs = new ArrayList<>();
private DefaultFileContent.FileContentOutputStream outstr;
FileContentThreadData()
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
Fri Jul 1 04:56:23 2016
@@ -140,7 +140,7 @@ public class FtpFileObject extends Abstr
}
else
{
- children = new TreeMap<String, FTPFile>();
+ children = new TreeMap<>();
// Remove '.' and '..' elements
for (int i = 0; i < tmpChildren.length; i++)
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java
Fri Jul 1 04:56:23 2016
@@ -44,7 +44,7 @@ public class FtpFileSystem extends Abstr
// private final String password;
// An idle client
- private final AtomicReference<FtpClient> idleClient = new
AtomicReference<FtpClient>();
+ private final AtomicReference<FtpClient> idleClient = new
AtomicReference<>();
/**
* @param rootName The root of the file system.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
Fri Jul 1 04:56:23 2016
@@ -103,7 +103,7 @@ public class HdfsFileObject extends Abst
}
else
{
- final Map<String, Object> attrs = new HashMap<String, Object>();
+ final Map<String, Object> attrs = new HashMap<>();
attrs.put(HdfsFileAttributes.LAST_ACCESS_TIME.toString(),
this.stat.getAccessTime());
attrs.put(HdfsFileAttributes.BLOCK_SIZE.toString(),
this.stat.getBlockSize());
attrs.put(HdfsFileAttributes.GROUP.toString(),
this.stat.getGroup());
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
Fri Jul 1 04:56:23 2016
@@ -102,7 +102,7 @@ public class JarFileObject extends ZipFi
protected Map<String, Object> doGetAttributes()
throws Exception
{
- final Map<String, Object> attrs = new HashMap<String, Object>();
+ final Map<String, Object> attrs = new HashMap<>();
// Add the file system's attributes first
final JarFileSystem fs = (JarFileSystem) getFileSystem();
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java
Fri Jul 1 04:56:23 2016
@@ -43,7 +43,7 @@ public class JarFileProvider extends Zip
static
{
- final Collection<Capability> combined = new ArrayList<Capability>();
+ final Collection<Capability> combined = new ArrayList<>();
combined.addAll(ZipFileProvider.capabilities);
combined.addAll(Arrays.asList(new Capability[]
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
Fri Jul 1 04:56:23 2016
@@ -474,7 +474,7 @@ public class SftpFileObject extends Abst
}
// Extract the child names
- final ArrayList<FileObject> children = new ArrayList<FileObject>();
+ final ArrayList<FileObject> children = new ArrayList<>();
for (@SuppressWarnings("unchecked") // OK because ChannelSftp.ls() is
documented to return Vector<LsEntry>
final
Iterator<LsEntry> iterator = (Iterator<LsEntry>)
vector.iterator(); iterator.hasNext();)
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
Fri Jul 1 04:56:23 2016
@@ -33,7 +33,7 @@ public class TarFileObject extends Abstr
{
/** The TarArchiveEntry */
private TarArchiveEntry entry;
- private final HashSet<String> children = new HashSet<String>();
+ private final HashSet<String> children = new HashSet<>();
private FileType type;
protected TarFileObject(final AbstractFileName name,
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
Fri Jul 1 04:56:23 2016
@@ -81,7 +81,7 @@ public class TarFileSystem extends Abstr
// Build the index
try
{
- final List<TarFileObject> strongRef = new
ArrayList<TarFileObject>(DEFAULT_INDEX_SIZE);
+ final List<TarFileObject> strongRef = new
ArrayList<>(DEFAULT_INDEX_SIZE);
TarArchiveEntry entry;
while ((entry = getTarFile().getNextTarEntry()) != null)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
Fri Jul 1 04:56:23 2016
@@ -232,7 +232,7 @@ public class WebdavFileObject extends Ht
private void setUserName(final URLFileName fileName, final String
urlStr)
throws IOException
{
- final List<DefaultDavProperty> list = new
ArrayList<DefaultDavProperty>();
+ final List<DefaultDavProperty> list = new ArrayList<>();
String name =
builder.getCreatorName(getFileSystem().getFileSystemOptions());
final String userName = fileName.getUserName();
if (name == null)
@@ -311,7 +311,7 @@ public class WebdavFileObject extends Ht
@Override
protected Map<String, Object> doGetAttributes() throws Exception
{
- final Map<String, Object> attributes = new HashMap<String, Object>();
+ final Map<String, Object> attributes = new HashMap<>();
try
{
final URLFileName fileName = (URLFileName) getName();
@@ -459,7 +459,7 @@ public class WebdavFileObject extends Ht
DavConstants.DEPTH_1);
execute(method);
- final List<WebdavFileObject> vfs = new
ArrayList<WebdavFileObject>();
+ final List<WebdavFileObject> vfs = new ArrayList<>();
if (method.succeeded())
{
final MultiStatusResponse[] responses =
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
Fri Jul 1 04:56:23 2016
@@ -33,7 +33,7 @@ public class ZipFileObject extends Abstr
{
/** The ZipEntry. */
protected ZipEntry entry;
- private final HashSet<String> children = new HashSet<String>();
+ private final HashSet<String> children = new HashSet<>();
// protected final ZipFile file;
private FileType type;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
Fri Jul 1 04:56:23 2016
@@ -53,7 +53,7 @@ public class ZipFileSystem extends Abstr
/**
* Cache doesn't need to be synchronized since it is read-only.
*/
- private final Map<FileName, FileObject> cache = new HashMap<FileName,
FileObject>();
+ private final Map<FileName, FileObject> cache = new HashMap<>();
public ZipFileSystem(final AbstractFileName rootName,
final FileObject parentLayer,
@@ -84,7 +84,7 @@ public class ZipFileSystem extends Abstr
try
{
// Build the index
- final List<ZipFileObject> strongRef = new
ArrayList<ZipFileObject>(getZipFile().size());
+ final List<ZipFileObject> strongRef = new
ArrayList<>(getZipFile().size());
final Enumeration<? extends ZipEntry> entries =
getZipFile().entries();
while (entries.hasMoreElements())
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
Fri Jul 1 04:56:23 2016
@@ -51,7 +51,7 @@ import org.apache.tools.ant.Project;
public abstract class AbstractSyncTask
extends VfsTask
{
- private final ArrayList<SourceInfo> srcFiles = new ArrayList<SourceInfo>();
+ private final ArrayList<SourceInfo> srcFiles = new ArrayList<>();
private String destFileUrl;
private String destDirUrl;
private String srcDirUrl;
@@ -251,7 +251,7 @@ public abstract class AbstractSyncTask
{
srcDirName = resolveFile(srcDirUrl).getName();
}
- final ArrayList<FileObject> srcs = new ArrayList<FileObject>();
+ final ArrayList<FileObject> srcs = new ArrayList<>();
for (int i = 0; i < srcFiles.size(); i++)
{
// Locate the source file, and make sure it exists
@@ -271,7 +271,7 @@ public abstract class AbstractSyncTask
}
// Scan the source files
- final Set<FileObject> destFiles = new HashSet<FileObject>();
+ final Set<FileObject> destFiles = new HashSet<>();
for (int i = 0; i < srcs.size(); i++)
{
final FileObject rootFile = srcs.get(i);
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
Fri Jul 1 04:56:23 2016
@@ -50,11 +50,11 @@ public class DelegatingFileSystemOptions
{
@SuppressWarnings("unchecked") // OK, it is a String
private static final Class<String>[] STRING_PARAM = new
Class[]{String.class};
- private static final Map<String, Class<?>> PRIMATIVE_TO_OBJECT = new
TreeMap<String, Class<?>>();
+ private static final Map<String, Class<?>> PRIMATIVE_TO_OBJECT = new
TreeMap<>();
private static final Log log =
LogFactory.getLog(DelegatingFileSystemOptionsBuilder.class);
private final FileSystemManager manager;
- private final Map<String, Map<String, List<Method>>> beanMethods = new
TreeMap<String, Map<String, List<Method>>>();
+ private final Map<String, Map<String, List<Method>>> beanMethods = new
TreeMap<>();
static
{
@@ -438,7 +438,7 @@ public class DelegatingFileSystemOptions
throw new
FileSystemException("vfs.provider/no-config-builder.error", scheme);
}
- final Map<String, List<Method>> schemeMethods = new TreeMap<String,
List<Method>>();
+ final Map<String, List<Method>> schemeMethods = new TreeMap<>();
final Method[] methods = fscb.getClass().getMethods();
for (final Method method : methods)
@@ -460,7 +460,7 @@ public class DelegatingFileSystemOptions
List<Method> configSetter = schemeMethods.get(key);
if (configSetter == null)
{
- configSetter = new ArrayList<Method>(2);
+ configSetter = new ArrayList<>(2);
schemeMethods.put(key, configSetter);
}
configSetter.add(method);
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java
Fri Jul 1 04:56:23 2016
@@ -30,7 +30,7 @@ public final class Messages
/**
* Map from message code to MessageFormat object for the message.
*/
- private static ConcurrentMap<String, MessageFormat> messageMap = new
ConcurrentHashMap<String, MessageFormat>();
+ private static ConcurrentMap<String, MessageFormat> messageMap = new
ConcurrentHashMap<>();
private static final ResourceBundle RESOURCES = new
CombinedResources("org.apache.commons.vfs2.Resources");
private Messages()
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java
Fri Jul 1 04:56:23 2016
@@ -286,10 +286,10 @@ public final class Os
private static OsFamily[] determineAllFamilies()
{
// Determine all families the current OS belongs to
- final Set<OsFamily> allFamilies = new HashSet<OsFamily>();
+ final Set<OsFamily> allFamilies = new HashSet<>();
if (OS_FAMILY != null)
{
- final List<OsFamily> queue = new ArrayList<OsFamily>();
+ final List<OsFamily> queue = new ArrayList<>();
queue.add(OS_FAMILY);
while (queue.size() > 0)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
Fri Jul 1 04:56:23 2016
@@ -242,7 +242,7 @@ public class PosixPermissions
*/
public int makeExecutable(final boolean executable, final boolean
ownerOnly)
{
- final EnumMap<Type, Boolean> map = new EnumMap<Type,
Boolean>(Type.class);
+ final EnumMap<Type, Boolean> map = new EnumMap<>(Type.class);
map.put(Type.UserExecutable, executable);
if (!ownerOnly)
{
@@ -263,7 +263,7 @@ public class PosixPermissions
*/
public Integer makeReadable(final boolean readable, final boolean
ownerOnly)
{
- final EnumMap<Type, Boolean> map = new EnumMap<Type,
Boolean>(Type.class);
+ final EnumMap<Type, Boolean> map = new EnumMap<>(Type.class);
map.put(Type.UserReadable, readable);
if (!ownerOnly)
{
@@ -284,7 +284,7 @@ public class PosixPermissions
*/
public Integer makeWritable(final boolean writable, final boolean
ownerOnly)
{
- final EnumMap<Type, Boolean> map = new EnumMap<Type,
Boolean>(Type.class);
+ final EnumMap<Type, Boolean> map = new EnumMap<>(Type.class);
map.put(Type.UserWritable, writable);
if (!ownerOnly)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
Fri Jul 1 04:56:23 2016
@@ -39,7 +39,7 @@ public class WeakRefFileListener impleme
{
this.fs = file.getFileSystem();
this.name = file.getName();
- this.listener = new WeakReference<FileListener>(listener);
+ this.listener = new WeakReference<>(listener);
}
/**
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
Fri Jul 1 04:56:23 2016
@@ -101,7 +101,7 @@ public class FileExtensionSelectorTest
final FileObject[] foArray =
BaseFolder.findFiles(Selectors.SELECT_FILES);
Assert.assertTrue(foArray.length > 0);
// gather file extensions.
- final Set<String> extensionSet = new HashSet<String>();
+ final Set<String> extensionSet = new HashSet<>();
for (final FileObject fo : foArray)
{
extensionSet.add(fo.getName().getExtension());
@@ -153,7 +153,7 @@ public class FileExtensionSelectorTest
final FileObject[] foArray =
BaseFolder.findFiles(Selectors.SELECT_FILES);
Assert.assertTrue(foArray.length > 0);
// gather file extensions.
- final Set<String> extensionSet = new HashSet<String>();
+ final Set<String> extensionSet = new HashSet<>();
for (final FileObject fo : foArray)
{
extensionSet.add(fo.getName().getExtension());
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
Fri Jul 1 04:56:23 2016
@@ -115,7 +115,7 @@ public class PatternFileSelectorTest
Assert.assertTrue(foArray.length > 0);
final String regExPrefix = ".*\\.";
// gather file extensions.
- final Set<String> extensionSet = new HashSet<String>();
+ final Set<String> extensionSet = new HashSet<>();
for (final FileObject fo : foArray)
{
extensionSet.add(regExPrefix + fo.getName().getExtension());
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
Fri Jul 1 04:56:23 2016
@@ -49,7 +49,7 @@ public class CustomRamProviderTest
{
private static final byte[] NON_EMPTY_FILE_CONTENT = new byte[]{ 1, 2, 3 };
- private final List<Closeable> closeables = new ArrayList<Closeable>();
+ private final List<Closeable> closeables = new ArrayList<>();
FileSystemOptions defaultRamFso = new FileSystemOptions();
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
Fri Jul 1 04:56:23 2016
@@ -228,7 +228,7 @@ public class SftpProviderTestCase extend
{
Server.setKeyPairProvider(new
SimpleGeneratorHostKeyProvider(tmpDir + "/key.ser"));
}
- final List<NamedFactory<Command>> list = new
ArrayList<NamedFactory<Command>>(1);
+ final List<NamedFactory<Command>> list = new ArrayList<>(1);
list.add(new NamedFactory<Command>()
{
@@ -657,7 +657,7 @@ public class SftpProviderTestCase extend
private static class MySftpSubsystem extends SftpSubsystem
{
- TreeMap<String, Integer> permissions = new TreeMap<String, Integer>();
+ TreeMap<String, Integer> permissions = new TreeMap<>();
private int _version;
@Override
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
Fri Jul 1 04:56:23 2016
@@ -340,7 +340,7 @@ public abstract class AbstractTestSuite
private Thread[] diffThreadSnapshot(final Thread[] startThreadSnapshot,
final Thread[] endThreadSnapshot)
{
- final List<Thread> diff = new ArrayList<Thread>(10);
+ final List<Thread> diff = new ArrayList<>(10);
nextEnd: for (int iterEnd = 0; iterEnd < endThreadSnapshot.length;
iterEnd++)
{
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileInfo.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileInfo.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileInfo.java
Fri Jul 1 04:56:23 2016
@@ -29,7 +29,7 @@ class FileInfo
String baseName;
FileType type;
String content;
- Map<String, FileInfo> children = new HashMap<String, FileInfo>();
+ Map<String, FileInfo> children = new HashMap<>();
FileInfo parent;
public FileInfo(final String name, final FileType type)
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -75,10 +75,10 @@ public class ProviderReadTests extends A
protected void assertSameStructure(final FileObject folder, final FileInfo
expected) throws Exception
{
// Setup the structure
- final List<FileInfo> queueExpected = new ArrayList<FileInfo>();
+ final List<FileInfo> queueExpected = new ArrayList<>();
queueExpected.add(expected);
- final List<FileObject> queueActual = new ArrayList<FileObject>();
+ final List<FileObject> queueActual = new ArrayList<>();
queueActual.add(folder);
while (queueActual.size() > 0)
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java?rev=1750873&r1=1750872&r2=1750873&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
Fri Jul 1 04:56:23 2016
@@ -526,7 +526,7 @@ public class ProviderWriteTests
public void testListChildren() throws Exception
{
final FileObject folder = createScratchFolder();
- final HashSet<String> names = new HashSet<String>();
+ final HashSet<String> names = new HashSet<>();
// Make sure the folder is empty
assertEquals(0, folder.getChildren().length);
@@ -653,7 +653,7 @@ public class ProviderWriteTests
private static class TestListener implements FileListener
{
private final FileObject file;
- private final ArrayList<Object> events = new ArrayList<Object>();
+ private final ArrayList<Object> events = new ArrayList<>();
private static final Object CREATE = "create";
private static final Object DELETE = "delete";
private static final Object CHANGED = "changed";
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=1750873&r1=1750872&r2=1750873&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
Fri Jul 1 04:56:23 2016
@@ -39,17 +39,17 @@ public class VerifyingFileSelector
implements FileSelector
{
private final FileInfo rootFile;
- private final List<FileObject> files = new ArrayList<FileObject>();
+ private final List<FileObject> files = new ArrayList<>();
private FileInfo currentFolderInfo;
private FileObject currentFolder;
private Set<String> children;
- private final List<Set<String>> stack = new ArrayList<Set<String>>();
+ private final List<Set<String>> stack = new ArrayList<>();
public VerifyingFileSelector(final FileInfo fileInfo)
{
this.rootFile = fileInfo;
- children = new HashSet<String>();
+ children = new HashSet<>();
children.add(rootFile.baseName);
}
@@ -113,7 +113,7 @@ public class VerifyingFileSelector
// Push the folder
stack.add(0, children);
- children = new HashSet<String>(currentFolderInfo.children.keySet());
+ children = new HashSet<>(currentFolderInfo.children.keySet());
currentFolder = folder;
return true;