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-compress.git
commit 1c13587ba8e2bf5188c92b07913fdd2b2e17197b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Aug 8 18:19:15 2020 -0400
- Remove unused imports.
- Use Java 7 diamonds.
- Better boolean test.
- Remove redundant modifiers.
- Remove redundant ;
---
.../commons/compress/archivers/examples/CloseableConsumer.java | 4 ++--
.../apache/commons/compress/archivers/zip/StreamCompressor.java | 8 ++++----
.../commons/compress/archivers/zip/ZipArchiveOutputStream.java | 7 ++-----
.../commons/compress/compressors/lz77support/Parameters.java | 2 +-
.../commons/compress/compressors/snappy/PureJavaCrc32C.java | 2 +-
src/main/java/org/apache/commons/compress/utils/ByteUtils.java | 2 +-
src/main/java/org/apache/commons/compress/utils/IOUtils.java | 1 -
src/test/java/org/apache/commons/compress/AbstractTestCase.java | 2 +-
.../org/apache/commons/compress/archivers/SevenZTestCase.java | 2 +-
.../org/apache/commons/compress/archivers/zip/Zip64SupportIT.java | 2 +-
.../org/apache/commons/compress/archivers/zip/ZipFileTest.java | 4 ++--
.../apache/commons/compress/utils/ServiceLoaderIteratorTest.java | 6 +++---
12 files changed, 19 insertions(+), 23 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/examples/CloseableConsumer.java
b/src/main/java/org/apache/commons/compress/archivers/examples/CloseableConsumer.java
index 39180fb..25ce537 100644
---
a/src/main/java/org/apache/commons/compress/archivers/examples/CloseableConsumer.java
+++
b/src/main/java/org/apache/commons/compress/archivers/examples/CloseableConsumer.java
@@ -34,7 +34,7 @@ public interface CloseableConsumer {
/**
* Closes the passed in Closeable immediately.
*/
- public static CloseableConsumer CLOSING_CONSUMER = new CloseableConsumer()
{
+ CloseableConsumer CLOSING_CONSUMER = new CloseableConsumer() {
@Override
public void accept(final Closeable c) throws IOException {
c.close();
@@ -44,7 +44,7 @@ public interface CloseableConsumer {
/**
* Completely ignores the passed in Closeable.
*/
- public static CloseableConsumer NULL_CONSUMER = new CloseableConsumer() {
+ CloseableConsumer NULL_CONSUMER = new CloseableConsumer() {
@Override
public void accept(final Closeable c) { }
};
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
b/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
index 1e8d68b..c9a9169 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
@@ -286,7 +286,7 @@ public abstract class StreamCompressor implements Closeable
{
}
@Override
- protected final void writeOut(final byte[] data, final int offset,
final int length)
+ protected void writeOut(final byte[] data, final int offset, final int
length)
throws IOException {
bs.writeOut(data, offset, length);
}
@@ -301,7 +301,7 @@ public abstract class StreamCompressor implements Closeable
{
}
@Override
- protected final void writeOut(final byte[] data, final int offset,
final int length)
+ protected void writeOut(final byte[] data, final int offset, final int
length)
throws IOException {
os.write(data, offset, length);
}
@@ -316,7 +316,7 @@ public abstract class StreamCompressor implements Closeable
{
}
@Override
- protected final void writeOut(final byte[] data, final int offset,
final int length)
+ protected void writeOut(final byte[] data, final int offset, final int
length)
throws IOException {
raf.write(data, offset, length);
}
@@ -332,7 +332,7 @@ public abstract class StreamCompressor implements Closeable
{
}
@Override
- protected final void writeOut(final byte[] data, final int offset,
final int length)
+ protected void writeOut(final byte[] data, final int offset, final int
length)
throws IOException {
channel.write(ByteBuffer.wrap(data, offset, length));
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index eef673b..e145e6d 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -31,7 +31,6 @@ import static
org.apache.commons.compress.archivers.zip.ZipShort.putShort;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -1196,12 +1195,10 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
ZipUtil.toDosTime(calendarInstance, ze.getTime(), buf,
LFH_TIME_OFFSET);
// CRC
- if (phased){
+ if (phased || !(zipMethod == DEFLATED || channel != null)){
putLong(ze.getCrc(), buf, LFH_CRC_OFFSET);
- } else if (zipMethod == DEFLATED || channel != null) {
- System.arraycopy(LZERO, 0, buf, LFH_CRC_OFFSET, WORD);
} else {
- putLong(ze.getCrc(), buf, LFH_CRC_OFFSET);
+ System.arraycopy(LZERO, 0, buf, LFH_CRC_OFFSET, WORD);
}
// compressed length
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
b/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
index 0c28f42..cd468a1 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
@@ -343,7 +343,7 @@ public final class Parameters {
return lazyThreshold;
}
- private static final boolean isPowerOfTwo(final int x) {
+ private static boolean isPowerOfTwo(final int x) {
// pre-condition: x > 0
return (x & (x - 1)) == 0;
}
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java
index bdde8a0..01cfaee 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java
@@ -96,7 +96,7 @@ final class PureJavaCrc32C implements Checksum {
}
@Override
- final public void update(final int b) {
+ public void update(final int b) {
crc = (crc >>> 8) ^ T[T8_0_START + ((crc ^ b) & 0xff)];
}
diff --git a/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
b/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
index 25dc150..01b5021 100644
--- a/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
+++ b/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
@@ -253,7 +253,7 @@ public final class ByteUtils {
}
}
- private static final void checkReadLength(final int length) {
+ private static void checkReadLength(final int length) {
if (length > 8) {
throw new IllegalArgumentException("Can't read more than eight
bytes into a long value");
}
diff --git a/src/main/java/org/apache/commons/compress/utils/IOUtils.java
b/src/main/java/org/apache/commons/compress/utils/IOUtils.java
index 54636c1..47bba81 100644
--- a/src/main/java/org/apache/commons/compress/utils/IOUtils.java
+++ b/src/main/java/org/apache/commons/compress/utils/IOUtils.java
@@ -23,7 +23,6 @@ import java.io.Closeable;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/src/test/java/org/apache/commons/compress/AbstractTestCase.java
b/src/test/java/org/apache/commons/compress/AbstractTestCase.java
index 08d1985..4bf61db 100644
--- a/src/test/java/org/apache/commons/compress/AbstractTestCase.java
+++ b/src/test/java/org/apache/commons/compress/AbstractTestCase.java
@@ -404,7 +404,7 @@ public abstract class AbstractTestCase {
}
}
- protected static interface StreamWrapper<I extends InputStream> {
+ protected interface StreamWrapper<I extends InputStream> {
I wrap(InputStream in) throws Exception;
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
index d593379..6f72f45 100644
--- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
@@ -225,7 +225,7 @@ public class SevenZTestCase extends AbstractTestCase {
final byte[] buf = new byte[1024];
int x = 0;
while (0 <= (x = archive.read(buf))) {
- ;
+
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
index ee3d5a4..467f3ea 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
@@ -2420,7 +2420,7 @@ public class Zip64SupportIT {
true, 65536L);
}
- static interface ZipOutputTest {
+ interface ZipOutputTest {
void test(File f, ZipArchiveOutputStream zos) throws IOException;
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
index d29c998..c2b6485 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
@@ -366,7 +366,7 @@ public class ZipFileTest {
}
zf = new ZipFile(new SeekableInMemoryByteChannel(data),
ZipEncodingHelper.UTF8);
- final Map<String, byte[]> content = new HashMap<String, byte[]>();
+ final Map<String, byte[]> content = new HashMap<>();
for (final ZipArchiveEntry entry: Collections.list(zf.getEntries())) {
content.put(entry.getName(),
IOUtils.toByteArray(zf.getInputStream(entry)));
}
@@ -396,7 +396,7 @@ public class ZipFileTest {
final File archive = getFile("mixed.zip");
zf = new ZipFile(archive);
- final Map<String, byte[]> content = new HashMap<String, byte[]>();
+ final Map<String, byte[]> content = new HashMap<>();
for (final ZipArchiveEntry entry: Collections.list(zf.getEntries())) {
content.put(entry.getName(),
IOUtils.toByteArray(zf.getInputStream(entry)));
}
diff --git
a/src/test/java/org/apache/commons/compress/utils/ServiceLoaderIteratorTest.java
b/src/test/java/org/apache/commons/compress/utils/ServiceLoaderIteratorTest.java
index e985f89..707f155 100644
---
a/src/test/java/org/apache/commons/compress/utils/ServiceLoaderIteratorTest.java
+++
b/src/test/java/org/apache/commons/compress/utils/ServiceLoaderIteratorTest.java
@@ -38,7 +38,7 @@ public class ServiceLoaderIteratorTest {
public void testNextThrowsNoSuchElementException() {
final Class<String> clasz = String.class;
- final ServiceLoaderIterator<String> serviceLoaderIterator = new
ServiceLoaderIterator<String>(clasz);
+ final ServiceLoaderIterator<String> serviceLoaderIterator = new
ServiceLoaderIterator<>(clasz);
serviceLoaderIterator.next();
@@ -49,7 +49,7 @@ public class ServiceLoaderIteratorTest {
public void testHasNextReturnsFalse() {
final Class<Object> clasz = Object.class;
- final ServiceLoaderIterator<Object> serviceLoaderIterator = new
ServiceLoaderIterator<Object>(clasz);
+ final ServiceLoaderIterator<Object> serviceLoaderIterator = new
ServiceLoaderIterator<>(clasz);
final boolean result = serviceLoaderIterator.hasNext();
assertFalse(result);
@@ -61,7 +61,7 @@ public class ServiceLoaderIteratorTest {
public void testRemoveThrowsUnsupportedOperationException() {
final Class<Integer> clasz = Integer.class;
- final ServiceLoaderIterator<Integer> serviceLoaderIterator = new
ServiceLoaderIterator<Integer>(clasz);
+ final ServiceLoaderIterator<Integer> serviceLoaderIterator = new
ServiceLoaderIterator<>(clasz);
serviceLoaderIterator.remove();
