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 2bac768 Minor changes: (#185)
2bac768 is described below
commit 2bac7687972a4feae4eb3bef5d0e701bf10cc8b5
Author: Arturo Bernal <[email protected]>
AuthorDate: Fri Jul 9 18:24:12 2021 +0200
Minor changes: (#185)
* Change C-style array declaration with Java
* Remove Unnecessary interface modifier
* Remove Unnecessary semicolon
* Replace argument with diamond type <>
---
.../src/main/java/org/apache/commons/vfs2/FileSystemOptions.java | 2 +-
.../src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java | 2 +-
.../java/org/apache/commons/vfs2/operations/FileOperationProvider.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java | 2 +-
.../src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java | 2 +-
.../src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java | 2 +-
.../org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java | 2 +-
commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java | 2 +-
.../java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java | 2 +-
.../org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java | 1 -
.../org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java | 2 +-
.../apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java | 2 +-
.../apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java | 2 +-
.../java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java | 2 +-
.../commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java | 2 +-
17 files changed, 16 insertions(+), 17 deletions(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
index b430ea9..da1f72c 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
@@ -53,7 +53,7 @@ public final class FileSystemOptions implements Cloneable {
* Creates a new instance.
*/
public FileSystemOptions() {
- this(new TreeMap<FileSystemOptionKey, Object>());
+ this(new TreeMap<>());
}
protected FileSystemOptions(final Map<FileSystemOptionKey, Object>
options) {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
index 7aece47..4da0aa4 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/DefaultFilesCache.java
@@ -85,7 +85,7 @@ public class DefaultFilesCache extends AbstractFilesCache {
ConcurrentMap<FileName, FileObject> files =
filesystemCache.get(filesystem);
// we loop to make sure we never return null even when concurrent
clean is called
while (files == null) {
- filesystemCache.putIfAbsent(filesystem, new
ConcurrentHashMap<FileName, FileObject>(200, 0.75f, 8));
+ filesystemCache.putIfAbsent(filesystem, new
ConcurrentHashMap<>(200, 0.75f, 8));
files = filesystemCache.get(filesystem);
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
index b0db835..d987a7e 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/operations/FileOperationProvider.java
@@ -33,7 +33,7 @@ public interface FileOperationProvider {
*
* @since 2.9.0
*/
- public static final FileOperationProvider[] EMPTY_ARRAY = {};
+ FileOperationProvider[] EMPTY_ARRAY = {};
/**
* Gather available operations for the specified FileObject and put them
into specified operationsList.
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
index ebe3895..59a456b 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
@@ -57,7 +57,7 @@ public final class DefaultFileContent implements FileContent {
*/
private static final int WRITE_BUFFER_SIZE = 4096;
- private final AbstractFileObject fileObject;
+ private final AbstractFileObject<?> fileObject;
private Map<String, Object> attrs;
private Map<String, Object> roAttrs;
private FileContentInfo fileContentInfo;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
index 8826860..d771d2c 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
@@ -128,7 +128,7 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
}
private static final long DEFAULT_TIMESTAMP = 0L;
private static final Map<String, FTPFile> EMPTY_FTP_FILE_MAP = Collections
- .unmodifiableMap(new TreeMap<String, FTPFile>());
+ .unmodifiableMap(new TreeMap<>());
private static final FTPFile UNKNOWN = new FTPFile();
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java
index c736f59..fccbfbd 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java
@@ -67,7 +67,7 @@ class RamFileData implements Serializable {
* @param name The file name.
*/
public RamFileData(final FileName name) {
- this.children = Collections.synchronizedCollection(new
ArrayList<RamFileData>());
+ this.children = Collections.synchronizedCollection(new ArrayList<>());
this.clear();
if (name == null) {
throw new IllegalArgumentException("name can not be null");
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 b2ec0ba..09c443b 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
@@ -55,7 +55,7 @@ public class RamFileSystem extends AbstractFileSystem
implements Serializable {
*/
protected RamFileSystem(final FileName rootName, final FileSystemOptions
fileSystemOptions) {
super(rootName, null, fileSystemOptions);
- this.cache = Collections.synchronizedMap(new HashMap<FileName,
RamFileData>());
+ this.cache = Collections.synchronizedMap(new HashMap<>());
// create root
final RamFileData rootData = new RamFileData(rootName);
rootData.setType(FileType.FOLDER);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
index c238b08..5bb5250 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
@@ -323,7 +323,7 @@ public abstract class AbstractTestSuite extends TestSetup {
tg = tg.getParent();
}
- final Thread snapshot[] = new Thread[200];
+ final Thread[] snapshot = new Thread[200];
tg.enumerate(snapshot, true);
return snapshot;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
index 3ea7e34..96e4cda 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
@@ -96,7 +96,7 @@ public class FileObjectEscapeCharacterInPathTest {
private void testToFile(FailableFunction<FileObject, File, IOException>
function) throws IOException {
for (String testFilePath : TEST_FILE_PATHS) {
try (FileSystemManager fileSystemManager = loadFileSystemManager();
- FileObject fileObject =
fileSystemManager.resolveFile(testFilePath);) {
+ FileObject fileObject =
fileSystemManager.resolveFile(testFilePath)) {
assertNotNull(fileObject);
try (final FileContent content = fileObject.getContent();
InputStream inputStream = content.getInputStream()) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
index 740de96..512bed5 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/RunTest.java
@@ -40,7 +40,7 @@ public class RunTest {
//props.setProperty("test.webdav.uri",
"webdav://vfsusr:vfs%2f%25\\te:st@" + ip + "/vfstest");
props.setProperty("test.sftp.uri", "sftp://vfsusr:vfs%2f%25\\te:st@" +
ip + "/vfstest");
- final Test tests[] = new Test[] {
+ final Test[] tests = new Test[] {
// LocalProviderTestCase.suite(),
// FtpProviderTestCase.suite(),
// UrlProviderHttpTestCase.suite(),
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
index 83625b8..29d0aea 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
@@ -86,7 +86,7 @@ public class DefaultFileSystemManagerTest {
private void testCreateFileSystem(final String path, Class<?> clazz)
throws FileSystemException {
FileSystemManager manager = VFS.getManager();
try (FileObject localFileObject = manager.resolveFile(new
File(path).getAbsolutePath());
- FileObject fileObject =
manager.createFileSystem(localFileObject);) {
+ FileObject fileObject =
manager.createFileSystem(localFileObject)) {
Assert.assertEquals(clazz, fileObject.getClass());
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
index 93114c8..d5d8dfd 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
@@ -18,7 +18,6 @@ package org.apache.commons.vfs2.provider.http;
import java.io.File;
import java.time.Duration;
-import java.util.concurrent.TimeUnit;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileNotFolderException;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
index 54ef50d..2d82cb8 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
@@ -65,7 +65,7 @@ public class Http4GetContentInfoTest extends TestCase {
// get proxy host and port from env var "https_proxy"
String proxyHost = null;
int proxyPort = -1;
- String user[] = null;
+ String[] user = null;
final String proxyUrl = System.getenv("https_proxy");
if (proxyUrl != null) {
final URL url = new URL(proxyUrl);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java
index 31ea9b5..398c1d2 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java
@@ -65,7 +65,7 @@ public class Http5GetContentInfoTestCase extends TestCase {
// get proxy host and port from env var "https_proxy"
String proxyHost = null;
int proxyPort = -1;
- String user[] = null;
+ String[] user = null;
final String proxyUrl = System.getenv("https_proxy");
if (proxyUrl != null) {
final URL url = new URL(proxyUrl);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
index 5302b11..c87e3e7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
@@ -429,7 +429,7 @@ abstract class AbstractSftpProviderTestCase extends
AbstractProviderTestConfig {
final Thread thread = new Thread((Runnable) () -> {
int code = 0;
try {
- final byte buffer[] = new byte[1024];
+ final byte[] buffer = new byte[1024];
int len;
while ((len = in.read(buffer, 0, buffer.length)) != -1) {
out.write(buffer, 0, len);
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java
index 8bceb01..d2c69c7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java
@@ -151,7 +151,7 @@ public class LargeTarTestCase {
@Override
public void run() {
- final byte ba_1k[] = new byte[(int) _1K];
+ final byte[] ba_1k = new byte[(int) _1K];
Arrays.fill(ba_1k, (byte) 'a');
try {
final TarArchiveOutputStream outTarStream =
(TarArchiveOutputStream) new ArchiveStreamFactory()
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
index 0a50e1b..df75b9d 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
@@ -73,7 +73,7 @@ public class DelegatingFileSystemOptionsBuilderTest {
assertSame("sftp.userInfo",
SftpFileSystemConfigBuilder.getInstance().getUserInfo(opts).getClass(),
TrustEveryoneUserInfo.class);
- final File identities[] =
SftpFileSystemConfigBuilder.getInstance().getIdentities(opts);
+ final File[] identities =
SftpFileSystemConfigBuilder.getInstance().getIdentities(opts);
assertNotNull("sftp.identities", identities);
assertEquals("sftp.identities size", identities.length,
identityPaths.length);
for (int iterIdentities = 0; iterIdentities < identities.length;
iterIdentities++) {