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/10/06 18:46:42 UTC
[commons-vfs] branch master updated: Use Java 7 and 8 APIs
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 fc1974fb Use Java 7 and 8 APIs
fc1974fb is described below
commit fc1974fb9cb17142bb9414ccc3e8635d88e6fb35
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Oct 6 14:46:37 2022 -0400
Use Java 7 and 8 APIs
---
.../main/java/org/apache/commons/vfs2/filter/AndFileFilter.java | 4 ++--
.../main/java/org/apache/commons/vfs2/filter/OrFileFilter.java | 4 ++--
.../src/main/java/org/apache/commons/vfs2/provider/UriParser.java | 4 +---
.../commons/vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java | 8 +++++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AndFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AndFileFilter.java
index 2b1a2d68..43a77725 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AndFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AndFileFilter.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.vfs2.FileFilter;
@@ -131,8 +132,7 @@ public class AndFileFilter implements FileFilter, ConditionalFileFilter, Seriali
if (i > 0) {
buffer.append(",");
}
- final Object filter = fileFilters.get(i);
- buffer.append(filter == null ? "null" : filter.toString());
+ buffer.append(Objects.toString(fileFilters.get(i)));
}
}
buffer.append(")");
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/OrFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/OrFileFilter.java
index 227b899e..b77b2dbc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/OrFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/OrFileFilter.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileSelectInfo;
@@ -127,8 +128,7 @@ public class OrFileFilter implements FileFilter, ConditionalFileFilter, Serializ
if (i > 0) {
buffer.append(",");
}
- final Object filter = fileFilters.get(i);
- buffer.append(filter == null ? "null" : filter.toString());
+ buffer.append(Objects.toString(fileFilters.get(i)));
}
}
buffer.append(")");
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
index 484b9334..3fcc9aeb 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
@@ -225,9 +225,7 @@ public final class UriParser {
if (strings == null) {
return null;
}
- for (int i = 0; i < strings.length; i++) {
- strings[i] = encode(strings[i]);
- }
+ Arrays.setAll(strings, i -> encode(strings[i]));
return strings;
}
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 f4a2dc63..d9f07de8 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
@@ -19,6 +19,7 @@ package org.apache.commons.vfs2.provider.hdfs;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Arrays;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
@@ -124,14 +125,15 @@ public final class HdfsFileSystemConfigBuilder extends FileSystemConfigBuilder {
}
final String[] urls = urlNames.split(",");
final URL[] realURLs = new URL[urls.length];
- for (int i = 0; i < urls.length; i++) {
+ Arrays.setAll(realURLs, i -> {
try {
- realURLs[i] = new URL(urls[i]);
+ return new URL(urls[i]);
} catch (MalformedURLException e) {
// This should never happen because we save it in the proper form.
throw new IllegalArgumentException(urls[i], e);
}
- }
+
+ });
return realURLs;
}