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 4ab0114 Use isEmpty().
4ab0114 is described below
commit 4ab01147c1246ce8743c6be57f4306cdc38e5d82
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jan 16 22:41:25 2021 -0500
Use isEmpty().
---
.../java/org/apache/commons/vfs2/filter/WildcardFileFilter.java | 4 ++--
.../java/org/apache/commons/vfs2/provider/DelegateFileObject.java | 6 +++---
.../org/apache/commons/vfs2/provider/FileContentThreadData.java | 2 +-
.../org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java | 2 +-
commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java | 2 +-
.../java/org/apache/commons/vfs2/FileExtensionSelectorTest.java | 2 +-
.../test/java/org/apache/commons/vfs2/test/ProviderReadTests.java | 2 +-
.../test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java | 6 +++---
8 files changed, 13 insertions(+), 13 deletions(-)
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 8c58c0d..746b008 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
@@ -237,7 +237,7 @@ public class WildcardFileFilter implements FileFilter,
Serializable {
// loop around a backtrack stack, to handle complex * matching
do {
- if (backtrack.size() > 0) {
+ if (!backtrack.isEmpty()) {
final int[] array = backtrack.pop();
wcsIdx = array[0];
textIdx = array[1];
@@ -297,7 +297,7 @@ public class WildcardFileFilter implements FileFilter,
Serializable {
return true;
}
- } while (backtrack.size() > 0);
+ } while (!backtrack.isEmpty());
return false;
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
index 2275164..efc5216 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
@@ -123,10 +123,10 @@ public class DelegateFileObject<AFS extends
AbstractFileSystem> extends Abstract
protected FileType doGetType() throws FileSystemException {
if (file != null) {
return file.getType();
- } else if (children.size() > 0) {
- return FileType.FOLDER;
- } else {
+ } else if (children.isEmpty()) {
return FileType.IMAGINARY;
+ } else {
+ return FileType.FOLDER;
}
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
index b869163..d2a6646 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
@@ -83,7 +83,7 @@ class FileContentThreadData {
}
public boolean hasStreams() {
- return inputStreamList.size() > 0 || outputStream != null ||
randomAccessContentList.size() > 0;
+ return !inputStreamList.isEmpty() || outputStream != null ||
!randomAccessContentList.isEmpty();
}
public void closeOutstr() throws FileSystemException {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
index 375cc2a..3f93654 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
@@ -152,7 +152,7 @@ public final class SftpClientFactory {
}
// set properties for the session
- if (config.size() > 0) {
+ if (!config.isEmpty()) {
session.setConfig(config);
}
session.setDaemonThread(true);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
index fa4d749..b76fb34 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
@@ -239,7 +239,7 @@ public final class Os {
if (OS_FAMILY != null) {
final List<OsFamily> queue = new ArrayList<>();
queue.add(OS_FAMILY);
- while (queue.size() > 0) {
+ while (!queue.isEmpty()) {
final OsFamily family = queue.remove(0);
allFamilies.add(family);
final OsFamily[] families = family.getFamilies();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
index b11ddd8..ec3e8a0 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
@@ -101,7 +101,7 @@ public class FileExtensionSelectorTest {
}
final String message = String.format("Extensions: %s; files: %s",
extensionSet.toString(),
Arrays.asList(foArray).toString());
- Assert.assertTrue(message, extensionSet.size() > 0);
+ Assert.assertFalse(message, extensionSet.isEmpty());
Assert.assertEquals(message, ExtensionCount, extensionSet.size());
// check all unique extensions
final FileSelector selector = new FileExtensionSelector(extensionSet);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
index 0d1fd97..2feadff 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
@@ -77,7 +77,7 @@ public class ProviderReadTests extends
AbstractProviderTestCase {
final List<FileObject> queueActual = new ArrayList<>();
queueActual.add(folder);
- while (queueActual.size() > 0) {
+ while (!queueActual.isEmpty()) {
final FileObject file = queueActual.remove(0);
final FileInfo info = queueExpected.remove(0);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
index a535a75..1ba6126 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
@@ -594,7 +594,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
*/
@Override
public void fileCreated(final FileChangeEvent event) {
- assertTrue("Unexpected create event", events.size() > 0);
+ assertFalse("Unexpected create event", events.isEmpty());
assertSame("Expecting a create event", CREATE, events.remove(0));
assertEquals(Objects.toString(file), file, event.getFileObject());
try {
@@ -609,7 +609,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
*/
@Override
public void fileDeleted(final FileChangeEvent event) {
- assertTrue("Unexpected delete event", events.size() > 0);
+ assertFalse("Unexpected delete event", events.isEmpty());
assertSame("Expecting a delete event", DELETE, events.remove(0));
assertEquals(Objects.toString(file), file, event.getFileObject());
try {
@@ -621,7 +621,7 @@ public class ProviderWriteTests extends
AbstractProviderTestCase {
@Override
public void fileChanged(final FileChangeEvent event) throws Exception {
- assertTrue("Unexpected changed event", events.size() > 0);
+ assertFalse("Unexpected changed event", events.isEmpty());
assertSame("Expecting a changed event", CHANGED, events.remove(0));
assertEquals(Objects.toString(file), file, event.getFileObject());
try {
