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 2021/11/27 03:27:19 UTC
[commons-vfs] branch master updated (716ed8e -> 4d7756e)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git.
from 716ed8e Bump net.sourceforge.pmd:pmd-* 6.37.0 -> 6.40.0.
new c3570c8 Fix PMD issue: Remove use of implied final in try-with-resources.
new 0817f0e Fix PMD UselessParentheses.
new d8c3c0d Fix PMD UnusedLocalVariable.
new e551432 Fix PMD UnusedPrivateField.
new e496120 Fix PMD EmptyCatchBlock.
new 5e73763 Fix PMD and unlikely but possible NPE and throw appropriate exception instead.
new af7e1dd Fix PMD AvoidBranchingStatementAsLastInLoop & EmptyCatchBlock.
new 4d7756e Enabled PMD check in Maven default goal.
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/commons/vfs2/FileContent.java | 2 +-
.../apache/commons/vfs2/filter/AgeFileFilter.java | 2 +-
.../commons/vfs2/filter/CanWriteFileFilter.java | 2 +-
.../commons/vfs2/filter/EmptyFileFilter.java | 4 +-
.../apache/commons/vfs2/filter/SizeFileFilter.java | 4 +-
.../vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../apache/commons/vfs2/impl/VFSClassLoader.java | 4 +-
.../commons/vfs2/provider/AbstractFileName.java | 3 +-
.../commons/vfs2/provider/AbstractFileObject.java | 1 -
.../vfs2/provider/AbstractRandomAccessContent.java | 4 +-
.../apache/commons/vfs2/provider/UriParser.java | 22 +++++----
.../vfs2/provider/ftp/FtpClientFactory.java | 2 +-
.../provider/hdfs/HdfsFileSystemConfigBuilder.java | 24 +++++-----
.../provider/http/HttpFileContentInfoFactory.java | 2 +-
.../http4/Http4FileContentInfoFactory.java | 2 +-
.../http5/Http5FileContentInfoFactory.java | 2 +-
.../provider/ram/RamFileRandomAccessContent.java | 9 ++--
.../commons/vfs2/provider/ram/RamFileSystem.java | 2 +-
.../vfs2/provider/res/ResourceFileProvider.java | 2 -
.../commons/vfs2/provider/sftp/SftpFileObject.java | 52 +++++++++-------------
.../commons/vfs2/provider/sftp/SftpFileSystem.java | 7 +--
.../commons/vfs2/provider/tar/TarFileSystem.java | 13 ++++--
.../org/apache/commons/vfs2/tasks/DeleteTask.java | 2 +-
.../apache/commons/vfs2/tasks/ShowFileTask.java | 10 ++---
.../commons/vfs2/util/CombinedResources.java | 2 +-
.../apache/commons/vfs2/util/FileObjectUtils.java | 10 ++---
.../apache/commons/vfs2/util/PosixPermissions.java | 19 ++++----
.../commons/vfs2/util/WeakRefFileListener.java | 2 +-
.../java/org/apache/commons/vfs2/ContentTests.java | 8 ++--
.../apache/commons/vfs2/FileChangeEventTest.java | 2 +-
.../vfs2/FileObjectEscapeCharacterInPathTest.java | 2 +-
.../java/org/apache/commons/vfs2/PathTests.java | 10 ++---
.../commons/vfs2/ProviderWriteAppendTests.java | 6 +--
.../java/org/apache/commons/vfs2/UriTests.java | 4 +-
.../org/apache/commons/vfs2/UrlStructureTests.java | 2 +-
.../java/org/apache/commons/vfs2/UrlTests.java | 4 +-
.../apache/commons/vfs2/filter/BaseFilterTest.java | 4 +-
.../commons/vfs2/impl/DefaultFileMonitorTest.java | 36 +++++++--------
.../vfs2/impl/DefaultFileSystemManagerTest.java | 4 +-
.../vfs2/provider/DefaultFileContentTest.java | 2 +-
.../commons/vfs2/provider/bzip2/Bzip2TestCase.java | 8 ++--
.../http/GetContentInfoFunctionalTest.java | 2 +-
.../vfs2/provider/http/HttpFilesCacheTestCase.java | 6 +--
.../vfs2/provider/http/HttpProviderTestCase.java | 4 +-
.../provider/http4/Http4FilesCacheTestCase.java | 16 +++----
.../provider/http4/Http4GetContentInfoTest.java | 4 +-
.../provider/http4s/Http4sGetContentInfoTest.java | 2 +-
.../http5/Http5GetContentInfoTestCase.java | 4 +-
.../https/GetContentInfoFunctionalTest.java | 2 +-
.../commons/vfs2/provider/local/FileNameTests.java | 2 +-
.../commons/vfs2/provider/local/TempFileTests.java | 6 +--
.../vfs2/provider/tar/TarFileObjectTestCase.java | 2 +-
.../vfs2/provider/tar/TarFileSystemTestCase.java | 2 +-
.../vfs2/provider/zip/FileLockTestCase.java | 20 ++++-----
.../commons/vfs2/provider/zip/Jira733TestCase.java | 4 +-
.../vfs2/provider/zip/ParseXmlInZipTestCase.java | 10 ++---
.../vfs2/provider/zip/ZipFileObjectTestCase.java | 20 ++++-----
.../commons/vfs2/util/FreeSocketPortUtil.java | 2 +-
pom.xml | 2 +-
59 files changed, 208 insertions(+), 206 deletions(-)
[commons-vfs] 01/08: Fix PMD issue: Remove use of implied final in try-with-resources.
Posted by gg...@apache.org.
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
commit c3570c82194d7ce671714b7db981c9e7696fba83
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 20:56:49 2021 -0500
Fix PMD issue: Remove use of implied final in try-with-resources.
---
.../java/org/apache/commons/vfs2/FileContent.java | 2 +-
.../apache/commons/vfs2/filter/AgeFileFilter.java | 2 +-
.../commons/vfs2/filter/CanWriteFileFilter.java | 2 +-
.../commons/vfs2/filter/EmptyFileFilter.java | 4 +--
.../apache/commons/vfs2/filter/SizeFileFilter.java | 4 +--
.../apache/commons/vfs2/impl/VFSClassLoader.java | 4 +--
.../provider/http/HttpFileContentInfoFactory.java | 2 +-
.../http4/Http4FileContentInfoFactory.java | 2 +-
.../http5/Http5FileContentInfoFactory.java | 2 +-
.../commons/vfs2/provider/ram/RamFileSystem.java | 2 +-
.../commons/vfs2/provider/sftp/SftpFileSystem.java | 2 +-
.../apache/commons/vfs2/tasks/ShowFileTask.java | 10 +++---
.../commons/vfs2/util/CombinedResources.java | 2 +-
.../apache/commons/vfs2/util/FileObjectUtils.java | 10 +++---
.../commons/vfs2/util/WeakRefFileListener.java | 2 +-
.../java/org/apache/commons/vfs2/ContentTests.java | 8 ++---
.../apache/commons/vfs2/FileChangeEventTest.java | 2 +-
.../vfs2/FileObjectEscapeCharacterInPathTest.java | 2 +-
.../java/org/apache/commons/vfs2/PathTests.java | 10 +++---
.../commons/vfs2/ProviderWriteAppendTests.java | 6 ++--
.../java/org/apache/commons/vfs2/UriTests.java | 4 +--
.../org/apache/commons/vfs2/UrlStructureTests.java | 2 +-
.../java/org/apache/commons/vfs2/UrlTests.java | 4 +--
.../apache/commons/vfs2/filter/BaseFilterTest.java | 4 +--
.../commons/vfs2/impl/DefaultFileMonitorTest.java | 36 +++++++++++-----------
.../vfs2/impl/DefaultFileSystemManagerTest.java | 4 +--
.../vfs2/provider/DefaultFileContentTest.java | 2 +-
.../commons/vfs2/provider/bzip2/Bzip2TestCase.java | 8 ++---
.../http/GetContentInfoFunctionalTest.java | 2 +-
.../vfs2/provider/http/HttpFilesCacheTestCase.java | 6 ++--
.../vfs2/provider/http/HttpProviderTestCase.java | 4 +--
.../provider/http4/Http4FilesCacheTestCase.java | 16 +++++-----
.../provider/http4/Http4GetContentInfoTest.java | 4 +--
.../provider/http4s/Http4sGetContentInfoTest.java | 2 +-
.../http5/Http5GetContentInfoTestCase.java | 4 +--
.../https/GetContentInfoFunctionalTest.java | 2 +-
.../commons/vfs2/provider/local/FileNameTests.java | 2 +-
.../commons/vfs2/provider/local/TempFileTests.java | 6 ++--
.../vfs2/provider/tar/TarFileObjectTestCase.java | 2 +-
.../vfs2/provider/tar/TarFileSystemTestCase.java | 2 +-
.../vfs2/provider/zip/FileLockTestCase.java | 20 ++++++------
.../commons/vfs2/provider/zip/Jira733TestCase.java | 4 +--
.../vfs2/provider/zip/ParseXmlInZipTestCase.java | 10 +++---
.../vfs2/provider/zip/ZipFileObjectTestCase.java | 20 ++++++------
.../commons/vfs2/util/FreeSocketPortUtil.java | 2 +-
45 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileContent.java
index 4f130c0..c7c338c 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileContent.java
@@ -98,7 +98,7 @@ public interface FileContent extends Closeable {
final int size = sizeUndefined ? AbstractFileObject.DEFAULT_BUFFER_SIZE : (int) sizeL;
final byte[] buf = new byte[size];
int pos;
- try (final InputStream in = getInputStream(size)) {
+ try (InputStream in = getInputStream(size)) {
int read = 0;
for (pos = 0; pos < size && read >= 0; pos += read) {
read = in.read(buf, pos, size - pos);
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AgeFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AgeFileFilter.java
index 2352194..5ef2ac1 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AgeFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/AgeFileFilter.java
@@ -78,7 +78,7 @@ public class AgeFileFilter implements FileFilter, Serializable {
if (!fileObject.exists()) {
return false;
}
- try (final FileContent content = fileObject.getContent()) {
+ try (FileContent content = fileObject.getContent()) {
return content.getLastModifiedTime() > timeMillis;
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java
index a5b9fcc..cada153 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java
@@ -90,7 +90,7 @@ public class CanWriteFileFilter implements FileFilter, Serializable {
*/
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) throws FileSystemException {
- try (final FileObject file = fileSelectInfo.getFile()) {
+ try (FileObject file = fileSelectInfo.getFile()) {
final FileSystem fileSystem = file.getFileSystem();
if (file.exists()) {
if (!fileSystem.hasCapability(Capability.WRITE_CONTENT)) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
index 5121642..d51514e 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
@@ -86,7 +86,7 @@ public class EmptyFileFilter implements FileFilter, Serializable {
*/
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) throws FileSystemException {
- try (final FileObject file = fileSelectInfo.getFile()) {
+ try (FileObject file = fileSelectInfo.getFile()) {
if (!file.exists()) {
return true;
}
@@ -94,7 +94,7 @@ public class EmptyFileFilter implements FileFilter, Serializable {
final FileObject[] files = file.getChildren();
return files == null || files.length == 0;
}
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
return content.isEmpty();
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
index fdaa44f..acbc9d0 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SizeFileFilter.java
@@ -100,11 +100,11 @@ public class SizeFileFilter implements FileFilter, Serializable {
*/
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) throws FileSystemException {
- try (final FileObject file = fileSelectInfo.getFile()) {
+ try (FileObject file = fileSelectInfo.getFile()) {
if (!file.exists()) {
return false;
}
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
final long length = content.getSize();
final boolean smaller = length < size;
return acceptLarger != smaller;
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 879e32d..885a496 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
@@ -306,7 +306,7 @@ public class VFSClassLoader extends SecureClassLoader {
final List<URL> result = new ArrayList<>(2);
for (final FileObject baseFile : resources) {
- try (final FileObject file = baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF)) {
+ try (FileObject file = baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF)) {
if (FileObjectUtils.exists(file)) {
result.add(new Resource(name, baseFile, file).getURL());
}
@@ -325,7 +325,7 @@ public class VFSClassLoader extends SecureClassLoader {
*/
private Resource loadResource(final String name) throws FileSystemException {
for (final FileObject baseFile : resources) {
- try (final FileObject file = baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF)) {
+ try (FileObject file = baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF)) {
if (FileObjectUtils.exists(file)) {
return new Resource(name, baseFile, file);
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
index 11010f5..2ac194c 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
@@ -40,7 +40,7 @@ public class HttpFileContentInfoFactory implements FileContentInfoFactory {
String contentType = null;
final HeadMethod headMethod;
- try (final HttpFileObject<HttpFileSystem> httpFile = (HttpFileObject<HttpFileSystem>) FileObjectUtils
+ try (HttpFileObject<HttpFileSystem> httpFile = (HttpFileObject<HttpFileSystem>) FileObjectUtils
.getAbstractFileObject(fileContent.getFile())) {
headMethod = httpFile.getHeadMethod();
} catch (final IOException e) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileContentInfoFactory.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileContentInfoFactory.java
index 8a28dd4..8804114 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileContentInfoFactory.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileContentInfoFactory.java
@@ -42,7 +42,7 @@ public class Http4FileContentInfoFactory implements FileContentInfoFactory {
String contentMimeType = null;
String contentCharset = null;
- try (final Http4FileObject<Http4FileSystem> http4File = (Http4FileObject<Http4FileSystem>) FileObjectUtils
+ try (Http4FileObject<Http4FileSystem> http4File = (Http4FileObject<Http4FileSystem>) FileObjectUtils
.getAbstractFileObject(fileContent.getFile())) {
final HttpResponse lastHeadResponse = http4File.getLastHeadResponse();
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileContentInfoFactory.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileContentInfoFactory.java
index 2acc3cf..1a9122b 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileContentInfoFactory.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileContentInfoFactory.java
@@ -42,7 +42,7 @@ public class Http5FileContentInfoFactory implements FileContentInfoFactory {
String contentMimeType = null;
String contentCharset = null;
- try (final Http5FileObject<Http5FileSystem> http4File = (Http5FileObject<Http5FileSystem>) FileObjectUtils
+ try (Http5FileObject<Http5FileSystem> http4File = (Http5FileObject<Http5FileSystem>) FileObjectUtils
.getAbstractFileObject(fileContent.getFile())) {
final HttpResponse lastHeadResponse = http4File.getLastHeadResponse();
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 09c443b..7a39fd5 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
@@ -210,7 +210,7 @@ public class RamFileSystem extends AbstractFileSystem implements Serializable {
}
} else if (fo.isFile()) {
// Copy bytes
- try (final FileContent content = fo.getContent()) {
+ try (FileContent content = fo.getContent()) {
content.write(memFo);
} catch (final IOException e) {
throw new FileSystemException(e.getClass().getName() + " " + e.getMessage());
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
index 45b0d68..b652048 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
@@ -162,7 +162,7 @@ public class SftpFileSystem extends AbstractFileSystem {
try {
channel.setCommand(command);
channel.setInputStream(null);
- try (final InputStreamReader stream = new InputStreamReader(channel.getInputStream(), StandardCharsets.UTF_8)) {
+ try (InputStreamReader stream = new InputStreamReader(channel.getInputStream(), StandardCharsets.UTF_8)) {
channel.setErrStream(System.err, true);
channel.connect(DurationUtils.toMillisInt(connectTimeout));
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
index e80ca8d..893863d 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
@@ -71,7 +71,7 @@ public class ShowFileTask extends VfsTask {
@Override
public void execute() throws BuildException {
try {
- try (final FileObject file = resolveFile(url)) {
+ try (FileObject file = resolveFile(url)) {
log("Details of " + file.getPublicURIString());
showFile(file, INDENT);
}
@@ -99,7 +99,7 @@ public class ShowFileTask extends VfsTask {
if (file.exists()) {
final String newPrefix = prefix + INDENT;
if (file.getType().hasContent()) {
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
log(newPrefix + "Content-Length: " + content.getSize());
log(newPrefix + "Last-Modified" + new Date(content.getLastModifiedTime()));
}
@@ -125,9 +125,9 @@ public class ShowFileTask extends VfsTask {
* Writes the content of the file to Ant log.
*/
private void logContent(final FileObject file, final String prefix) throws Exception {
- try (final FileContent content = file.getContent();
- final InputStream instr = content.getInputStream();
- final BufferedReader reader = new BufferedReader(new InputStreamReader(instr, Charset.defaultCharset()))) {
+ try (FileContent content = file.getContent();
+ InputStream instr = content.getInputStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(instr, Charset.defaultCharset()))) {
while (true) {
final String line = reader.readLine();
if (line == null) {
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
index 2023bff..73acaa2 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
@@ -109,7 +109,7 @@ public class CombinedResources extends ResourceBundle {
final Enumeration<URL> resources = loader.getResources(resourceName);
while (resources.hasMoreElements()) {
final URL resource = resources.nextElement();
- try (final InputStream inputStream = resource.openConnection().getInputStream()) {
+ try (InputStream inputStream = resource.openConnection().getInputStream()) {
properties.load(inputStream);
} catch (final IOException ignored) {
// Ignore
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 aa45498..a671b4b 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
@@ -78,7 +78,7 @@ public final class FileObjectUtils {
* @since 2.6.0
*/
public static byte[] getContentAsByteArray(final FileObject file) throws IOException {
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
return content.getByteArray();
}
}
@@ -93,7 +93,7 @@ public final class FileObjectUtils {
* @since 2.4
*/
public static String getContentAsString(final FileObject file, final Charset charset) throws IOException {
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
return content.getString(charset);
}
}
@@ -108,7 +108,7 @@ public final class FileObjectUtils {
* @since 2.4
*/
public static String getContentAsString(final FileObject file, final String charset) throws IOException {
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
return content.getString(charset);
}
}
@@ -180,7 +180,7 @@ public final class FileObjectUtils {
* @since 2.6.0
*/
public static void writeContent(final FileObject srcFile, final FileObject destFile) throws IOException {
- try (final FileContent content = srcFile.getContent()) {
+ try (FileContent content = srcFile.getContent()) {
content.write(destFile);
}
}
@@ -195,7 +195,7 @@ public final class FileObjectUtils {
* @since 2.6.0
*/
public static void writeContent(final FileObject file, final OutputStream output) throws IOException {
- try (final FileContent content = file.getContent()) {
+ try (FileContent content = file.getContent()) {
content.write(output);
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
index 40cf55a..55a1fb2 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
@@ -63,7 +63,7 @@ public class WeakRefFileListener implements FileListener {
protected FileListener getListener() throws Exception {
final FileListener listener = this.listener.get();
if (listener == null) {
- try (final FileObject fileObject = fs.resolveFile(name)) {
+ try (FileObject fileObject = fs.resolveFile(name)) {
fileObject.getFileSystem().removeListener(fileObject, this);
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java
index 53e5976..9c14f03 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java
@@ -68,7 +68,7 @@ public class ContentTests extends AbstractProviderTestCase {
@Test
public void testByteArrayReadAll() throws Exception {
// Get the test file
- try (final FileObject file = getReadFolder().resolveFile("file1.txt")) {
+ try (FileObject file = getReadFolder().resolveFile("file1.txt")) {
assertEquals(FileType.FILE, file.getType());
assertTrue(file.isFile());
@@ -154,7 +154,7 @@ public class ContentTests extends AbstractProviderTestCase {
@Test
public void testGetString_Charset() throws Exception {
// Get the test file
- try (final FileObject file = getReadFolder().resolveFile("file1.txt")) {
+ try (FileObject file = getReadFolder().resolveFile("file1.txt")) {
assertEquals(FileType.FILE, file.getType());
assertTrue(file.isFile());
@@ -165,7 +165,7 @@ public class ContentTests extends AbstractProviderTestCase {
@Test
public void testGetString_String() throws Exception {
// Get the test file
- try (final FileObject file = getReadFolder().resolveFile("file1.txt")) {
+ try (FileObject file = getReadFolder().resolveFile("file1.txt")) {
assertEquals(FileType.FILE, file.getType());
assertTrue(file.isFile());
@@ -203,7 +203,7 @@ public class ContentTests extends AbstractProviderTestCase {
@Test
public void testInputStreamReadAll() throws Exception {
// Get the test file
- try (final FileObject file = getReadFolder().resolveFile("file1.txt")) {
+ try (FileObject file = getReadFolder().resolveFile("file1.txt")) {
assertEquals(FileType.FILE, file.getType());
assertTrue(file.isFile());
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
index 54a0b68..7e7850a 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
@@ -26,7 +26,7 @@ public class FileChangeEventTest {
@Test
public void testFileObject() throws FileSystemException {
- try (final FileObject baseFile = VFS.getManager().toFileObject(new File("."))) {
+ try (FileObject baseFile = VFS.getManager().toFileObject(new File("."))) {
Assert.assertNotNull(baseFile);
final FileChangeEvent fileChangeEvent = new FileChangeEvent(baseFile);
Assert.assertEquals(fileChangeEvent.getFile(), fileChangeEvent.getFileObject());
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 f109c56..0802a32 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
@@ -98,7 +98,7 @@ public class FileObjectEscapeCharacterInPathTest {
try (FileSystemManager fileSystemManager = loadFileSystemManager();
FileObject fileObject = fileSystemManager.resolveFile(testFilePath)) {
assertNotNull(fileObject);
- try (final FileContent content = fileObject.getContent();
+ try (FileContent content = fileObject.getContent();
InputStream inputStream = content.getInputStream()) {
assertEquals(TEST_FILE_CONTENT, IOUtils.toString(inputStream, StandardCharsets.UTF_8));
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java
index 3b56e94..739149b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java
@@ -62,7 +62,7 @@ public class PathTests extends AbstractProviderTestCase {
@Test
public void testGetPath() throws Exception {
- try (final FileObject fileObject = getReadFolder().resolveFile("some-dir/")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("some-dir/")) {
final Path path = fileObject.getPath();
// FileName#getURI() returns a String, not a URI.
@@ -75,12 +75,12 @@ public class PathTests extends AbstractProviderTestCase {
@Test
public void testReservedCharacterSpace() throws FileSystemException {
- try (final FileObject fileObject = getReadFolder().resolveFile("file with spaces.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file with spaces.txt")) {
final Path path = fileObject.getPath();
final String string = path.toString();
assertTrue(string, string.contains("file%20with%20spaces.txt"));
}
- try (final FileObject fileObject = getReadFolder().resolveFile("file%20with%20spaces.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file%20with%20spaces.txt")) {
final Path path = fileObject.getPath();
final String string = path.toString();
assertTrue(string, string.contains("file%20with%20spaces.txt"));
@@ -93,14 +93,14 @@ public class PathTests extends AbstractProviderTestCase {
@Test
public void testURIContentProvider() throws Exception {
// Test non-empty file
- try (final FileObject fileObject = getReadFolder().resolveFile("file1.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file1.txt")) {
assertTrue(fileObject.exists());
final Path path = fileObject.getPath();
final String pathStr = path.toString();
final FileSystemOptions options = getReadFolder().getFileSystem().getFileSystemOptions();
- try (final FileObject f1 = getManager().resolveFile(pathStr, options);
+ try (FileObject f1 = getManager().resolveFile(pathStr, options);
final FileObject f2 = getManager().resolveFile(pathStr, options)) {
assertEquals("Two files resolved by URI must be equals on " + pathStr, f1, f2);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java
index e9150c8..cd8723d 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java
@@ -53,7 +53,7 @@ public class ProviderWriteAppendTests extends AbstractProviderTestCase {
*/
@Test
public void testAppendContent() throws Exception {
- try (final FileObject scratchFolder = createScratchFolder();
+ try (FileObject scratchFolder = createScratchFolder();
// Create direct child of the test folder
final FileObject file = scratchFolder.resolveFile("file1.txt")) {
@@ -75,7 +75,7 @@ public class ProviderWriteAppendTests extends AbstractProviderTestCase {
assertSameContent(contentAppend, file);
// Make sure we can copy the new file to another file on the same filesystem
- try (final FileObject fileCopy = scratchFolder.resolveFile("file1copy.txt")) {
+ try (FileObject fileCopy = scratchFolder.resolveFile("file1copy.txt")) {
assertFalse(fileCopy.exists());
fileCopy.copyFrom(file, Selectors.SELECT_SELF);
@@ -95,7 +95,7 @@ public class ProviderWriteAppendTests extends AbstractProviderTestCase {
*/
@Test
public void testAppendToNonExsiting() throws Exception {
- try (final FileObject scratchFolder = createScratchFolder();
+ try (FileObject scratchFolder = createScratchFolder();
// Create direct child of the test folder
final FileObject file = scratchFolder.resolveFile("file2.txt")) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java
index ee503dc..2a5af59 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java
@@ -70,12 +70,12 @@ public class UriTests extends AbstractProviderTestCase {
@Test
public void testReservedCharacterSpace() throws FileSystemException {
- try (final FileObject fileObject = getReadFolder().resolveFile("file with spaces.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file with spaces.txt")) {
final URI url = fileObject.getURI();
final String string = url.toString();
assertTrue(string, string.contains("file%20with%20spaces.txt"));
}
- try (final FileObject fileObject = getReadFolder().resolveFile("file%20with%20spaces.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file%20with%20spaces.txt")) {
final URI url = fileObject.getURI();
final String string = url.toString();
assertTrue(string, string.contains("file%20with%20spaces.txt"));
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java
index f0bf56b..b5549e4 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java
@@ -49,7 +49,7 @@ public class UrlStructureTests extends AbstractProviderTestCase {
assertTrue(folder.exists());
// Try getting the content of a folder
- try (final InputStream inputStream = folder.getURL().openConnection().getInputStream()) {
+ try (InputStream inputStream = folder.getURL().openConnection().getInputStream()) {
fail();
} catch (final IOException e) {
assertSameMessage("vfs.provider/read-not-file.error", folder, e);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java
index 935bce8..dce6663 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java
@@ -38,12 +38,12 @@ public class UrlTests extends AbstractProviderTestCase {
@Test
public void testReservedCharacter_Space() throws FileSystemException {
- try (final FileObject fileObject = getReadFolder().resolveFile("file with spaces.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file with spaces.txt")) {
final URL url = fileObject.getURL();
final String string = url.toString();
assertTrue(string, string.contains("file%20with%20spaces.txt"));
}
- try (final FileObject fileObject = getReadFolder().resolveFile("file%20with%20spaces.txt")) {
+ try (FileObject fileObject = getReadFolder().resolveFile("file%20with%20spaces.txt")) {
final URL url = fileObject.getURL();
final String string = url.toString();
assertTrue(string, string.contains("file%20with%20spaces.txt"));
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
index 9eb5652..ff4112d 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
@@ -234,7 +234,7 @@ public abstract class BaseFilterTest {
throw new IllegalArgumentException("destFile cannot be null");
}
- try (final ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(destFile.toPath())))) {
+ try (ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(destFile.toPath())))) {
zipDir(srcDir, filter, destPath, out);
}
@@ -297,7 +297,7 @@ public abstract class BaseFilterTest {
throws IOException {
final byte[] buf = new byte[1024];
- try (final InputStream in = new BufferedInputStream(Files.newInputStream(srcFile.toPath()))) {
+ try (InputStream in = new BufferedInputStream(Files.newInputStream(srcFile.toPath()))) {
final ZipEntry zipEntry = new ZipEntry(concatPathAndFilename(destPath, srcFile.getName(), File.separator));
zipEntry.setTime(srcFile.lastModified());
out.putNextEntry(zipEntry);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
index 89d461f..7f7369d 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
@@ -128,9 +128,9 @@ public class DefaultFileMonitorTest {
@Ignore("VFS-299")
@Test
public void ignore_testAddRemove() throws Exception {
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
final CountingListener listener = new CountingListener();
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(listener)) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(listener)) {
monitor.setDelay(DELAY_MILLIS);
monitor.addFile(fileObject);
monitor.removeFile(fileObject);
@@ -151,9 +151,9 @@ public class DefaultFileMonitorTest {
@Ignore("VFS-299")
@Test
public void ignore_testStartStop() throws Exception {
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
final CountingListener stoppedListener = new CountingListener();
- try (final DefaultFileMonitor stoppedMonitor = new DefaultFileMonitor(stoppedListener)) {
+ try (DefaultFileMonitor stoppedMonitor = new DefaultFileMonitor(stoppedListener)) {
stoppedMonitor.start();
stoppedMonitor.addFile(fileObject);
}
@@ -173,7 +173,7 @@ public class DefaultFileMonitorTest {
// DefaultFileMonitor.
final CountingListener activeListener = new CountingListener();
- try (final DefaultFileMonitor activeMonitor = new DefaultFileMonitor(activeListener)) {
+ try (DefaultFileMonitor activeMonitor = new DefaultFileMonitor(activeListener)) {
activeMonitor.setDelay(DELAY_MILLIS);
activeMonitor.addFile(fileObject);
activeMonitor.start();
@@ -207,8 +207,8 @@ public class DefaultFileMonitorTest {
@Test
public void testChildFileDeletedWithoutRecursiveChecking() throws Exception {
writeToFile(testFile);
- try (final FileObject fileObject = fileSystemManager.resolveFile(testDir.toURI().toURL().toString())) {
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testDir.toURI().toURL().toString())) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
monitor.setDelay(2000);
monitor.setRecursive(false);
monitor.addFile(fileObject);
@@ -225,8 +225,8 @@ public class DefaultFileMonitorTest {
@Test
public void testChildFileRecreated() throws Exception {
writeToFile(testFile);
- try (final FileObject fileObj = fileSystemManager.resolveFile(testDir.toURI().toURL().toString())) {
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
+ try (FileObject fileObj = fileSystemManager.resolveFile(testDir.toURI().toURL().toString())) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
monitor.setDelay(2000);
monitor.setRecursive(true);
monitor.addFile(fileObj);
@@ -245,8 +245,8 @@ public class DefaultFileMonitorTest {
@Test
public void testFileCreated() throws Exception {
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toURL().toString())) {
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toURL().toString())) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
// TestFileListener manipulates status
monitor.setDelay(DELAY_MILLIS);
monitor.addFile(fileObject);
@@ -261,8 +261,8 @@ public class DefaultFileMonitorTest {
@Test
public void testFileDeleted() throws Exception {
writeToFile(testFile);
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
// TestFileListener manipulates status
monitor.setDelay(DELAY_MILLIS);
monitor.addFile(fileObject);
@@ -276,8 +276,8 @@ public class DefaultFileMonitorTest {
@Test
public void testFileModified() throws Exception {
writeToFile(testFile);
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toURL().toString())) {
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toURL().toString())) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
// TestFileListener manipulates status
monitor.setDelay(DELAY_MILLIS);
monitor.addFile(fileObject);
@@ -295,7 +295,7 @@ public class DefaultFileMonitorTest {
@Test
public void testFileMonitorRestarted() throws Exception {
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener());
try {
// TestFileListener manipulates status
@@ -321,8 +321,8 @@ public class DefaultFileMonitorTest {
@Test
public void testFileRecreated() throws Exception {
- try (final FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI())) {
- try (final DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
+ try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI())) {
+ try (DefaultFileMonitor monitor = new DefaultFileMonitor(new TestFileListener())) {
// TestFileListener manipulates status
monitor.setDelay(DELAY_MILLIS);
monitor.addFile(fileObject);
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 2399bca..51d63d3 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
@@ -116,7 +116,7 @@ public class DefaultFileSystemManagerTest {
public void testFileCacheEmptyAfterManagerClose() throws FileSystemException {
final FileSystemManager manager = VFS.getManager();
Assert.assertNotNull(manager);
- try (final FileObject fileObject = manager
+ try (FileObject fileObject = manager
.resolveFile(Paths.get("src/test/resources/test-data/read-tests/file1.txt").toUri())) {
Assert.assertTrue(fileObject.exists());
final FilesCache filesCache = manager.getFilesCache();
@@ -136,7 +136,7 @@ public class DefaultFileSystemManagerTest {
public void testFileCacheEmptyAfterVFSClose() throws FileSystemException {
final FileSystemManager manager = VFS.getManager();
Assert.assertNotNull(manager);
- try (final FileObject fileObject = manager
+ try (FileObject fileObject = manager
.resolveFile(Paths.get("src/test/resources/test-data/read-tests/file1.txt").toUri())) {
Assert.assertTrue(fileObject.exists());
final FilesCache filesCache = manager.getFilesCache();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
index 44a3c99..f2d889a 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
@@ -48,7 +48,7 @@ public class DefaultFileContentTest {
@Test
public void testGetZeroContents() throws IOException {
final FileSystemManager fsManager = VFS.getManager();
- try (final FileObject fo = fsManager.resolveFile(new File("."), "src/test/resources/test-data/size-0-file.bin");
+ try (FileObject fo = fsManager.resolveFile(new File("."), "src/test/resources/test-data/size-0-file.bin");
final FileContent content = fo.getContent()) {
Assert.assertEquals(0, content.getSize());
Assert.assertTrue(content.isEmpty());
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java
index 6ac26e3..d0045d4 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java
@@ -34,17 +34,17 @@ public class Bzip2TestCase extends AbstractVfsTestCase {
@Test
public void testBZip2() throws IOException {
final File testResource = getTestResource("bla.txt.bz2");
- try (final FileObject bz2FileObject = VFS.getManager().resolveFile("bz2://" + testResource)) {
+ try (FileObject bz2FileObject = VFS.getManager().resolveFile("bz2://" + testResource)) {
Assert.assertTrue(bz2FileObject.exists());
Assert.assertTrue(bz2FileObject.isFolder());
- try (final FileObject fileObjectDir = bz2FileObject.resolveFile("bla.txt")) {
+ try (FileObject fileObjectDir = bz2FileObject.resolveFile("bla.txt")) {
Assert.assertTrue(fileObjectDir.exists());
Assert.assertTrue(bz2FileObject.isFolder());
- try (final FileObject fileObject = fileObjectDir.resolveFile("bla.txt")) {
+ try (FileObject fileObject = fileObjectDir.resolveFile("bla.txt")) {
Assert.assertTrue(fileObject.exists());
Assert.assertFalse(fileObject.isFolder());
Assert.assertTrue(fileObject.isFile());
- try (final FileContent content = fileObject.getContent()) {
+ try (FileContent content = fileObject.getContent()) {
Assert.assertEquals(CompressedFileFileObject.SIZE_UNDEFINED, content.getSize());
// blows up, Commons Compress?
final String string = content.getString(StandardCharsets.UTF_8);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java
index fc5efec..1362733 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java
@@ -68,7 +68,7 @@ public class GetContentInfoFunctionalTest {
public void testGetContentInfo() throws FileSystemException, MalformedURLException {
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http://www.apache.org/licenses/LICENSE-2.0.txt";
- try (final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
+ try (FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
final FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
// Used to NPE before fix:
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java
index 5dcd297..6fd37dd 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java
@@ -44,15 +44,15 @@ public class HttpFilesCacheTestCase extends TestCase {
final FileSystemManager fileSystemManager = VFS.getManager();
- try (final FileObject noQueryFile = fileSystemManager.resolveFile(noQueryStringUrl)) {
+ try (FileObject noQueryFile = fileSystemManager.resolveFile(noQueryStringUrl)) {
Assert.assertEquals(noQueryStringUrl, noQueryFile.getURL().toExternalForm());
}
- try (final FileObject queryFile = fileSystemManager.resolveFile(queryStringUrl)) {
+ try (FileObject queryFile = fileSystemManager.resolveFile(queryStringUrl)) {
Assert.assertEquals(queryStringUrl, queryFile.getURL().toExternalForm()); // failed for VFS-426
}
- try (final FileObject queryFile2 = fileSystemManager.resolveFile(queryStringUrl2)) {
+ try (FileObject queryFile2 = fileSystemManager.resolveFile(queryStringUrl2)) {
Assert.assertEquals(queryStringUrl2, queryFile2.getURL().toExternalForm()); // failed for VFS-426
}
}
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 b823b6b..c1cb750 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
@@ -127,7 +127,7 @@ public class HttpProviderTestCase extends AbstractProviderTestConfig {
// Test no longer passing 2016/04/28
public void ignoreTestHttp405() throws FileSystemException {
- try (final FileObject fileObject = VFS.getManager()
+ try (FileObject fileObject = VFS.getManager()
.resolveFile("http://www.w3schools.com/webservices/tempconvert.asmx?action=WSDL")) {
assert fileObject.getContent().getSize() > 0;
assert !fileObject.getContent().isEmpty();
@@ -183,7 +183,7 @@ public class HttpProviderTestCase extends AbstractProviderTestConfig {
VFS.getManager().getFilesCache().close();
final FileSystemOptions opts = new FileSystemOptions();
HttpFileSystemConfigBuilder.getInstance().setFollowRedirect(opts, followRedirect);
- try (final FileObject file = VFS.getManager().resolveFile(uri, opts)) {
+ try (FileObject file = VFS.getManager().resolveFile(uri, opts)) {
checkReadTestsFolder(file);
} catch (final FileNotFolderException e) {
// Expected: VFS HTTP does not support listing children yet.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java
index ef9896a..007a4cb 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java
@@ -38,7 +38,7 @@ public class Http4FilesCacheTestCase extends TestCase {
final FileSystemManager fileSystemManager = VFS.getManager();
final String noQueryStringUrl = "http4://commons.apache.org/";
- try (final FileObject noQueryFile = fileSystemManager.resolveFile(noQueryStringUrl)) {
+ try (FileObject noQueryFile = fileSystemManager.resolveFile(noQueryStringUrl)) {
Assert.assertEquals(noQueryStringUrl, noQueryFile.getURL().toExternalForm());
}
}
@@ -49,7 +49,7 @@ public class Http4FilesCacheTestCase extends TestCase {
final FileSystemManager fileSystemManager = VFS.getManager();
final String noQueryStringUrl = "http4://commons.apache.org/vfs";
- try (final FileObject noQueryFile = fileSystemManager.resolveFile(noQueryStringUrl)) {
+ try (FileObject noQueryFile = fileSystemManager.resolveFile(noQueryStringUrl)) {
Assert.assertEquals(noQueryStringUrl, noQueryFile.getURL().toExternalForm());
}
}
@@ -60,7 +60,7 @@ public class Http4FilesCacheTestCase extends TestCase {
final FileSystemManager fileSystemManager = VFS.getManager();
final String queryStringUrl = "http4://commons.apache.org/vfs?query=string";
- try (final FileObject queryFile = fileSystemManager.resolveFile(queryStringUrl)) {
+ try (FileObject queryFile = fileSystemManager.resolveFile(queryStringUrl)) {
Assert.assertEquals(queryStringUrl, queryFile.getURL().toExternalForm()); // failed for VFS-426
}
}
@@ -71,7 +71,7 @@ public class Http4FilesCacheTestCase extends TestCase {
final FileSystemManager fileSystemManager = VFS.getManager();
final String queryStringUrl2 = "http4://commons.apache.org/vfs?query=string&more=stuff";
- try (final FileObject queryFile2 = fileSystemManager.resolveFile(queryStringUrl2)) {
+ try (FileObject queryFile2 = fileSystemManager.resolveFile(queryStringUrl2)) {
Assert.assertEquals(queryStringUrl2, queryFile2.getURL().toExternalForm()); // failed for VFS-426
}
}
@@ -84,7 +84,7 @@ public class Http4FilesCacheTestCase extends TestCase {
// TODO All lowercase input except the percent encoded '\' (%5C);
// We end up converting back to lowercase, but OK per RFC.
final String queryStringUrl3 = "http4://alice%5C1234:secret@localhost:8080/";
- try (final FileObject queryFile3 = fileSystemManager.resolveFile(queryStringUrl3)) {
+ try (FileObject queryFile3 = fileSystemManager.resolveFile(queryStringUrl3)) {
Assert.assertEquals(queryStringUrl3.toLowerCase(Locale.ROOT), queryFile3.getURL().toExternalForm());
}
}
@@ -96,7 +96,7 @@ public class Http4FilesCacheTestCase extends TestCase {
// Like testQueryStringUrl4() but with all LC input.
final String queryStringUrl4 = "http4://alice%5c1234:secret@localhost:8080/";
- try (final FileObject queryFile4 = fileSystemManager.resolveFile(queryStringUrl4)) {
+ try (FileObject queryFile4 = fileSystemManager.resolveFile(queryStringUrl4)) {
Assert.assertEquals(queryStringUrl4, queryFile4.getURL().toExternalForm());
}
}
@@ -108,7 +108,7 @@ public class Http4FilesCacheTestCase extends TestCase {
// Like testQueryStringUrl4() but with all LC input and NO percent encoding.
final String queryStringUrl4 = "http4://alice:secret@localhost:8080/";
- try (final FileObject queryFile4 = fileSystemManager.resolveFile(queryStringUrl4)) {
+ try (FileObject queryFile4 = fileSystemManager.resolveFile(queryStringUrl4)) {
Assert.assertEquals(queryStringUrl4, queryFile4.getURL().toExternalForm());
}
}
@@ -120,7 +120,7 @@ public class Http4FilesCacheTestCase extends TestCase {
// Like testQueryStringUrl4() but with all LC input and NO percent encoding.
final String queryStringUrl4 = "http4://localhost:8080/";
- try (final FileObject queryFile4 = fileSystemManager.resolveFile(queryStringUrl4)) {
+ try (FileObject queryFile4 = fileSystemManager.resolveFile(queryStringUrl4)) {
Assert.assertEquals(queryStringUrl4, queryFile4.getURL().toExternalForm());
}
}
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 2d82cb8..c53ba46 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
@@ -104,7 +104,7 @@ public class Http4GetContentInfoTest extends TestCase {
@SuppressWarnings("resource") // getManager() returns a global.
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http4://www.apache.org/licenses/LICENSE-2.0.txt";
- try (final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
+ try (FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
final FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
// Used to NPE before fix:
@@ -122,7 +122,7 @@ public class Http4GetContentInfoTest extends TestCase {
@SuppressWarnings("resource") // getManager() returns a global.
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http4://www.apache.org/licenses/LICENSE-2.0.txt";
- try (final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxyAuthentication());
+ try (FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxyAuthentication());
final FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
content.getContentInfo();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java
index c98b47b..17cb3c3 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java
@@ -70,7 +70,7 @@ public class Http4sGetContentInfoTest extends TestCase {
public void testGetContentInfo() throws FileSystemException, MalformedURLException {
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http4://www.apache.org/licenses/LICENSE-2.0.txt";
- try (final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy())) {
+ try (FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy())) {
final FileContent content = fo.getContent();
Assert.assertNotNull(content);
// Used to NPE before fix:
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 398c1d2..1eb297d 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
@@ -104,7 +104,7 @@ public class Http5GetContentInfoTestCase extends TestCase {
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http5://www.apache.org/licenses/LICENSE-2.0.txt";
final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
- try (final FileContent content = fo.getContent()) {
+ try (FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
// Used to NPE before fix:
content.getContentInfo();
@@ -120,7 +120,7 @@ public class Http5GetContentInfoTestCase extends TestCase {
public void testGetContentWithProxyAuthInfo() throws FileSystemException, MalformedURLException {
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http4://www.apache.org/licenses/LICENSE-2.0.txt";
- try (final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxyAuthentication())) {
+ try (FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxyAuthentication())) {
final FileContent content = fo.getContent();
Assert.assertNotNull(content);
content.getContentInfo();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java
index 51f7050..e53647b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java
@@ -72,7 +72,7 @@ public class GetContentInfoFunctionalTest {
@SuppressWarnings("resource") // getManager() returns a global.
final FileSystemManager fsManager = VFS.getManager();
final String uri = "http://www.apache.org/licenses/LICENSE-2.0.txt";
- try (final FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
+ try (FileObject fo = fsManager.resolveFile(uri, getOptionsWithProxy());
final FileContent content = fo.getContent()) {
Assert.assertNotNull(content);
// Used to NPE before fix:
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java
index f4a42d9..81cce09 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java
@@ -38,7 +38,7 @@ public class FileNameTests extends AbstractProviderTestCase {
final String fileName = new File("testdir").getAbsolutePath();
final DefaultFileSystemManager manager = getManager();
Assert.assertNotNull("Unexpected null manager for test " + this, manager);
- try (final FileObject absFile = manager.resolveFile(fileName)) {
+ try (FileObject absFile = manager.resolveFile(fileName)) {
// Locate file by URI
final String uri = "file://" + fileName.replace(File.separatorChar, '/');
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java
index 3c16a03..d6ebf6c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java
@@ -39,9 +39,9 @@ public class TempFileTests extends AbstractProviderTestCase {
final File file = File.createTempFile(prefix + "-", "-" + prefix);
assertTrue(file.exists());
final URI uri = file.toURI();
- try (final FileSystemManager manager = getManager()) {
- try (final FileObject fileObject = manager.resolveFile(uri)) {
- try (final FileContent sourceContent = fileObject.getContent()) {
+ try (FileSystemManager manager = getManager()) {
+ try (FileObject fileObject = manager.resolveFile(uri)) {
+ try (FileContent sourceContent = fileObject.getContent()) {
assertEquals(sourceContent.getSize(), file.length());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java
index 3a48377..7f81bb4 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java
@@ -37,7 +37,7 @@ public class TarFileObjectTestCase {
final String baseUrl = scheme + ":file:" + testFile.getAbsolutePath();
// test
- try (final FileObject fileObject = manager.resolveFile(baseUrl)) {
+ try (FileObject fileObject = manager.resolveFile(baseUrl)) {
// test getChildren() number equal
Assert.assertEquals(fileObject.getChildren().length, fileNames.length);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java
index eda0203..c190f59 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java
@@ -72,7 +72,7 @@ public class TarFileSystemTestCase {
final String fileUri = scheme + ":file:" + new File(filePath).getAbsolutePath();
FileObject fileObject = null;
- try (final StandardFileSystemManager manager = new StandardFileSystemManager()) {
+ try (StandardFileSystemManager manager = new StandardFileSystemManager()) {
if (filesCache != null) {
manager.setFilesCache(filesCache);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java
index 2a2f476..a3ae1a4 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java
@@ -56,19 +56,19 @@ public class FileLockTestCase {
}
private void resolveAndOpenCloseContent() throws FileSystemException {
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
zipFileObject.getContent().close();
}
}
private void resolveAndOpenCloseInputStream() throws IOException, FileSystemException {
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
zipFileObject.getContent().getInputStream().close();
}
}
private void resolveAndOpenReadCloseInputStream() throws IOException, FileSystemException {
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
readAndAssert(inputStream);
}
@@ -87,7 +87,7 @@ public class FileLockTestCase {
@Test
public void testCannotDeleteWhileStreaming() throws Exception {
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
if (SystemUtils.IS_OS_WINDOWS) {
// We do not use newZipFile in the Assert message to avoid touching it before calling delete().
@@ -101,7 +101,7 @@ public class FileLockTestCase {
@Test
public void testCannotDeleteWhileStreaming2() throws Exception {
Assume.assumeTrue(SystemUtils.IS_OS_WINDOWS);
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
// We do not use newZipFile in the Assert message to avoid touching it before calling delete().
Assert.assertFalse("Could not delete file", newZipFile.delete());
@@ -112,13 +112,13 @@ public class FileLockTestCase {
@Test
public void testReadClosedFileObject() throws Exception {
final FileObject zipFileObjectRef;
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
zipFileObjectRef = zipFileObject;
- try (final InputStream inputStream = zipFileObject.getContent().getInputStream()) {
+ try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
readAndAssert(inputStream);
}
}
- try (final InputStream inputStream = zipFileObjectRef.getContent().getInputStream()) {
+ try (InputStream inputStream = zipFileObjectRef.getContent().getInputStream()) {
readAndAssert(inputStream);
} finally {
zipFileObjectRef.close();
@@ -178,8 +178,8 @@ public class FileLockTestCase {
@Test
public void testResolveOpenCloseNestedInputStreams() throws Exception {
- try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
- try (final FileObject zipFileObject2 = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+ try (FileObject zipFileObject2 = manager.resolveFile(zipFileUri)) {
zipFileObject2.getContent().getInputStream().close();
}
zipFileObject.getContent().getInputStream().close();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
index 43817ed..77dd213 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
@@ -41,7 +41,7 @@ public class Jira733TestCase {
public void testZipParentLayer() throws Exception {
final File file = new File("src/test/resources/test-data/test.zip");
final String nestedPath = "zip:" + file.getAbsolutePath() + "!/read-tests/file1.txt";
- try (final FileObject fileObject = VFS.getManager().resolveFile(nestedPath);
+ try (FileObject fileObject = VFS.getManager().resolveFile(nestedPath);
final FileObject wrappedFileObject = new OnCallRefreshFileObject(fileObject)) {
// VFS.getManager().getFilesCache().close();
Assert.assertNotNull("getParentLayer() 1", wrappedFileObject.getFileSystem().getParentLayer());
@@ -55,7 +55,7 @@ public class Jira733TestCase {
final File file = new File("src/test/resources/test-data/test.zip");
Assert.assertTrue(file.exists());
final String nestedPath = "zip:" + file.getAbsolutePath() + "!/read-tests/file1.txt";
- try (final FileObject fileObject = VFS.getManager().resolveFile(nestedPath);
+ try (FileObject fileObject = VFS.getManager().resolveFile(nestedPath);
final FileObject wrappedFileObject = new OnCallRefreshFileObject(fileObject)) {
Assert.assertTrue(fileObject instanceof ZipFileObject);
@SuppressWarnings({ "unused", "resource" })
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
index 6e96fa5..a80d866 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
@@ -103,8 +103,8 @@ public class ParseXmlInZipTestCase {
final File newZipFile = createTempFile();
final String xmlFilePath = "zip:file:" + newZipFile.getAbsolutePath() + "!/read-xml-tests/file1.xml";
final FileSystemManager manager = VFS.getManager();
- try (final FileObject zipFileObject = manager.resolveFile(xmlFilePath)) {
- try (final InputStream inputStream = zipFileObject.getContent().getInputStream()) {
+ try (FileObject zipFileObject = manager.resolveFile(xmlFilePath)) {
+ try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
final Document document = newDocumentBuilder(zipFileObject, zipFileObject, null).parse(inputStream);
Assert.assertNotNull(document);
}
@@ -152,9 +152,9 @@ public class ParseXmlInZipTestCase {
final File newZipFile = createTempFile();
final String zipFilePath = "zip:file:" + newZipFile.getAbsolutePath();
final FileSystemManager manager = VFS.getManager();
- try (final FileObject zipFileObject = manager.resolveFile(zipFilePath)) {
- try (final FileObject xmlFileObject = zipFileObject.resolveFile(xmlPathInZip)) {
- try (final InputStream inputStream = xmlFileObject.getContent().getInputStream()) {
+ try (FileObject zipFileObject = manager.resolveFile(zipFilePath)) {
+ try (FileObject xmlFileObject = zipFileObject.resolveFile(xmlPathInZip)) {
+ try (InputStream inputStream = xmlFileObject.getContent().getInputStream()) {
final Document document = newDocumentBuilder(zipFileObject, xmlFileObject, xsdPathInZip)
.parse(inputStream);
Assert.assertNotNull(document);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java
index 3d53cb1..b7fefe4 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java
@@ -67,8 +67,8 @@ public class ZipFileObjectTestCase {
private void resolveReadAssert(final FileObject zipFileObject, final String path)
throws IOException, FileSystemException {
- try (final FileObject zipFileObject2 = zipFileObject.resolveFile(path)) {
- try (final InputStream inputStream = zipFileObject2.getContent().getInputStream()) {
+ try (FileObject zipFileObject2 = zipFileObject.resolveFile(path)) {
+ try (InputStream inputStream = zipFileObject2.getContent().getInputStream()) {
readAndAssert(zipFileObject2, inputStream, "2");
}
}
@@ -85,7 +85,7 @@ public class ZipFileObjectTestCase {
public void testLeaveNestedFileOpen() throws IOException {
final File newZipFile = createTempFile();
final FileSystemManager manager = VFS.getManager();
- try (final FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
+ try (FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
@SuppressWarnings({ "resource" })
final FileObject zipFileObject1 = zipFileObject.resolveFile(NESTED_FILE_1);
getInputStreamAndAssert(zipFileObject1, "1");
@@ -102,9 +102,9 @@ public class ZipFileObjectTestCase {
public void testReadingFilesInZipFile() throws IOException {
final File newZipFile = createTempFile();
final FileSystemManager manager = VFS.getManager();
- try (final FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
- try (final FileObject zipFileObject1 = zipFileObject.resolveFile(NESTED_FILE_1)) {
- try (final InputStream inputStream = zipFileObject1.getContent().getInputStream()) {
+ try (FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
+ try (FileObject zipFileObject1 = zipFileObject.resolveFile(NESTED_FILE_1)) {
+ try (InputStream inputStream = zipFileObject1.getContent().getInputStream()) {
readAndAssert(zipFileObject1, inputStream, "1");
}
}
@@ -125,7 +125,7 @@ public class ZipFileObjectTestCase {
final FileSystemManager manager = VFS.getManager();
final FileObject zipFileObject1;
final InputStream inputStream1;
- try (final FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
+ try (FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
// leave resources open
zipFileObject1 = zipFileObject.resolveFile(NESTED_FILE_1);
inputStream1 = zipFileObject1.getContent().getInputStream();
@@ -149,7 +149,7 @@ public class ZipFileObjectTestCase {
final FileSystemManager manager = VFS.getManager();
final FileObject zipFileObject1;
final InputStream inputStream1;
- try (final FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
+ try (FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
// leave resources open (note that internal counters are updated)
zipFileObject1 = zipFileObject.resolveFile(NESTED_FILE_1);
inputStream1 = zipFileObject1.getContent().getInputStream();
@@ -176,7 +176,7 @@ public class ZipFileObjectTestCase {
final String baseUrl = "zip:file:"+testFile.getAbsolutePath();
// test
- try (final FileObject fileObject = manager.resolveFile(baseUrl)) {
+ try (FileObject fileObject = manager.resolveFile(baseUrl)) {
// test getChildren() number equal
Assert.assertEquals(fileObject.getChildren().length, fileNames.length);
@@ -197,7 +197,7 @@ public class ZipFileObjectTestCase {
public void testResolveNestedFileWithoutCleanup() throws IOException {
final File newZipFile = createTempFile();
final FileSystemManager manager = VFS.getManager();
- try (final FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
+ try (FileObject zipFileObject = manager.resolveFile("zip:file:" + newZipFile.getAbsolutePath())) {
@SuppressWarnings({ "unused", "resource" })
// We resolve a nested file and do nothing else.
final FileObject zipFileObject1 = zipFileObject.resolveFile(NESTED_FILE_1);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java
index 206c850..125c3a8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java
@@ -29,7 +29,7 @@ public class FreeSocketPortUtil {
* @throws IOException
*/
public static int findFreeLocalPort() throws IOException {
- try (final ServerSocket server = new ServerSocket(0)) {
+ try (ServerSocket server = new ServerSocket(0)) {
return server.getLocalPort();
}
}
[commons-vfs] 08/08: Enabled PMD check in Maven default goal.
Posted by gg...@apache.org.
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
commit 4d7756e72b6068a47ef08bddde26c5901e23c0e1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 22:27:16 2021 -0500
Enabled PMD check in Maven default goal.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 448346e..c73dd1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
<build>
<!-- japicmp:cmp needs package to work from a jar -->
- <defaultGoal>clean package apache-rat:check japicmp:cmp javadoc:javadoc spotbugs:check</defaultGoal>
+ <defaultGoal>clean package apache-rat:check japicmp:cmp javadoc:javadoc spotbugs:check pmd:check</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
[commons-vfs] 05/08: Fix PMD EmptyCatchBlock.
Posted by gg...@apache.org.
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
commit e496120c2e5bff03b1d17e8e97ebbe7bb4af5190
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 21:38:37 2021 -0500
Fix PMD EmptyCatchBlock.
---
.../provider/hdfs/HdfsFileSystemConfigBuilder.java | 24 +++++-----
.../commons/vfs2/provider/sftp/SftpFileObject.java | 52 +++++++++-------------
.../commons/vfs2/provider/sftp/SftpFileSystem.java | 5 ++-
3 files changed, 37 insertions(+), 44 deletions(-)
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 b6ebe7c..4c9a3b3 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
@@ -118,21 +118,21 @@ public final class HdfsFileSystemConfigBuilder extends FileSystemConfigBuilder {
* @see #setConfigURL(FileSystemOptions, URL)
*/
public URL[] getConfigURLs(final FileSystemOptions opts) {
- try {
- final String urlNames = this.getString(opts, KEY_CONFIG_URLS);
- if (StringUtils.isEmpty(urlNames)) {
- return null;
- }
- final String[] urls = urlNames.split(",");
- final URL[] realURLs = new URL[urls.length];
- for (int i = 0; i < urls.length; i++) {
+ final String urlNames = this.getString(opts, KEY_CONFIG_URLS);
+ if (StringUtils.isEmpty(urlNames)) {
+ return null;
+ }
+ final String[] urls = urlNames.split(",");
+ final URL[] realURLs = new URL[urls.length];
+ for (int i = 0; i < urls.length; i++) {
+ try {
realURLs[i] = 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;
- } catch (final MalformedURLException mue) {
- // This should never happen because we save it in the proper form
}
- return null;
+ return realURLs;
}
/**
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 9ef7aa9..c38e6cd 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
@@ -157,43 +157,35 @@ public class SftpFileObject extends AbstractFileObject<SftpFileSystem> {
@SuppressWarnings("resource")
@Override
protected InputStream doGetInputStream(final int bufferSize) throws Exception {
- // VFS-113: avoid npe
+ // VFS-113: avoid NPE.
synchronized (getAbstractFileSystem()) {
final ChannelSftp channel = getAbstractFileSystem().getChannel();
- try {
- // return channel.get(getName().getPath());
- // hmmm - using the in memory method is soooo much faster ...
-
- // TODO - Don't read the entire file into memory. Use the
- // stream-based methods on ChannelSftp once they work properly
-
- /*
- * final ByteArrayOutputStream outstr = new ByteArrayOutputStream(); channel.get(relPath, outstr);
- * outstr.close(); return new ByteArrayInputStream(outstr.toByteArray());
- */
+ // return channel.get(getName().getPath());
+ // hmmm - using the in memory method is soooo much faster ...
- final InputStream inputStream;
- try {
- // VFS-210: sftp allows to gather an input stream even from a directory and will
- // fail on first read. So we need to check the type anyway
- if (!getType().hasContent()) {
- throw new FileSystemException("vfs.provider/read-not-file.error", getName());
- }
+ // TODO - Don't read the entire file into memory. Use the
+ // stream-based methods on ChannelSftp once they work properly
- inputStream = channel.get(relPath);
- } catch (final SftpException e) {
- if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
- throw new FileNotFoundException(getName());
- }
+ /*
+ * final ByteArrayOutputStream outstr = new ByteArrayOutputStream(); channel.get(relPath, outstr); outstr.close();
+ * return new ByteArrayInputStream(outstr.toByteArray());
+ */
- throw new FileSystemException(e);
+ final InputStream inputStream;
+ try {
+ // VFS-210: sftp allows to gather an input stream even from a directory and will
+ // fail on first read. So we need to check the type anyway
+ if (!getType().hasContent()) {
+ throw new FileSystemException("vfs.provider/read-not-file.error", getName());
}
-
- return new SftpInputStream(channel, inputStream, bufferSize);
-
- } finally {
- // getAbstractFileSystem().putChannel(channel);
+ inputStream = channel.get(relPath);
+ } catch (final SftpException e) {
+ if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
+ throw new FileNotFoundException(getName());
+ }
+ throw new FileSystemException(e);
}
+ return new SftpInputStream(channel, inputStream, bufferSize);
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
index b652048..9b1a594 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
@@ -178,8 +178,9 @@ public class SftpFileSystem extends AbstractFileSystem {
while (!channel.isClosed()) {
try {
Thread.sleep(SLEEP_MILLIS);
- } catch (final Exception ee) {
- // TODO: swallow exception, really?
+ } catch (InterruptedException e) {
+ // Someone asked us to stop.
+ break;
}
}
} finally {
[commons-vfs] 02/08: Fix PMD UselessParentheses.
Posted by gg...@apache.org.
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
commit 0817f0e67fabe8ae46eb7fa6a9d8ecb0941dab9b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 21:08:14 2021 -0500
Fix PMD UselessParentheses.
---
.../org/apache/commons/vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/UriParser.java | 10 +++++-----
.../org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java | 2 +-
.../commons/vfs2/provider/ram/RamFileRandomAccessContent.java | 6 +++---
.../main/java/org/apache/commons/vfs2/tasks/DeleteTask.java | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
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 4cea992..3798867 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
@@ -911,7 +911,7 @@ public class DefaultFileSystemManager implements FileSystemManager {
String scheme = UriParser.extractScheme(getSchemes(), buffer.toString());
// Determine whether to prepend the base path
- if (name.isEmpty() || (scheme == null && buffer.charAt(0) != FileName.SEPARATOR_CHAR)) {
+ if (name.isEmpty() || scheme == null && buffer.charAt(0) != FileName.SEPARATOR_CHAR) {
// Supplied path is not absolute
if (!VFS.isUriStyle()) {
// when using URIs the parent already do have the trailing "/"
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 d321e59..6dd9984 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
@@ -102,7 +102,7 @@ public final class UriParser {
count -= 2;
} else if (fileNameParser.encodeCharacter(ch)) {
// Encode
- final char[] digits = { Character.forDigit((ch >> BITS_IN_HALF_BYTE) & LOW_MASK, HEX_BASE),
+ final char[] digits = { Character.forDigit(ch >> BITS_IN_HALF_BYTE & LOW_MASK, HEX_BASE),
Character.forDigit(ch & LOW_MASK, HEX_BASE) };
buffer.setCharAt(index, '%');
buffer.insert(index + 1, digits);
@@ -244,7 +244,7 @@ public final class UriParser {
}
if (match) {
// Encode
- final char[] digits = { Character.forDigit((ch >> BITS_IN_HALF_BYTE) & LOW_MASK, HEX_BASE),
+ final char[] digits = { Character.forDigit(ch >> BITS_IN_HALF_BYTE & LOW_MASK, HEX_BASE),
Character.forDigit(ch & LOW_MASK, HEX_BASE) };
buffer.setCharAt(index, '%');
buffer.insert(index + 1, digits);
@@ -260,7 +260,7 @@ public final class UriParser {
final char ch = buffer.charAt(index);
if (Arrays.binarySearch(allowed, ch) < 0) {
// Encode
- final char[] digits = {Character.forDigit((ch >> BITS_IN_HALF_BYTE) & LOW_MASK, HEX_BASE), Character.forDigit(ch & LOW_MASK, HEX_BASE)};
+ final char[] digits = {Character.forDigit(ch >> BITS_IN_HALF_BYTE & LOW_MASK, HEX_BASE), Character.forDigit(ch & LOW_MASK, HEX_BASE)};
buffer.setCharAt(index, '%');
buffer.insert(index + 1, digits);
index += 2;
@@ -411,11 +411,11 @@ public final class UriParser {
return scheme.intern();
}
- if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
+ if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z') {
// A scheme character
continue;
}
- if (pos > 0 && ((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.')) {
+ if (pos > 0 && (ch >= '0' && ch <= '9' || ch == '+' || ch == '-' || ch == '.')) {
// A scheme character (these are not allowed as the first
// character of the scheme, but can be used as subsequent
// characters.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
index a61a51d..4328d45 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
@@ -209,7 +209,7 @@ public final class FtpClientFactory {
}
final Boolean userDirIsRoot = builder.getUserDirIsRoot(fileSystemOptions);
- if ((workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue())) && !client.changeWorkingDirectory(workingDirectory)) {
+ if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()) && !client.changeWorkingDirectory(workingDirectory)) {
throw new FileSystemException("vfs.provider.ftp/change-work-directory.error",
workingDirectory);
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
index 8915554..e2e24b2 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
@@ -383,9 +383,9 @@ public class RamFileRandomAccessContent implements RandomAccessContent {
* @return A long.
*/
public static long toLong(final byte[] b) {
- return ((((long) b[7]) & BYTE_VALUE_MASK) + ((((long) b[6]) & BYTE_VALUE_MASK) << 8) + ((((long) b[5]) & BYTE_VALUE_MASK) << 16)
+ return (((long) b[7]) & BYTE_VALUE_MASK) + ((((long) b[6]) & BYTE_VALUE_MASK) << 8) + ((((long) b[5]) & BYTE_VALUE_MASK) << 16)
+ ((((long) b[4]) & BYTE_VALUE_MASK) << 24) + ((((long) b[3]) & BYTE_VALUE_MASK) << 32) + ((((long) b[2]) & BYTE_VALUE_MASK) << 40)
- + ((((long) b[1]) & BYTE_VALUE_MASK) << 48) + ((((long) b[0]) & BYTE_VALUE_MASK) << 56));
+ + ((((long) b[1]) & BYTE_VALUE_MASK) << 48) + ((((long) b[0]) & BYTE_VALUE_MASK) << 56);
}
/**
@@ -431,7 +431,7 @@ public class RamFileRandomAccessContent implements RandomAccessContent {
* @return A short.
*/
public static int toUnsignedShort(final byte[] b) {
- return ((b[1] & BYTE_VALUE_MASK) + ((b[0] & BYTE_VALUE_MASK) << 8));
+ return (b[1] & BYTE_VALUE_MASK) + ((b[0] & BYTE_VALUE_MASK) << 8);
}
/*
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
index f45c1ff..965d1bc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
@@ -67,7 +67,7 @@ public class DeleteTask extends VfsTask {
*/
@Override
public void execute() throws BuildException {
- if ((srcDirUrl == null ? file == null : filesList == null)) {
+ if (srcDirUrl == null ? file == null : filesList == null) {
final String message = Messages.getString("vfs.tasks/delete.no-source-files.error");
throw new BuildException(message);
}
[commons-vfs] 06/08: Fix PMD and unlikely but possible NPE and throw appropriate exception instead.
Posted by gg...@apache.org.
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
commit 5e737636e5b2e0735ac5b61078a47fdb86758a5e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 22:12:55 2021 -0500
Fix PMD and unlikely but possible NPE and throw appropriate exception
instead.
Fix PMD: Don't use octal literals.
---
.../vfs2/provider/AbstractRandomAccessContent.java | 4 +++-
.../vfs2/provider/ram/RamFileRandomAccessContent.java | 3 +++
.../commons/vfs2/provider/tar/TarFileSystem.java | 13 ++++++++++---
.../apache/commons/vfs2/util/PosixPermissions.java | 19 ++++++++++---------
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractRandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractRandomAccessContent.java
index 0cc1208..26fa7f5 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractRandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractRandomAccessContent.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2.provider;
import java.io.IOException;
+import java.util.Objects;
import org.apache.commons.vfs2.RandomAccessContent;
import org.apache.commons.vfs2.util.RandomAccessMode;
@@ -29,6 +30,7 @@ import org.apache.commons.vfs2.util.RandomAccessMode;
public abstract class AbstractRandomAccessContent implements RandomAccessContent {
protected AbstractRandomAccessContent(final RandomAccessMode mode) {
+ Objects.requireNonNull(mode, "mode");
}
/**
@@ -40,7 +42,7 @@ public abstract class AbstractRandomAccessContent implements RandomAccessContent
@Override
@Deprecated
public String readLine() throws IOException {
- throw new UnsupportedOperationException("deprecated");
+ throw new UnsupportedOperationException("Deprecated");
}
@Override
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
index e2e24b2..927585b 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
@@ -23,6 +23,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
+import java.util.Objects;
import org.apache.commons.vfs2.RandomAccessContent;
import org.apache.commons.vfs2.util.RandomAccessMode;
@@ -76,6 +77,8 @@ public class RamFileRandomAccessContent implements RandomAccessContent {
* @param mode The access mode.
*/
public RamFileRandomAccessContent(final RamFileObject file, final RandomAccessMode mode) {
+ Objects.requireNonNull(file, "file");
+ Objects.requireNonNull(mode, "mode");
this.buf = file.getData().getContent();
this.file = file;
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
index 50f7c00..96fe00a 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
@@ -23,14 +23,17 @@ import java.nio.file.Files;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.zip.GZIPInputStream;
+import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileName;
+import org.apache.commons.vfs2.FileNotFoundException;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
@@ -133,11 +136,16 @@ public class TarFileSystem extends AbstractFileSystem {
}
public InputStream getInputStream(final TarArchiveEntry entry) throws FileSystemException {
+ Objects.requireNonNull(entry, "entry");
resetTarFile();
try {
- while (!tarFile.getNextEntry().equals(entry)) {
+ ArchiveEntry next;
+ while ((next = tarFile.getNextEntry()) != null) {
+ if (next.equals(entry)) {
+ return tarFile;
+ }
}
- return tarFile;
+ throw new FileNotFoundException(entry.toString());
} catch (final IOException e) {
throw new FileSystemException(e);
}
@@ -147,7 +155,6 @@ public class TarFileSystem extends AbstractFileSystem {
if (tarFile == null && this.file.exists()) {
recreateTarFile();
}
-
return tarFile;
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
index ac9fa9d..67cf313 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/PosixPermissions.java
@@ -31,50 +31,51 @@ public class PosixPermissions {
* Permission types.
*/
public enum Type {
+
/**
* User right readable.
*/
- UserReadable(00400),
+ UserReadable(0x100),
/**
* User right writable.
*/
- UserWritable(00200),
+ UserWritable(0x080),
/**
* User right executable.
*/
- UserExecutable(00100),
+ UserExecutable(0x040),
/**
* Group right readable.
*/
- GroupReadable(00040),
+ GroupReadable(0x020),
/**
* Group right writable.
*/
- GroupWritable(00020),
+ GroupWritable(0x010),
/**
* Group right executable.
*/
- GroupExecutable(00010),
+ GroupExecutable(0x008),
/**
* Other right readable.
*/
- OtherReadable(00004),
+ OtherReadable(0x004),
/**
* Other right writable.
*/
- OtherWritable(00002),
+ OtherWritable(0x002),
/**
* Other right executable.
*/
- OtherExecutable(00001);
+ OtherExecutable(0x001);
private final int mask;
[commons-vfs] 07/08: Fix PMD AvoidBranchingStatementAsLastInLoop & EmptyCatchBlock.
Posted by gg...@apache.org.
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
commit af7e1dd46070f6e4b9338fdf83d9e97bfd24dd11
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 22:15:57 2021 -0500
Fix PMD AvoidBranchingStatementAsLastInLoop & EmptyCatchBlock.
---
.../org/apache/commons/vfs2/provider/AbstractFileName.java | 3 ++-
.../java/org/apache/commons/vfs2/provider/UriParser.java | 14 ++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
index 874f062..12dcd97 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
@@ -279,7 +279,8 @@ public abstract class AbstractFileName implements FileName {
return UriParser.encode(uri, RESERVED_URI_CHARS);
} catch (final FileSystemException e) {
- // Default to base URI value
+ // Default to base URI value?
+ return uri;
}
}
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 6dd9984..a8f5ffb 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
@@ -415,15 +415,13 @@ public final class UriParser {
// A scheme character
continue;
}
- if (pos > 0 && (ch >= '0' && ch <= '9' || ch == '+' || ch == '-' || ch == '.')) {
- // A scheme character (these are not allowed as the first
- // character of the scheme, but can be used as subsequent
- // characters.
- continue;
+ if (!(pos > 0 && (ch >= '0' && ch <= '9' || ch == '+' || ch == '-' || ch == '.'))) {
+ // Not a scheme character
+ break;
}
-
- // Not a scheme character
- break;
+ // A scheme character (these are not allowed as the first
+ // character of the scheme, but can be used as subsequent
+ // characters.
}
// No scheme in URI
[commons-vfs] 04/08: Fix PMD UnusedPrivateField.
Posted by gg...@apache.org.
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
commit e551432b76b69cb9da28133f1b4d570e14bd433c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 21:10:10 2021 -0500
Fix PMD UnusedPrivateField.
---
.../java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
index e89a8e7..e43c2dc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
@@ -39,8 +39,6 @@ public class ResourceFileProvider extends AbstractFileProvider {
protected static final Collection<Capability> capabilities = Collections
.unmodifiableCollection(Arrays.asList(Capability.DISPATCHER));
- private static final int BUFFER_SIZE = 80;
-
public ResourceFileProvider() {
setFileNameParser(ResourceFileNameParser.getInstance());
}
[commons-vfs] 03/08: Fix PMD UnusedLocalVariable.
Posted by gg...@apache.org.
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
commit d8c3c0dae4802bbefcf6a9f476c06ca4e63d5c73
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 21:09:37 2021 -0500
Fix PMD UnusedLocalVariable.
---
.../main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java | 1 -
1 file changed, 1 deletion(-)
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 26712c3..be699d7 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
@@ -406,7 +406,6 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
findFiles(selector, true, files);
// Delete 'em
- final int count = files.size();
for (final FileObject fileObject : files) {
final AbstractFileObject file = FileObjectUtils.getAbstractFileObject(fileObject);
// file.attach();