You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2021/05/22 13:19:37 UTC
[commons-compress] branch master updated: COMPRESS-579 - Remove
redundant local variable
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push:
new 8dbf582 COMPRESS-579 - Remove redundant local variable
new 8fc60bf Merge pull request #195 from arturobernalg/feature/COMPRESS-579
8dbf582 is described below
commit 8dbf582b9e46573025fc80dc9a40b7d45bcf9f56
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat May 22 14:14:29 2021 +0200
COMPRESS-579 - Remove redundant local variable
---
src/test/java/org/apache/commons/compress/archivers/ArTestCase.java | 5 ++---
.../java/org/apache/commons/compress/archivers/CpioTestCase.java | 3 +--
src/test/java/org/apache/commons/compress/archivers/TarTestCase.java | 2 +-
.../java/org/apache/commons/compress/archivers/tar/BigFilesIT.java | 2 +-
.../commons/compress/archivers/tar/TarArchiveOutputStreamTest.java | 5 ++---
.../java/org/apache/commons/compress/compressors/BZip2TestCase.java | 3 +--
.../commons/compress/compressors/snappy/SnappyRoundtripTest.java | 3 +--
.../commons/compress/utils/FixedLengthBlockOutputStreamTest.java | 3 +--
8 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java b/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
index 755a9ad..ab186db 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
@@ -81,9 +81,8 @@ public final class ArTestCase extends AbstractTestCase {
}
// UnArArchive Operation
- final File input = output;
- try (final InputStream is = Files.newInputStream(input.toPath());
- final ArchiveInputStream in = new ArchiveStreamFactory()
+ try (final InputStream is = Files.newInputStream(output.toPath());
+ final ArchiveInputStream in = new ArchiveStreamFactory()
.createArchiveInputStream(new BufferedInputStream(is))) {
final ArArchiveEntry entry = (ArArchiveEntry) in.getNextEntry();
diff --git a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
index c61c71f..32edacb 100644
--- a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
@@ -89,8 +89,7 @@ public final class CpioTestCase extends AbstractTestCase {
}
// Unarchive Operation
- final File input = output;
- final InputStream is = Files.newInputStream(input.toPath());
+ final InputStream is = Files.newInputStream(output.toPath());
final ArchiveInputStream in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("cpio", is);
diff --git a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java b/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
index e787796..d75ef8f 100644
--- a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
@@ -569,7 +569,7 @@ public final class TarTestCase extends AbstractTestCase {
}
private String createLongName(final int nameLength) {
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
for (int i = 0; i < nameLength; i++) {
buffer.append('a');
}
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
index 9c58a48..447262c 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
@@ -76,7 +76,7 @@ public class BigFilesIT extends AbstractTestCase {
private void readFileBiggerThan8GByte(final String name) throws Exception {
try (InputStream in = new BufferedInputStream(Files.newInputStream(getPath(name)));
GzipCompressorInputStream gzin = new GzipCompressorInputStream(in);
- TarArchiveInputStream tin = new TarArchiveInputStream(gzin);) {
+ TarArchiveInputStream tin = new TarArchiveInputStream(gzin)) {
final TarArchiveEntry e = tin.getNextTarEntry();
assertNotNull(e);
assertEquals(8200L * 1024 * 1024, e.getSize());
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
index 874a2ff..da21346 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
@@ -757,17 +757,16 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase {
@Test
public void testLongNameMd5Hash() throws Exception {
final String longFileName = "a/considerably/longer/file/name/which/forces/use/of/the/long/link/header/which/appears/to/always/use/the/current/time/as/modification/date";
- final String fname = longFileName;
final Date modificationDate = new Date();
- final byte[] archive1 = createTarArchiveContainingOneDirectory(fname, modificationDate);
+ final byte[] archive1 = createTarArchiveContainingOneDirectory(longFileName, modificationDate);
final byte[] digest1 = MessageDigest.getInstance("MD5").digest(archive1);
// let a second elapse otherwise the modification dates will be equal
Thread.sleep(1000L);
// now recreate exactly the same tar file
- final byte[] archive2 = createTarArchiveContainingOneDirectory(fname, modificationDate);
+ final byte[] archive2 = createTarArchiveContainingOneDirectory(longFileName, modificationDate);
// and I would expect the MD5 hash to be the same, but for long names it isn't
final byte[] digest2 = MessageDigest.getInstance("MD5").digest(archive2);
diff --git a/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java b/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
index 797283a..56b12be 100644
--- a/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
@@ -48,8 +48,7 @@ public final class BZip2TestCase extends AbstractTestCase {
final File decompressed = new File(dir, "decompressed.txt");
{
- final File toDecompress = output;
- final InputStream is = Files.newInputStream(toDecompress.toPath());
+ final InputStream is = Files.newInputStream(output.toPath());
final CompressorInputStream in =
new CompressorStreamFactory().createCompressorInputStream("bzip2", is);
final OutputStream os = Files.newOutputStream(decompressed.toPath());
diff --git a/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java
index ecc5dee..669ffab 100644
--- a/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java
@@ -73,9 +73,8 @@ public final class SnappyRoundtripTest extends AbstractTestCase {
try (
SnappyCompressorInputStream sis = new SnappyCompressorInputStream(new ByteArrayInputStream(os.toByteArray()),
params.getWindowSize())) {
- final byte[] expected = input;
final byte[] actual = IOUtils.toByteArray(sis);
- Assert.assertArrayEquals(expected, actual);
+ Assert.assertArrayEquals(input, actual);
}
System.err.println("byte array" + " read after " + (System.currentTimeMillis() - start) + "ms");
}
diff --git a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
index 6752ff3..5d7e55d 100644
--- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
@@ -324,8 +324,7 @@ public class FixedLengthBlockOutputStreamTest {
private void checkIsOpen() throws IOException {
if (closed.get()) {
- final IOException e = new IOException("Closed");
- throw e;
+ throw new IOException("Closed");
}
}