Javadoc; better param names; inline local var; user ternary expression;
120 line max.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
index f76646d..6fabea9 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
@@ -64,7 +64,6 @@
synchronized (fileSystems) {
fileSystems.clear();
}
-
super.close();
}
@@ -73,13 +72,13 @@
*
* @param scheme The protocol to use to access the file.
* @param file a FileObject.
- * @param properties Options to the file system.
+ * @param fileSystemOptions Options to the file system.
* @return A FileObject associated with the new FileSystem.
* @throws FileSystemException if an error occurs.
*/
@Override
- public FileObject createFileSystem(final String scheme, final FileObject file, final FileSystemOptions properties)
- throws FileSystemException {
+ public FileObject createFileSystem(final String scheme, final FileObject file,
+ final FileSystemOptions fileSystemOptions) throws FileSystemException {
// Can't create a layered file system
throw new FileSystemException("vfs.provider/not-layered-fs.error", scheme);
}
@@ -110,11 +109,11 @@
* Locates a cached file system.
*
* @param key The root file of the file system, part of the cache key.
- * @param fileSystemProps file system options the file system instance must have.
+ * @param fileSystemOptions file system options the file system instance must have.
* @return The file system instance, or null if it is not cached.
*/
- protected FileSystem findFileSystem(final Comparable<?> key, final FileSystemOptions fileSystemProps) {
- final FileSystemKey treeKey = new FileSystemKey(key, fileSystemProps);
+ protected FileSystem findFileSystem(final Comparable<?> key, final FileSystemOptions fileSystemOptions) {
+ final FileSystemKey treeKey = new FileSystemKey(key, fileSystemOptions);
synchronized (fileSystems) {
return fileSystems.get(treeKey);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
index 50425e5..e40350d 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
@@ -57,7 +57,6 @@
UriParser.extractScheme(getContext().getFileSystemManager().getSchemes(), uri, buf);
Arrays.stream(getSchemes()).forEach(scheme -> buf.insert(0, scheme + ":"));
- final FileObject fo = getContext().getFileSystemManager().resolveFile(buf.toString(), fileSystemOptions);
- return fo;
+ return getContext().getFileSystemManager().resolveFile(buf.toString(), fileSystemOptions);
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java
index 063aacf..b2904d4 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java
@@ -19,28 +19,26 @@
import org.apache.commons.vfs2.FileSystemOptions;
/**
- * Used to identify a file system
+ * Identifies a file system.
*/
class FileSystemKey implements Comparable<FileSystemKey> {
private static final FileSystemOptions EMPTY_OPTIONS = new FileSystemOptions();
private final Comparable<?> key;
+
+ /** Never null as the ctor sets it to EMPTY_OPTIONS if input is null. */
private final FileSystemOptions fileSystemOptions;
/**
- * Create the FS key.
+ * Creates the FS key.
*
- * @param key must implement Comparable, and must be self-comparable
- * @param fileSystemOptions the required options
+ * @param key must implement Comparable, and must be self-comparable.
+ * @param fileSystemOptions the required options, may be null.
*/
FileSystemKey(final Comparable<?> key, final FileSystemOptions fileSystemOptions) {
this.key = key;
- if (fileSystemOptions != null) {
- this.fileSystemOptions = fileSystemOptions;
- } else {
- this.fileSystemOptions = EMPTY_OPTIONS;
- }
+ this.fileSystemOptions = fileSystemOptions != null ? fileSystemOptions : EMPTY_OPTIONS;
}
@Override
