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 88c84dc Simplify conditions and avoid extra checks (#187)
88c84dc is described below
commit 88c84dcdc3f5e5bcfaf50cf5116c1a7952d8700d
Author: Arturo Bernal <[email protected]>
AuthorDate: Fri Jul 16 21:54:11 2021 +0200
Simplify conditions and avoid extra checks (#187)
---
.../main/java/org/apache/commons/vfs2/example/Shell.java | 2 +-
.../commons/vfs2/provider/webdav/ExceptionConverter.java | 14 ++++++--------
.../commons/vfs2/provider/webdav/WebdavFileObject.java | 2 +-
.../commons/vfs2/provider/webdav4/ExceptionConverter.java | 14 ++++++--------
.../commons/vfs2/provider/webdav4/Webdav4FileObject.java | 2 +-
.../java/org/apache/commons/vfs2/tasks/DeleteTask.java | 2 +-
6 files changed, 16 insertions(+), 20 deletions(-)
diff --git
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
index 9283cf5..eda480b 100644
---
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
+++
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
@@ -336,7 +336,7 @@ public final class Shell {
if (child.getType() == FileType.FOLDER) {
System.out.println("/");
if (recursive) {
- listChildren(child, recursive, prefix + " ");
+ listChildren(child, true, prefix + " ");
}
} else {
System.out.println();
diff --git
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
index c760409..aeef0ce 100644
---
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
+++
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
@@ -54,14 +54,12 @@ public final class ExceptionConverter {
if (DomUtil.hasChildElement(exc, "class", null)) {
final Class<?> cl =
Class.forName(DomUtil.getChildText(exc, "class", null));
final Constructor<?> excConstr =
cl.getConstructor(String.class);
- if (excConstr != null) {
- final Object o = excConstr.newInstance(msg);
- if (o instanceof FileSystemException) {
- return (FileSystemException) o;
- }
- if (o instanceof Exception) {
- return new FileSystemException(msg,
(Exception) o);
- }
+ final Object o = excConstr.newInstance(msg);
+ if (o instanceof FileSystemException) {
+ return (FileSystemException) o;
+ }
+ if (o instanceof Exception) {
+ return new FileSystemException(msg, (Exception) o);
}
}
}
diff --git
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
index 0505c69..0783f7c 100644
---
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
+++
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
@@ -393,7 +393,7 @@ public class WebdavFileObject extends
HttpFileObject<WebdavFileSystem> {
continue;
}
final String resourceName =
resourceName(response.getHref());
- if (resourceName != null && !resourceName.isEmpty()) {
+ if (!resourceName.isEmpty()) {
final WebdavFileObject fo = (WebdavFileObject)
FileObjectUtils.getAbstractFileObject(
getFileSystem().resolveFile(getFileSystem().getFileSystemManager()
.resolveName(getName(),
resourceName, NameScope.CHILD)));
diff --git
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
index 707bdf9..fef9f2a 100644
---
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
+++
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
@@ -48,14 +48,12 @@ public final class ExceptionConverter {
if (DomUtil.hasChildElement(exc, "class", null)) {
final Class<?> cl =
Class.forName(DomUtil.getChildText(exc, "class", null));
final Constructor<?> excConstr =
cl.getConstructor(String.class);
- if (excConstr != null) {
- final Object o = excConstr.newInstance(msg);
- if (o instanceof FileSystemException) {
- return (FileSystemException) o;
- }
- if (o instanceof Exception) {
- return new FileSystemException(msg,
(Exception) o);
- }
+ final Object o = excConstr.newInstance(msg);
+ if (o instanceof FileSystemException) {
+ return (FileSystemException) o;
+ }
+ if (o instanceof Exception) {
+ return new FileSystemException(msg, (Exception) o);
}
}
}
diff --git
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
index d0db899..3d29fa1 100644
---
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
+++
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObject.java
@@ -391,7 +391,7 @@ public class Webdav4FileObject extends
Http4FileObject<Webdav4FileSystem> {
continue;
}
final String resourceName =
resourceName(response.getHref());
- if (resourceName != null && !resourceName.isEmpty()) {
+ if (!resourceName.isEmpty()) {
final Webdav4FileObject fo = (Webdav4FileObject)
FileObjectUtils.getAbstractFileObject(
getFileSystem().resolveFile(getFileSystem().getFileSystemManager()
.resolveName(getName(),
resourceName, NameScope.CHILD)));
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
index 2928201..5f09109 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
@@ -73,7 +73,7 @@ public class DeleteTask extends VfsTask {
}
try {
- if (srcDirUrl != null && filesList != null) {
+ if (srcDirUrl != null) {
log("Deleting " + filesList + " in the directory " +
srcDirUrl);
if (!srcDirUrl.endsWith("/")) {
srcDirUrl += "/";
