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:20 UTC
[commons-vfs] 01/08: Fix PMD issue: Remove use of implied final in try-with-resources.
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();
}
}