Use forEach()
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
index e3c01af..618d037 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
@@ -70,12 +70,7 @@
*/
@Override
public boolean includeFile(final FileSelectInfo fileInfo) throws Exception {
- for (final String extension : this.extensions) {
- if (fileInfo.getFile().getName().getExtension().equalsIgnoreCase(extension)) {
- return true;
- }
- }
- return false;
+ return extensions.stream().anyMatch(extension -> fileInfo.getFile().getName().getExtension().equalsIgnoreCase(extension));
}
/**
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 b4bae79..72aaab4 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
@@ -118,12 +118,7 @@
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) {
final String name = fileSelectInfo.getFile().getName().getBaseName();
- for (final String name2 : this.names) {
- if (caseSensitivity.checkEquals(name, name2)) {
- return true;
- }
- }
- return false;
+ return names.stream().anyMatch(name2 -> caseSensitivity.checkEquals(name, name2));
}
/**
@@ -137,12 +132,7 @@
buffer.append(super.toString());
buffer.append("(");
if (names != null) {
- for (int i = 0; i < names.size(); i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(names.get(i));
- }
+ buffer.append(String.join(",", names));
}
buffer.append(")");
return buffer.toString();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/PrefixFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/PrefixFileFilter.java
index 6ae8325..6635611 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/PrefixFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/PrefixFileFilter.java
@@ -117,12 +117,7 @@
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) {
final String name = fileSelectInfo.getFile().getName().getBaseName();
- for (final String prefix : this.prefixes) {
- if (caseSensitivity.checkStartsWith(name, prefix)) {
- return true;
- }
- }
- return false;
+ return prefixes.stream().anyMatch(prefix -> caseSensitivity.checkStartsWith(name, prefix));
}
/**
@@ -136,12 +131,7 @@
buffer.append(super.toString());
buffer.append("(");
if (prefixes != null) {
- for (int i = 0; i < prefixes.size(); i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(prefixes.get(i));
- }
+ buffer.append(String.join(",", prefixes));
}
buffer.append(")");
return buffer.toString();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SuffixFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SuffixFileFilter.java
index 449de96..40eb8cb 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SuffixFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SuffixFileFilter.java
@@ -115,12 +115,7 @@
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) {
final String name = fileSelectInfo.getFile().getName().getBaseName();
- for (final String suffix : this.suffixes) {
- if (caseSensitivity.checkEndsWith(name, suffix)) {
- return true;
- }
- }
- return false;
+ return suffixes.stream().anyMatch(suffix -> caseSensitivity.checkEndsWith(name, suffix));
}
/**
@@ -134,12 +129,7 @@
buffer.append(super.toString());
buffer.append("(");
if (suffixes != null) {
- for (int i = 0; i < suffixes.size(); i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(suffixes.get(i));
- }
+ buffer.append(String.join(",", suffixes));
}
buffer.append(")");
return buffer.toString();
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 b307210..844db3f 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
@@ -270,12 +270,7 @@
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) {
final String name = fileSelectInfo.getFile().getName().getBaseName();
- for (final String wildcard : wildcards) {
- if (wildcardMatch(name, wildcard, caseSensitivity)) {
- return true;
- }
- }
- return false;
+ return wildcards.stream().anyMatch(wildcard -> wildcardMatch(name, wildcard, caseSensitivity));
}
// CHECKSTYLE:ON
@@ -291,12 +286,7 @@
buffer.append(super.toString());
buffer.append("(");
if (wildcards != null) {
- for (int i = 0; i < wildcards.size(); i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(wildcards.get(i));
- }
+ buffer.append(String.join(",", wildcards));
}
buffer.append(")");
return buffer.toString();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
index f2f4755..211f6d2 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
@@ -20,6 +20,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
+import java.util.stream.Stream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -228,10 +229,7 @@
try {
if (this.defaultFileMonitor.isRecursive() && child.getType().hasChildren()) {
- final FileObject[] newChildren = child.getChildren();
- for (final FileObject element : newChildren) {
- fireAllCreate(element);
- }
+ Stream.of(child.getChildren()).forEach(this::fireAllCreate);
}
} catch (final FileSystemException fse) {
LOG.error(fse.getLocalizedMessage(), fse);
@@ -253,8 +251,7 @@
try {
if (this.fileObject.getType().hasChildren()) {
this.children = new HashMap<>();
- final FileObject[] childrenList = this.fileObject.getChildren();
- for (final FileObject element : childrenList) {
+ for (final FileObject element : this.fileObject.getChildren()) {
this.children.put(element.getName(), new Object()); // null?
}
}
@@ -343,10 +340,8 @@
if (file.getType().hasChildren() && this.recursive) {
// Traverse the children
- final FileObject[] children = file.getChildren();
- for (final FileObject element : children) {
- this.addFile(element); // Add depth first
- }
+ // Add depth first
+ Stream.of(file.getChildren()).forEach(this::addFile);
}
} catch (final FileSystemException fse) {
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 f69afd3..800588c 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
@@ -489,11 +489,11 @@
}
// Close the providers.
- for (final FileProvider fileProvider : providers.values()) {
+ providers.values().forEach(fileProvider -> {
if (fileProvider instanceof AbstractFileProvider) {
((AbstractFileProvider) fileProvider).freeUnusedResources();
}
- }
+ });
// vfsProvider does not need to free resources
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
index ab7ab87..a6c79ce 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
@@ -134,8 +134,7 @@
*/
protected void copyPermissions(final PermissionCollection src, final PermissionCollection dest) {
for (final Enumeration<Permission> elem = src.elements(); elem.hasMoreElements();) {
- final Permission permission = elem.nextElement();
- dest.add(permission);
+ dest.add(elem.nextElement());
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
index 59e2afe..28b3f69 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
@@ -159,16 +159,8 @@
// The name points to the junction point directly
return name;
}
-
// Find matching junction
- for (final FileName junctionPoint : junctions.keySet()) {
- if (junctionPoint.isDescendent(name)) {
- return junctionPoint;
- }
- }
-
- // None
- return null;
+ return junctions.keySet().stream().filter(fileName -> fileName.isDescendent(name)).findFirst().orElse(null);
}
/**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
index 0435856..3dac100 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
@@ -20,7 +20,6 @@
import java.security.cert.Certificate;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -62,11 +61,7 @@
* Adds the source attributes to the destination map.
*/
private void addAll(final Attributes src, final Map<String, Object> dest) {
- for (final Entry<Object, Object> entry : src.entrySet()) {
- // final String name = entry.getKey().toString().toLowerCase();
- final String name = entry.getKey().toString();
- dest.put(name, entry.getValue());
- }
+ src.forEach((k, v) -> dest.put(String.valueOf(k), v));
}
/**
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
index fa3859b..47e533c 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
@@ -209,13 +209,9 @@
* @return Returns the size of the FileSystem
*/
long size() {
- long size = 0;
synchronized (cache) {
- for (final RamFileData data : cache.values()) {
- size += data.size();
- }
+ return cache.values().stream().mapToLong(RamFileData::size).sum();
}
- return size;
}
/**
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java
index 203c4a1..a7e63a0 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.filter;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
@@ -165,6 +166,7 @@
// TEST
testee.setFileFilters(list);
+ assertNotNull(testee.toString());
// VERIFY
assertContainsOnly(testee.getFileFilters(), filter1, filter2, filter3);
