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 9e714a2 Relocate new constants. Create new constants.
9e714a2 is described below
commit 9e714a2ec289e918b6ea417b4fc51f40682e0789
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Mar 2 10:27:50 2021 -0500
Relocate new constants. Create new constants.
---
.../src/main/java/org/apache/commons/vfs2/example/Shell.java | 3 ++-
commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java | 7 +++++++
.../src/main/java/org/apache/commons/vfs2/FileObject.java | 7 +++++++
.../main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java | 2 +-
.../java/org/apache/commons/vfs2/provider/AbstractFileObject.java | 8 +++-----
.../org/apache/commons/vfs2/provider/sftp/SftpFileObject.java | 2 +-
.../main/java/org/apache/commons/vfs2/util/FileObjectUtils.java | 7 -------
.../src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java | 3 ++-
8 files changed, 23 insertions(+), 16 deletions(-)
diff --git
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
index 01cd4ca..3a5c0c8 100644
---
a/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
+++
b/commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/example/Shell.java
@@ -49,6 +49,7 @@ import org.apache.commons.vfs2.util.FileObjectUtils;
*/
public final class Shell {
+ private static final String[] EMPTY_STRING_ARRAY = new String[0];
private final FileSystemManager mgr;
private FileObject cwd;
private final BufferedReader reader;
@@ -357,7 +358,7 @@ public final class Shell {
while (tokens.hasMoreTokens()) {
cmd.add(tokens.nextToken());
}
- return cmd.toArray(new String[0]);
+ return cmd.toArray(EMPTY_STRING_ARRAY);
}
private static String getVersion(final Class<?> cls) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
index b8933a8..ec34a49 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileName.java
@@ -39,6 +39,13 @@ public interface FileName extends Comparable<FileName> {
String ROOT_PATH = "/";
/**
+ * Empty array of FileName.
+ *
+ * @since 2.9.0
+ */
+ FileName[] EMPTY_ARRAY = new FileName[0];
+
+ /**
* Returns the base name of this file. The base name is the last element
of the file name. For example the base name
* of {@code /somefolder/somefile} is {@code somefile}.
* <p>
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
index e09d327..437fabd 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
@@ -96,6 +96,13 @@ import org.apache.commons.vfs2.operations.FileOperations;
public interface FileObject extends Comparable<FileObject>,
Iterable<FileObject>, Closeable {
/**
+ * An empty immutable {@code FileObject} array.
+ *
+ * @since 2.9.0
+ */
+ FileObject[] EMPTY_ARRAY = new FileObject[0];
+
+ /**
* Queries the file if it is possible to rename it to newfile.
*
* @param newfile the new file(-name)
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 5103599..879e32d 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
@@ -109,7 +109,7 @@ public class VFSClassLoader extends SecureClassLoader {
* @since 2.0
*/
public FileObject[] getFileObjects() {
- return resources.toArray(FileObjectUtils.EMPTY_ARRAY);
+ return resources.toArray(FileObject.EMPTY_ARRAY);
}
/**
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 43e9f96..1a6f710 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
@@ -66,8 +66,6 @@ import org.apache.commons.vfs2.util.RandomAccessMode;
*/
public abstract class AbstractFileObject<AFS extends AbstractFileSystem>
implements FileObject {
- private static final FileName[] EMPTY_FILE_NAME_ARRAY = new FileName[0];
-
private static final String DO_GET_INPUT_STREAM_INT =
"doGetInputStream(int)";
/**
@@ -205,7 +203,7 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
} else {
list.add(childName);
}
- children = list.toArray(EMPTY_FILE_NAME_ARRAY);
+ children = list.toArray(FileName.EMPTY_ARRAY);
}
// removeChildrenCache();
@@ -990,7 +988,7 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
@Override
public FileObject[] findFiles(final FileSelector selector) throws
FileSystemException {
final List<FileObject> list = this.listFiles(selector);
- return list == null ? null : list.toArray(FileObjectUtils.EMPTY_ARRAY);
+ return list == null ? null : list.toArray(FileObject.EMPTY_ARRAY);
}
/**
@@ -1108,7 +1106,7 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
throw new FileNotFolderException(fileName);
} else if (files.length == 0) {
// No children
- children = EMPTY_FILE_NAME_ARRAY;
+ children = FileName.EMPTY_ARRAY;
} else {
// Create file objects for the children
final FileName[] cache = new FileName[files.length];
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
index 50ef2ed..f4b4129 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
@@ -378,7 +378,7 @@ public class SftpFileObject extends
AbstractFileObject<SftpFileSystem> {
children.add(fo);
}
- return children.toArray(FileObjectUtils.EMPTY_ARRAY);
+ return children.toArray(FileObject.EMPTY_ARRAY);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
index 3b9be65..aa45498 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
@@ -34,13 +34,6 @@ import org.apache.commons.vfs2.provider.AbstractFileObject;
public final class FileObjectUtils {
/**
- * An empty immutable {@code FileObject} array.
- *
- * @since 2.9.0
- */
- public static final FileObject[] EMPTY_ARRAY = new FileObject[0];
-
- /**
* Null-safe call to {@link FileObject#exists()}.
*
* @param fileObject the file object to test, may be null.
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 42f0f94..23e4d1c 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
@@ -45,6 +45,7 @@ import junit.framework.TestSuite;
*/
public abstract class AbstractTestSuite extends TestSetup {
+ private static final Thread[] EMPTY_THREAD_ARRAY = new Thread[0];
public static final String WRITE_TESTS_FOLDER = "write-tests";
public static final String READ_TESTS_FOLDER = "read-tests";
@@ -313,7 +314,7 @@ public abstract class AbstractTestSuite extends TestSetup {
diff.add(element);
}
- return diff.toArray(new Thread[0]);
+ return diff.toArray(EMPTY_THREAD_ARRAY);
}
private Thread[] createThreadSnapshot() {
