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 ce1c3f0 COMPRESS-580 - Remove redundant operation
new 93aab64 Merge pull request #196 from
arturobernalg/feature/COMPRESS-580
ce1c3f0 is described below
commit ce1c3f0d6d3ef873d43fa1337821800de7cc77ce
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sat May 22 14:36:16 2021 +0200
COMPRESS-580 - Remove redundant operation
---
.../archivers/arj/ArjArchiveInputStream.java | 4 +--
.../commons/compress/archivers/sevenz/CLI.java | 2 +-
.../compress/archivers/sevenz/SevenZFile.java | 4 +--
.../compress/archivers/zip/ExtraFieldUtils.java | 4 +--
.../commons/compress/archivers/zip/ZipFile.java | 2 +-
.../apache/commons/compress/ArchiveUtilsTest.java | 2 +-
.../compress/archivers/cpio/CpioArchiveTest.java | 6 ++--
.../lz4/BlockLZ4CompressorRoundtripTest.java | 6 ++--
.../lz4/FramedLZ4CompressorRoundtripTest.java | 36 ++++++++++------------
.../compressors/z/ZCompressorInputStreamTest.java | 2 +-
10 files changed, 31 insertions(+), 37 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
index 8a420c0..b0c16b2 100644
---
a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
@@ -115,10 +115,10 @@ public class ArjArchiveInputStream extends
ArchiveInputStream {
buffer.write(nextByte);
}
if (charsetName != null) {
- return new String(buffer.toByteArray(), charsetName);
+ return buffer.toString(charsetName);
}
// intentionally using the default encoding as that's the contract
for a null charsetName
- return new String(buffer.toByteArray());
+ return buffer.toString();
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
index 0d1510d..dfa1c58 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
@@ -42,7 +42,7 @@ public class CLI {
if (!entry.isDirectory()) {
System.out.println(" " + getContentMethods(entry));
} else {
- System.out.println("");
+ System.out.println();
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 39d8b82..b0b5abf 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -178,7 +178,7 @@ public class SevenZFile implements Closeable {
* @since 1.19
*/
public SevenZFile(final SeekableByteChannel channel, final
SevenZFileOptions options) throws IOException {
- this(channel, DEFAULT_FILE_NAME, (char[]) null, options);
+ this(channel, DEFAULT_FILE_NAME, null, options);
}
/**
@@ -371,7 +371,7 @@ public class SevenZFile implements Closeable {
* @since 1.19
*/
public SevenZFile(final File fileName, final SevenZFileOptions options)
throws IOException {
- this(fileName, (char[]) null, options);
+ this(fileName, null, options);
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
index 84e769d..8908628 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
@@ -68,11 +68,11 @@ public class ExtraFieldUtils {
final ZipExtraField ze = (ZipExtraField) c.newInstance();
implementations.put(ze.getHeaderId(), c);
} catch (final ClassCastException cc) { // NOSONAR
- throw new RuntimeException(c + " doesn\'t implement
ZipExtraField"); //NOSONAR
+ throw new RuntimeException(c + " doesn't implement
ZipExtraField"); //NOSONAR
} catch (final InstantiationException ie) { // NOSONAR
throw new RuntimeException(c + " is not a concrete class");
//NOSONAR
} catch (final IllegalAccessException ie) { // NOSONAR
- throw new RuntimeException(c + "\'s no-arg constructor is not
public"); //NOSONAR
+ throw new RuntimeException(c + "'s no-arg constructor is not
public"); //NOSONAR
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index a3a65a4..8792563 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -475,7 +475,7 @@ public class ZipFile implements Closeable {
public Iterable<ZipArchiveEntry> getEntries(final String name) {
final List<ZipArchiveEntry> entriesOfThatName = nameMap.get(name);
return entriesOfThatName != null ? entriesOfThatName
- : Collections.<ZipArchiveEntry>emptyList();
+ : Collections.emptyList();
}
/**
diff --git a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
index 5ee9a43..ebec4f2 100644
--- a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
@@ -133,7 +133,7 @@ public class ArchiveUtilsTest extends AbstractTestCase {
@Test
public void testIsEqual() {
- assertTrue(ArchiveUtils.isEqual((byte[]) null, 0, 0, (byte[]) null, 0,
0));
+ assertTrue(ArchiveUtils.isEqual(null, 0, 0, null, 0, 0));
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveTest.java
b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveTest.java
index 128289b..dc76db4 100644
---
a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveTest.java
@@ -34,12 +34,10 @@ public class CpioArchiveTest {
@Parameters(name = "using {0}")
public static Collection<Object[]> factory() {
- return Arrays.asList(new Object[][] {
- new Object[] { CpioConstants.FORMAT_NEW },
+ return Arrays.asList(new Object[] { CpioConstants.FORMAT_NEW },
new Object[] { CpioConstants.FORMAT_NEW_CRC },
new Object[] { CpioConstants.FORMAT_OLD_ASCII },
- new Object[] { CpioConstants.FORMAT_OLD_BINARY },
- });
+ new Object[] { CpioConstants.FORMAT_OLD_BINARY });
}
private final short format;
diff --git
a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
index a36d8e0..49595b4 100644
---
a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
@@ -38,13 +38,11 @@ public final class BlockLZ4CompressorRoundtripTest extends
AbstractTestCase {
@org.junit.runners.Parameterized.Parameters(name = "using {0}")
public static Collection<Object[]> factory() {
- return Arrays.asList(new Object[][] {
- new Object[] { "default",
BlockLZ4CompressorOutputStream.createParameterBuilder().build() },
+ return Arrays.asList(new Object[] { "default",
BlockLZ4CompressorOutputStream.createParameterBuilder().build() },
new Object[] { "tuned for speed",
BlockLZ4CompressorOutputStream.createParameterBuilder().tunedForSpeed().build()
},
new Object[] { "tuned for compression ratio",
-
BlockLZ4CompressorOutputStream.createParameterBuilder().tunedForCompressionRatio().build()
}
- });
+
BlockLZ4CompressorOutputStream.createParameterBuilder().tunedForCompressionRatio().build()
});
}
private final String config;
diff --git
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
index dbf0458..4d35d99 100644
---
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
@@ -39,25 +39,23 @@ public final class FramedLZ4CompressorRoundtripTest extends
AbstractTestCase {
@Parameters(name = "using {0}")
public static Collection<Object[]> factory() {
- return Arrays.asList(new Object[][] {
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.K64)
},
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.K256)
},
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M1)
},
- new Object[] { FramedLZ4CompressorOutputStream.Parameters.DEFAULT
},
- // default without content checksum
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M4,
- false, false, false) },
- // default with block checksum
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M4,
- true, true, false) },
- // small blocksize (so we get enough blocks) and enabled block
dependency, otherwise defaults
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.K64,
- true, false, true) },
- // default, tuned for speed
- new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M4,
- true, false, false,
BlockLZ4CompressorOutputStream.createParameterBuilder()
- .tunedForSpeed().build()) },
- });
+ return Arrays.asList(new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.K64)
},
+ new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.K256)
},
+ new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M1)
},
+ new Object[] {
FramedLZ4CompressorOutputStream.Parameters.DEFAULT },
+ // default without content checksum
+ new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M4,
+ false, false, false) },
+ // default with block checksum
+ new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M4,
+ true, true, false) },
+ // small blocksize (so we get enough blocks) and enabled block
dependency, otherwise defaults
+ new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.K64,
+ true, false, true) },
+ // default, tuned for speed
+ new Object[] { new
FramedLZ4CompressorOutputStream.Parameters(FramedLZ4CompressorOutputStream.BlockSize.M4,
+ true, false, false,
BlockLZ4CompressorOutputStream.createParameterBuilder()
+ .tunedForSpeed().build()) });
}
private final FramedLZ4CompressorOutputStream.Parameters params;
diff --git
a/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
index 5935173..6b28d0e 100644
---
a/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
@@ -42,7 +42,7 @@ public class ZCompressorInputStreamTest {
@Test(expected = IOException.class)
public void testFailsToCreateZCompressorInputStreamAndThrowsIOException()
throws IOException {
- final SequenceInputStream sequenceInputStream = new
SequenceInputStream(Collections.<InputStream>emptyEnumeration());
+ final SequenceInputStream sequenceInputStream = new
SequenceInputStream(Collections.emptyEnumeration());
final ZCompressorInputStream zCompressorInputStream = new
ZCompressorInputStream(sequenceInputStream);
}
