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 0e65f73 Stream.of() factory method to make it obvious we are
streaming.
0e65f73 is described below
commit 0e65f7332251163a4bafc63db3ccf3e2e1f1e6b0
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jul 1 15:02:35 2021 -0400
Stream.of() factory method to make it obvious we are streaming.
---
.../org/apache/commons/vfs2/provider/AbstractFileObject.java | 3 ++-
.../org/apache/commons/vfs2/provider/AbstractFileProvider.java | 6 +++---
.../org/apache/commons/vfs2/provider/AbstractVfsContainer.java | 6 +++---
.../apache/commons/vfs2/provider/CompositeFileProvider.java | 4 ++--
.../org/apache/commons/vfs2/provider/DelegateFileObject.java | 4 ++--
.../org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java | 4 ++--
.../vfs2/provider/hdfs/HdfsFileSystemConfigBuilder.java | 4 ++--
.../apache/commons/vfs2/provider/http4/Http4FileProvider.java | 3 ++-
.../apache/commons/vfs2/provider/http5/Http5FileProvider.java | 5 +++--
.../vfs2/provider/sftp/SftpFileSystemConfigBuilder.java | 10 +++++-----
10 files changed, 26 insertions(+), 23 deletions(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
index 23cae97..f960bec 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -32,6 +32,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.stream.Stream;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileContent;
@@ -968,7 +969,7 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
if (objects == null) {
return null;
}
- return
Arrays.stream(objects).map(FileObject::getName).toArray(FileName[]::new);
+ return
Stream.of(objects).map(FileObject::getName).toArray(FileName[]::new);
}
@Override
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
index 36b620a..59dc332 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileProvider.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.vfs2.provider;
-import java.util.Arrays;
import java.util.Map;
import java.util.TreeMap;
+import java.util.stream.Stream;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileObject;
@@ -140,8 +140,8 @@ public abstract class AbstractFileProvider extends
AbstractVfsContainer implemen
}
// process snapshot outside lock
-
Arrays.stream(abstractFileSystems).filter(AbstractFileSystem::isReleaseable)
-
.forEach(AbstractFileSystem::closeCommunicationLink);
+
Stream.of(abstractFileSystems).filter(AbstractFileSystem::isReleaseable)
+
.forEach(AbstractFileSystem::closeCommunicationLink);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java
index dc12eb8..3c8573f 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractVfsContainer.java
@@ -17,7 +17,7 @@
package org.apache.commons.vfs2.provider;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.stream.Stream;
import org.apache.commons.vfs2.FileSystemException;
@@ -82,7 +82,7 @@ public abstract class AbstractVfsContainer extends
AbstractVfsComponent {
}
// Close all components
- Arrays.stream(toclose).filter(component -> component instanceof
VfsComponent)
- .forEach(component -> ((VfsComponent)
component).close());
+ Stream.of(toclose).filter(component -> component instanceof
VfsComponent)
+ .forEach(component -> ((VfsComponent)
component).close());
}
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
index c960aef..58fbebb 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.vfs2.provider;
-import java.util.Arrays;
+import java.util.stream.Stream;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
@@ -54,7 +54,7 @@ public abstract class CompositeFileProvider extends
AbstractFileProvider {
final StringBuilder buf = new StringBuilder(INITIAL_BUFSZ);
UriParser.extractScheme(getContext().getFileSystemManager().getSchemes(), uri,
buf);
- Arrays.stream(getSchemes()).forEach(scheme -> buf.insert(0, scheme +
":"));
+ Stream.of(getSchemes()).forEach(scheme -> buf.insert(0, scheme + ":"));
return getContext().getFileSystemManager().resolveFile(buf.toString(),
fileSystemOptions);
}
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 a5fb43c..9996554 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
@@ -19,10 +19,10 @@ package org.apache.commons.vfs2.provider;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.cert.Certificate;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Stream;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.vfs2.FileChangeEvent;
@@ -190,7 +190,7 @@ public class DelegateFileObject<AFS extends
AbstractFileSystem> extends Abstract
throw new FileNotFolderException(getName(), e);
}
- return Arrays.stream(children).map(child ->
child.getName().getBaseName()).toArray(String[]::new);
+ return Stream.of(children).map(child ->
child.getName().getBaseName()).toArray(String[]::new);
}
return children.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
index 2d1caa9..f40dff2 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileObject.java
@@ -20,9 +20,9 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import java.util.stream.Stream;
import org.apache.commons.vfs2.FileNotFolderException;
import org.apache.commons.vfs2.FileObject;
@@ -236,7 +236,7 @@ public class HdfsFileObject extends
AbstractFileObject<HdfsFileSystem> {
}
final FileStatus[] fileStatuses = this.hdfs.listStatus(this.path);
- return Arrays.stream(fileStatuses).map(status ->
status.getPath().getName()).toArray(String[]::new);
+ return Stream.of(fileStatuses).map(status ->
status.getPath().getName()).toArray(String[]::new);
}
/**
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 9786c35..b6ebe7c 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,7 +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;
import org.apache.commons.vfs2.FileSystem;
@@ -107,7 +107,7 @@ public final class HdfsFileSystemConfigBuilder extends
FileSystemConfigBuilder {
if (StringUtils.isEmpty(pathNames)) {
return null;
}
- return
Arrays.stream(pathNames.split(",")).map(Path::new).toArray(Path[]::new);
+ return
Stream.of(pathNames.split(",")).map(Path::new).toArray(Path[]::new);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
index ae01daa..99d7d1b 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Stream;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -138,7 +139,7 @@ public class Http4FileProvider extends
AbstractOriginatingFileProvider {
final Cookie[] cookies = builder.getCookies(fileSystemOptions);
if (cookies != null) {
- Arrays.stream(cookies).forEach(cookieStore::addCookie);
+ Stream.of(cookies).forEach(cookieStore::addCookie);
}
return cookieStore;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
index 37a41f6..2c86c2a 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Stream;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -125,7 +126,7 @@ public class Http5FileProvider extends
AbstractOriginatingFileProvider {
final String[] tlsVersions =
builder.getTlsVersions(fileSystemOptions).split("\\s*,\\s*");
- final TLS[] tlsArray =
Arrays.stream(tlsVersions).map(TLS::valueOf).toArray(TLS[]::new);
+ final TLS[] tlsArray =
Stream.of(tlsVersions).map(TLS::valueOf).toArray(TLS[]::new);
final SSLConnectionSocketFactory sslSocketFactory =
SSLConnectionSocketFactoryBuilder.create()
.setSslContext(createSSLContext(builder, fileSystemOptions))
@@ -147,7 +148,7 @@ public class Http5FileProvider extends
AbstractOriginatingFileProvider {
final Cookie[] cookies = builder.getCookies(fileSystemOptions);
if (cookies != null) {
- Arrays.stream(cookies).forEach(cookieStore::addCookie);
+ Stream.of(cookies).forEach(cookieStore::addCookie);
}
return cookieStore;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
index 312cbb7..d2a57a2 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
@@ -19,8 +19,8 @@ package org.apache.commons.vfs2.provider.sftp;
import java.io.File;
import java.io.Serializable;
import java.time.Duration;
-import java.util.Arrays;
import java.util.Objects;
+import java.util.stream.Stream;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemConfigBuilder;
@@ -216,7 +216,7 @@ public final class SftpFileSystemConfigBuilder extends
FileSystemConfigBuilder {
public File[] getIdentities(final FileSystemOptions options) {
final IdentityInfo[] info = getIdentityInfo(options);
if (info != null) {
- return
Arrays.stream(info).map(IdentityInfo::getPrivateKey).toArray(File[]::new);
+ return
Stream.of(info).map(IdentityInfo::getPrivateKey).toArray(File[]::new);
}
return null;
}
@@ -231,8 +231,8 @@ public final class SftpFileSystemConfigBuilder extends
FileSystemConfigBuilder {
public IdentityInfo[] getIdentityInfo(final FileSystemOptions options) {
final IdentityProvider[] infos = getIdentityProvider(options);
if (infos != null) {
- return Arrays.stream(infos).filter(info -> info instanceof
IdentityInfo)
- .map(info -> (IdentityInfo)
info).toArray(IdentityInfo[]::new);
+ return Stream.of(infos).filter(info -> info instanceof
IdentityInfo)
+ .map(info -> (IdentityInfo)
info).toArray(IdentityInfo[]::new);
}
return null;
}
@@ -561,7 +561,7 @@ public final class SftpFileSystemConfigBuilder extends
FileSystemConfigBuilder {
public void setIdentities(final FileSystemOptions options, final File...
identityFiles) throws FileSystemException {
IdentityProvider[] info = null;
if (identityFiles != null) {
- info =
Arrays.stream(identityFiles).map(IdentityInfo::new).toArray(IdentityProvider[]::new);
+ info =
Stream.of(identityFiles).map(IdentityInfo::new).toArray(IdentityProvider[]::new);
}
this.setParam(options, IDENTITIES, info);
}
