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 2022/04/20 23:06:15 UTC
[commons-vfs] branch master updated: Simplify/remove redundant operations. (#258)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 066e5d24 Simplify/remove redundant operations. (#258)
066e5d24 is described below
commit 066e5d24a58668d50118d5d335826e87bdcaf01e
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Apr 21 01:06:10 2022 +0200
Simplify/remove redundant operations. (#258)
---
.../src/main/java/org/apache/commons/vfs2/libcheck/FtpCheck.java | 2 +-
.../main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java | 2 +-
.../src/main/java/org/apache/commons/vfs2/FileSystemException.java | 2 +-
.../src/main/java/org/apache/commons/vfs2/filter/NameFileFilter.java | 4 ++--
.../src/main/java/org/apache/commons/vfs2/filter/NotFileFilter.java | 2 +-
.../main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java | 4 ++--
.../java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java | 4 ++--
.../java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/FtpCheck.java b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/FtpCheck.java
index 4b788fac..3ca57509 100644
--- a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/FtpCheck.java
+++ b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/FtpCheck.java
@@ -81,7 +81,7 @@ public final class FtpCheck {
System.err.println("#" + i + ": " + null);
} else {
System.err.println("#" + i + ": " + file.getRawListing());
- System.err.println("#" + i + ": " + file.toString());
+ System.err.println("#" + i + ": " + file);
System.err.println("\t name:" + file.getName() + " type:" + file.getType());
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
index d448c398..4bc793ad 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemConfigBuilder.java
@@ -325,7 +325,7 @@ public abstract class FileSystemConfigBuilder {
*/
protected <E extends Enum<E>> E getEnum(final Class<E> enumClass, final FileSystemOptions fileSystemOptions,
final String name) {
- return this.<E>getEnum(enumClass, fileSystemOptions, name, null);
+ return this.getEnum(enumClass, fileSystemOptions, name, null);
}
/**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemException.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemException.java
index 2c624215..6a734595 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemException.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemException.java
@@ -81,7 +81,7 @@ public class FileSystemException extends IOException {
* @param cause the cause.
*/
public FileSystemException(final String code, final Object info, final Throwable cause) {
- this(code, cause, new Object[] {info});
+ this(code, cause, info);
}
/**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NameFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NameFileFilter.java
index e50d9fed..e86a5753 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NameFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NameFileFilter.java
@@ -92,7 +92,7 @@ public class NameFileFilter implements FileFilter, Serializable {
* @param names the names to allow, must not be null
*/
public NameFileFilter(final List<String> names) {
- this((IOCase) null, names);
+ this(null, names);
}
/**
@@ -105,7 +105,7 @@ public class NameFileFilter implements FileFilter, Serializable {
* @param names the names to allow, must not be null
*/
public NameFileFilter(final String... names) {
- this((IOCase) null, names);
+ this(null, names);
}
/**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NotFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NotFileFilter.java
index 15a8c74c..2ca9bfdc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NotFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/NotFileFilter.java
@@ -69,7 +69,7 @@ public class NotFileFilter implements FileFilter, Serializable {
*/
@Override
public String toString() {
- return super.toString() + "(" + filter.toString() + ")";
+ return super.toString() + "(" + filter + ")";
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java
index 515ca133..65690bb7 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/WildcardFileFilter.java
@@ -105,7 +105,7 @@ public class WildcardFileFilter implements FileFilter, Serializable {
* @param wildcards the list of wildcards to match, not null
*/
public WildcardFileFilter(final List<String> wildcards) {
- this((IOCase) null, wildcards);
+ this(null, wildcards);
}
/**
@@ -117,7 +117,7 @@ public class WildcardFileFilter implements FileFilter, Serializable {
* @param wildcards the array of wildcards to match
*/
public WildcardFileFilter(final String... wildcards) {
- this((IOCase) null, wildcards);
+ this(null, wildcards);
}
/**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
index 613a5d0c..b5036d22 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
@@ -366,7 +366,7 @@ public class DefaultFileSystemManager implements FileSystemManager {
// should not happen, but make debugging easier:
if (!components.isEmpty()) {
- log.warn("DefaultFilesystemManager.close: not all components are closed: " + components.toString());
+ log.warn("DefaultFilesystemManager.close: not all components are closed: " + components);
}
components.clear();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
index b0fb6bbc..f4a2dc63 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java
@@ -237,7 +237,7 @@ public final class HdfsFileSystemConfigBuilder extends FileSystemConfigBuilder {
if (StringUtils.isEmpty(previousPathNames)) {
this.setParam(opts, KEY_CONFIG_PATHS, path.toString());
} else {
- this.setParam(opts, KEY_CONFIG_PATHS, previousPathNames + "," + path.toString());
+ this.setParam(opts, KEY_CONFIG_PATHS, previousPathNames + "," + path);
}
}
}
@@ -267,7 +267,7 @@ public final class HdfsFileSystemConfigBuilder extends FileSystemConfigBuilder {
if (StringUtils.isEmpty(previousURLNames)) {
this.setParam(opts, KEY_CONFIG_URLS, url.toString());
} else {
- this.setParam(opts, KEY_CONFIG_URLS, previousURLNames + "," + url.toString());
+ this.setParam(opts, KEY_CONFIG_URLS, previousURLNames + "," + url);
}
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java
index b0e66914..1c54ea51 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java
@@ -61,7 +61,7 @@ public class UrlFileProvider extends AbstractFileProvider {
try {
final URI uri = URI.create(fileUri);
final URI rootUri = uri.resolve("/");
- final String key = this.getClass().getName() + rootUri.toString();
+ final String key = this.getClass().getName() + rootUri;
FileSystem fs = findFileSystem(key, fileSystemOptions);
if (fs == null) {
final String extForm = rootUri.toString();