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 2016/04/10 06:18:40 UTC
[24/46] commons-compress git commit: Add missing '@Override'
annotations to implementations of interface methods.
Add missing '@Override' annotations to implementations of interface
methods.
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/ab17a705
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/ab17a705
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/ab17a705
Branch: refs/heads/COMPRESS-207
Commit: ab17a70527ee46e3632be8911a31931fc3e78183
Parents: 35d616f
Author: ggregory <gg...@apache.org>
Authored: Sat Apr 9 09:04:17 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sat Apr 9 09:04:17 2016 -0700
----------------------------------------------------------------------
.../compress/archivers/ar/ArArchiveEntry.java | 4 ++++
.../compress/archivers/arj/ArjArchiveEntry.java | 4 ++++
.../archivers/cpio/CpioArchiveEntry.java | 4 ++++
.../archivers/dump/DumpArchiveEntry.java | 4 ++++
.../archivers/dump/DumpArchiveInputStream.java | 1 +
.../archivers/sevenz/SevenZArchiveEntry.java | 4 ++++
.../compress/archivers/sevenz/SevenZFile.java | 1 +
.../archivers/sevenz/SevenZOutputFile.java | 1 +
.../compress/archivers/tar/TarArchiveEntry.java | 4 ++++
.../compress/archivers/tar/TarUtils.java | 3 +++
.../zip/AbstractUnicodeExtraField.java | 6 +++++
.../compress/archivers/zip/AsiExtraField.java | 7 ++++++
.../archivers/zip/FallbackZipEncoding.java | 3 +++
.../compress/archivers/zip/JarMarker.java | 7 ++++++
.../compress/archivers/zip/NioZipEncoding.java | 3 +++
.../archivers/zip/PKWareExtraHeader.java | 7 ++++++
.../zip/ParallelScatterZipCreator.java | 2 ++
.../archivers/zip/ScatterZipOutputStream.java | 1 +
.../archivers/zip/Simple8BitZipEncoding.java | 4 ++++
.../archivers/zip/StreamCompressor.java | 1 +
.../archivers/zip/UnicodeCommentExtraField.java | 1 +
.../archivers/zip/UnicodePathExtraField.java | 1 +
.../zip/UnparseableExtraFieldData.java | 7 ++++++
.../archivers/zip/UnrecognizedExtraField.java | 7 ++++++
.../compress/archivers/zip/X000A_NTFS.java | 7 ++++++
.../archivers/zip/X5455_ExtendedTimestamp.java | 7 ++++++
.../compress/archivers/zip/X7875_NewUnix.java | 7 ++++++
.../zip/Zip64ExtendedInformationExtraField.java | 7 ++++++
.../compress/archivers/zip/ZipArchiveEntry.java | 1 +
.../commons/compress/archivers/zip/ZipFile.java | 2 ++
.../compress/changes/ChangeSetPerformer.java | 6 +++++
.../compressors/snappy/PureJavaCrc32C.java | 12 ++++++----
.../FileBasedScatterGatherBackingStore.java | 4 ++++
.../commons/compress/utils/BitInputStream.java | 1 +
.../commons/compress/ArchiveReadTest.java | 1 +
.../compress/archivers/LongPathTest.java | 1 +
.../compress/archivers/LongSymLinkTest.java | 1 +
.../commons/compress/archivers/ZipTestCase.java | 1 +
.../archivers/memory/MemoryArchiveEntry.java | 4 ++++
.../zip/ParallelScatterZipCreatorTest.java | 3 +++
.../archivers/zip/ScatterSampleTest.java | 1 +
.../zip/ScatterZipOutputStreamTest.java | 1 +
.../compress/archivers/zip/Zip64SupportIT.java | 25 +++++++++++++++++---
.../compressors/FramedSnappyTestCase.java | 3 +++
.../commons/compress/compressors/ZTestCase.java | 3 +++
.../commons/compress/utils/IOUtilsTest.java | 3 +++
46 files changed, 181 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
index ab419fd..36a8b40 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
@@ -117,10 +117,12 @@ public class ArArchiveEntry implements ArchiveEntry {
0, 0, DEFAULT_MODE, inputFile.lastModified() / 1000);
}
+ @Override
public long getSize() {
return this.getLength();
}
+ @Override
public String getName() {
return name;
}
@@ -145,6 +147,7 @@ public class ArArchiveEntry implements ArchiveEntry {
return lastModified;
}
+ @Override
public Date getLastModifiedDate() {
return new Date(1000 * getLastModified());
}
@@ -153,6 +156,7 @@ public class ArArchiveEntry implements ArchiveEntry {
return length;
}
+ @Override
public boolean isDirectory() {
return false;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
index a033a14..4a080b2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
@@ -46,6 +46,7 @@ public class ArjArchiveEntry implements ArchiveEntry {
*
* @return This entry's name.
*/
+ @Override
public String getName() {
if ((localFileHeader.arjFlags & LocalFileHeader.Flags.PATHSYM) != 0) {
return localFileHeader.name.replaceAll("/",
@@ -59,6 +60,7 @@ public class ArjArchiveEntry implements ArchiveEntry {
*
* @return This entry's file size.
*/
+ @Override
public long getSize() {
return localFileHeader.originalSize;
}
@@ -67,6 +69,7 @@ public class ArjArchiveEntry implements ArchiveEntry {
*
* @return True if the entry refers to a directory
*/
+ @Override
public boolean isDirectory() {
return localFileHeader.fileType == LocalFileHeader.FileTypes.DIRECTORY;
}
@@ -86,6 +89,7 @@ public class ArjArchiveEntry implements ArchiveEntry {
*
* @return the last modified date
*/
+ @Override
public Date getLastModifiedDate() {
long ts = isHostOsUnix() ? localFileHeader.dateTimeModified * 1000l
: ZipUtil.dosToJavaTime(0xFFFFFFFFL & localFileHeader.dateTimeModified);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
index 4ea1a54..10d40d2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
@@ -422,6 +422,7 @@ public class CpioArchiveEntry implements CpioConstants, ArchiveEntry {
* @return Returns the filesize.
* @see org.apache.commons.compress.archivers.ArchiveEntry#getSize()
*/
+ @Override
public long getSize() {
return this.filesize;
}
@@ -518,6 +519,7 @@ public class CpioArchiveEntry implements CpioConstants, ArchiveEntry {
*
* @return Returns the name.
*/
+ @Override
public String getName() {
return this.name;
}
@@ -581,6 +583,7 @@ public class CpioArchiveEntry implements CpioConstants, ArchiveEntry {
return this.mtime;
}
+ @Override
public Date getLastModifiedDate() {
return new Date(1000 * getTime());
}
@@ -617,6 +620,7 @@ public class CpioArchiveEntry implements CpioConstants, ArchiveEntry {
*
* @return TRUE if this entry is a directory.
*/
+ @Override
public boolean isDirectory() {
return CpioUtil.fileType(mode) == C_ISDIR;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
index e5c7a01..0a3d546 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
@@ -563,6 +563,7 @@ public class DumpArchiveEntry implements ArchiveEntry {
* Returns the name of the entry.
* @return the name of the entry.
*/
+ @Override
public String getName() {
return name;
}
@@ -596,6 +597,7 @@ public class DumpArchiveEntry implements ArchiveEntry {
* The last modified date.
* @return the last modified date
*/
+ @Override
public Date getLastModifiedDate() {
return new Date(mtime);
}
@@ -604,6 +606,7 @@ public class DumpArchiveEntry implements ArchiveEntry {
* Is this a directory?
* @return whether this is a directory
*/
+ @Override
public boolean isDirectory() {
return type == TYPE.DIRECTORY;
}
@@ -693,6 +696,7 @@ public class DumpArchiveEntry implements ArchiveEntry {
* Returns the size of the entry.
* @return the size
*/
+ @Override
public long getSize() {
return isDirectory() ? SIZE_UNKNOWN : size;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
index fa8f6a7..1b4ac3f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
@@ -138,6 +138,7 @@ public class DumpArchiveInputStream extends ArchiveInputStream {
// released first.
queue = new PriorityQueue<DumpArchiveEntry>(10,
new Comparator<DumpArchiveEntry>() {
+ @Override
public int compare(DumpArchiveEntry p, DumpArchiveEntry q) {
if (p.getOriginalName() == null || q.getOriginalName() == null) {
return Integer.MAX_VALUE;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
index b15bb7d..c6317ce 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
@@ -57,6 +57,7 @@ public class SevenZArchiveEntry implements ArchiveEntry {
*
* @return This entry's name.
*/
+ @Override
public String getName() {
return name;
}
@@ -91,6 +92,7 @@ public class SevenZArchiveEntry implements ArchiveEntry {
*
* @return True if this entry is a directory.
*/
+ @Override
public boolean isDirectory() {
return isDirectory;
}
@@ -195,6 +197,7 @@ public class SevenZArchiveEntry implements ArchiveEntry {
* last modified date.
* @return the last modified date
*/
+ @Override
public Date getLastModifiedDate() {
if (hasLastModifiedDate) {
return ntfsTimeToJavaTime(lastModifiedDate);
@@ -404,6 +407,7 @@ public class SevenZArchiveEntry implements ArchiveEntry {
*
* @return This entry's file size.
*/
+ @Override
public long getSize() {
return size;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
----------------------------------------------------------------------
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 2512eec..ab6198e 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
@@ -126,6 +126,7 @@ public class SevenZFile implements Closeable {
* Closes the archive.
* @throws IOException if closing the file fails
*/
+ @Override
public void close() throws IOException {
if (file != null) {
try {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
index 1886898..4e273a2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
@@ -106,6 +106,7 @@ public class SevenZOutputFile implements Closeable {
*
* @throws IOException on error
*/
+ @Override
public void close() throws IOException {
if (!finished) {
finish();
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 1938f67..4fac7d5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -419,6 +419,7 @@ public class TarArchiveEntry implements TarConstants, ArchiveEntry {
*
* @return This entry's name.
*/
+ @Override
public String getName() {
return name;
}
@@ -629,6 +630,7 @@ public class TarArchiveEntry implements TarConstants, ArchiveEntry {
return new Date(modTime * MILLIS_PER_SECOND);
}
+ @Override
public Date getLastModifiedDate() {
return getModTime();
}
@@ -667,6 +669,7 @@ public class TarArchiveEntry implements TarConstants, ArchiveEntry {
*
* @return This entry's file size.
*/
+ @Override
public long getSize() {
return size;
}
@@ -841,6 +844,7 @@ public class TarArchiveEntry implements TarConstants, ArchiveEntry {
*
* @return True if this entry is a directory.
*/
+ @Override
public boolean isDirectory() {
if (file != null) {
return file.isDirectory();
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
index 28f7164..ba850a5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
@@ -45,8 +45,10 @@ public class TarUtils {
* ZipEncoding.
*/
static final ZipEncoding FALLBACK_ENCODING = new ZipEncoding() {
+ @Override
public boolean canEncode(String name) { return true; }
+ @Override
public ByteBuffer encode(String name) {
final int length = name.length();
byte[] buf = new byte[length];
@@ -58,6 +60,7 @@ public class TarUtils {
return ByteBuffer.wrap(buf);
}
+ @Override
public String decode(byte[] buffer) {
final int length = buffer.length;
StringBuilder result = new StringBuilder(length);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
index 4dbfc40..21d5edf 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
@@ -127,6 +127,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
data = null;
}
+ @Override
public byte[] getCentralDirectoryData() {
if (data == null) {
this.assembleData();
@@ -139,6 +140,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
return b;
}
+ @Override
public ZipShort getCentralDirectoryLength() {
if (data == null) {
assembleData();
@@ -146,14 +148,17 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
return new ZipShort(data != null ? data.length : 0);
}
+ @Override
public byte[] getLocalFileDataData() {
return getCentralDirectoryData();
}
+ @Override
public ZipShort getLocalFileDataLength() {
return getCentralDirectoryLength();
}
+ @Override
public void parseFromLocalFileData(byte[] buffer, int offset, int length)
throws ZipException {
@@ -178,6 +183,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
* Doesn't do anything special since this class always uses the
* same data in central directory and local file data.
*/
+ @Override
public void parseFromCentralDirectoryData(byte[] buffer, int offset,
int length)
throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
index a2dc1c3..983422a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
@@ -89,6 +89,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* The Header-ID.
* @return the value for the header id for this extrafield
*/
+ @Override
public ZipShort getHeaderId() {
return HEADER_ID;
}
@@ -98,6 +99,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* Header-ID or length specifier.
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(WORD // CRC
+ 2 // Mode
@@ -112,6 +114,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* Delegate to local file data.
* @return the centralDirectory length
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
return getLocalFileDataLength();
}
@@ -121,6 +124,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* or length specifier.
* @return get the data
*/
+ @Override
public byte[] getLocalFileDataData() {
// CRC will be added later
byte[] data = new byte[getLocalFileDataLength().getValue() - WORD];
@@ -153,6 +157,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* Delegate to local file data.
* @return the local file data
*/
+ @Override
public byte[] getCentralDirectoryData() {
return getLocalFileDataData();
}
@@ -258,6 +263,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* @param length the number of bytes in the array from offset
* @throws ZipException on error
*/
+ @Override
public void parseFromLocalFileData(byte[] data, int offset, int length)
throws ZipException {
@@ -295,6 +301,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
* Doesn't do anything special since this class always uses the
* same data in central directory and local file data.
*/
+ @Override
public void parseFromCentralDirectoryData(byte[] buffer, int offset,
int length)
throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java b/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
index 14bab4a..4551b79 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
@@ -65,6 +65,7 @@ class FallbackZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#canEncode(java.lang.String)
*/
+ @Override
public boolean canEncode(String name) {
return true;
}
@@ -73,6 +74,7 @@ class FallbackZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#encode(java.lang.String)
*/
+ @Override
public ByteBuffer encode(String name) throws IOException {
if (this.charsetName == null) { // i.e. use default charset, see no-args constructor
return ByteBuffer.wrap(name.getBytes());
@@ -84,6 +86,7 @@ class FallbackZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#decode(byte[])
*/
+ @Override
public String decode(byte[] data) throws IOException {
if (this.charsetName == null) { // i.e. use default charset, see no-args constructor
return new String(data);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/JarMarker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/JarMarker.java b/src/main/java/org/apache/commons/compress/archivers/zip/JarMarker.java
index f5dde85..81d9053 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/JarMarker.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/JarMarker.java
@@ -48,6 +48,7 @@ public final class JarMarker implements ZipExtraField {
* The Header-ID.
* @return the header id
*/
+ @Override
public ZipShort getHeaderId() {
return ID;
}
@@ -57,6 +58,7 @@ public final class JarMarker implements ZipExtraField {
* Header-ID or length specifier.
* @return 0
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return NULL;
}
@@ -66,6 +68,7 @@ public final class JarMarker implements ZipExtraField {
* Header-ID or length specifier.
* @return 0
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
return NULL;
}
@@ -75,6 +78,7 @@ public final class JarMarker implements ZipExtraField {
* or length specifier.
* @return the data
*/
+ @Override
public byte[] getLocalFileDataData() {
return NO_BYTES;
}
@@ -84,6 +88,7 @@ public final class JarMarker implements ZipExtraField {
* length specifier.
* @return the data
*/
+ @Override
public byte[] getCentralDirectoryData() {
return NO_BYTES;
}
@@ -96,6 +101,7 @@ public final class JarMarker implements ZipExtraField {
*
* @throws ZipException on error
*/
+ @Override
public void parseFromLocalFileData(byte[] data, int offset, int length)
throws ZipException {
if (length != 0) {
@@ -107,6 +113,7 @@ public final class JarMarker implements ZipExtraField {
* Doesn't do anything special since this class always uses the
* same data in central directory and local file data.
*/
+ @Override
public void parseFromCentralDirectoryData(byte[] buffer, int offset,
int length)
throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
index f93192c..9ec15a5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
@@ -55,6 +55,7 @@ class NioZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#canEncode(java.lang.String)
*/
+ @Override
public boolean canEncode(String name) {
CharsetEncoder enc = this.charset.newEncoder();
enc.onMalformedInput(CodingErrorAction.REPORT);
@@ -67,6 +68,7 @@ class NioZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#encode(java.lang.String)
*/
+ @Override
public ByteBuffer encode(String name) {
CharsetEncoder enc = this.charset.newEncoder();
@@ -114,6 +116,7 @@ class NioZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#decode(byte[])
*/
+ @Override
public String decode(byte[] data) throws IOException {
return this.charset.newDecoder()
.onMalformedInput(CodingErrorAction.REPORT)
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
index f733a1b..ce52c6f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
@@ -86,6 +86,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
*
* @return the header id
*/
+ @Override
public ZipShort getHeaderId() {
return headerId;
}
@@ -106,6 +107,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
*
* @return the length of the local data
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(localData != null ? localData.length : 0);
}
@@ -115,6 +117,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
*
* @return the local data
*/
+ @Override
public byte[] getLocalFileDataData() {
return ZipUtil.copy(localData);
}
@@ -135,6 +138,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
*
* @return the central data length
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
if (centralData != null) {
return new ZipShort(centralData.length);
@@ -147,6 +151,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
*
* @return the central data if present, else return the local file data
*/
+ @Override
public byte[] getCentralDirectoryData() {
if (centralData != null) {
return ZipUtil.copy(centralData);
@@ -163,6 +168,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
* the number of bytes to use in the data array.
* @see ZipExtraField#parseFromLocalFileData(byte[], int, int)
*/
+ @Override
public void parseFromLocalFileData(byte[] data, int offset, int length) {
byte[] tmp = new byte[length];
System.arraycopy(data, offset, tmp, 0, length);
@@ -178,6 +184,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField {
* the number of bytes to use in the data array.
* @see ZipExtraField#parseFromCentralDirectoryData(byte[], int, int)
*/
+ @Override
public void parseFromCentralDirectoryData(byte[] data, int offset, int length) {
byte[] tmp = new byte[length];
System.arraycopy(data, offset, tmp, 0, length);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
index 198bed1..26d9807 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
@@ -64,6 +64,7 @@ public class ParallelScatterZipCreator {
private static class DefaultBackingStoreSupplier implements ScatterGatherBackingStoreSupplier {
final AtomicInteger storeNum = new AtomicInteger(0);
+ @Override
public ScatterGatherBackingStore get() throws IOException {
File tempFile = File.createTempFile("parallelscatter", "n" + storeNum.incrementAndGet());
return new FileBasedScatterGatherBackingStore(tempFile);
@@ -171,6 +172,7 @@ public class ParallelScatterZipCreator {
}
final ZipArchiveEntryRequest zipArchiveEntryRequest = createZipArchiveEntryRequest(zipArchiveEntry, source);
return new Callable<Object>() {
+ @Override
public Object call() throws Exception {
tlScatterStreams.get().addArchiveEntry(zipArchiveEntryRequest);
return null;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
index 862666f..0edaa3f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
@@ -124,6 +124,7 @@ public class ScatterZipOutputStream implements Closeable {
* Closes this stream, freeing all resources involved in the creation of this stream.
* @throws IOException If closing fails
*/
+ @Override
public void close() throws IOException {
backingStore.close();
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java b/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
index 4535247..f6f7b35 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
@@ -59,6 +59,7 @@ class Simple8BitZipEncoding implements ZipEncoding {
this.unicode = unicode;
}
+ @Override
public int compareTo(Simple8BitChar a) {
return this.unicode - a.unicode;
}
@@ -216,6 +217,7 @@ class Simple8BitZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#canEncode(java.lang.String)
*/
+ @Override
public boolean canEncode(String name) {
for (int i=0;i<name.length();++i) {
@@ -234,6 +236,7 @@ class Simple8BitZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#encode(java.lang.String)
*/
+ @Override
public ByteBuffer encode(String name) {
ByteBuffer out = ByteBuffer.allocate(name.length()
+ 6 + (name.length() + 1) / 2);
@@ -261,6 +264,7 @@ class Simple8BitZipEncoding implements ZipEncoding {
* @see
* org.apache.commons.compress.archivers.zip.ZipEncoding#decode(byte[])
*/
+ @Override
public String decode(byte[] data) throws IOException {
char [] ret = new char[data.length];
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
----------------------------------------------------------------------
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 657a492..d4925c1 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
@@ -204,6 +204,7 @@ public abstract class StreamCompressor implements Closeable {
writtenToOutputStreamForLastEntry = 0;
}
+ @Override
public void close() throws IOException {
def.end();
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
index 00fe333..1289583 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
@@ -62,6 +62,7 @@ public class UnicodeCommentExtraField extends AbstractUnicodeExtraField {
super(comment, bytes);
}
+ @Override
public ZipShort getHeaderId() {
return UCOM_ID;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
index dfd3f65..35935f3 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
@@ -61,6 +61,7 @@ public class UnicodePathExtraField extends AbstractUnicodeExtraField {
super(name, bytes);
}
+ @Override
public ZipShort getHeaderId() {
return UPATH_ID;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
index 029cfcd..b4a92bb 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
@@ -39,6 +39,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
*
* @return a completely arbitrary value that should be ignored.
*/
+ @Override
public ZipShort getHeaderId() {
return HEADER_ID;
}
@@ -48,6 +49,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
*
* @return The LocalFileDataLength value
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(localFileData == null ? 0 : localFileData.length);
}
@@ -57,6 +59,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
*
* @return The CentralDirectoryLength value
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
return centralDirectoryData == null
? getLocalFileDataLength()
@@ -68,6 +71,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
*
* @return The LocalFileDataData value
*/
+ @Override
public byte[] getLocalFileDataData() {
return ZipUtil.copy(localFileData);
}
@@ -77,6 +81,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
*
* @return The CentralDirectoryData value
*/
+ @Override
public byte[] getCentralDirectoryData() {
return centralDirectoryData == null
? getLocalFileDataData() : ZipUtil.copy(centralDirectoryData);
@@ -89,6 +94,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
* @param offset offset into buffer to read data
* @param length the length of data
*/
+ @Override
public void parseFromLocalFileData(byte[] buffer, int offset, int length) {
localFileData = new byte[length];
System.arraycopy(buffer, offset, localFileData, 0, length);
@@ -101,6 +107,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField {
* @param offset offset into buffer to read data
* @param length the length of data
*/
+ @Override
public void parseFromCentralDirectoryData(byte[] buffer, int offset,
int length) {
centralDirectoryData = new byte[length];
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
index d6a2d77..a4a532d 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
@@ -45,6 +45,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* Get the header id.
* @return the header id
*/
+ @Override
public ZipShort getHeaderId() {
return headerId;
}
@@ -68,6 +69,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* Get the length of the local data.
* @return the length of the local data
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(localData != null ? localData.length : 0);
}
@@ -76,6 +78,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* Get the local data.
* @return the local data
*/
+ @Override
public byte[] getLocalFileDataData() {
return ZipUtil.copy(localData);
}
@@ -99,6 +102,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* If there is no central data, get the local file data length.
* @return the central data length
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
if (centralData != null) {
return new ZipShort(centralData.length);
@@ -110,6 +114,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* Get the central data.
* @return the central data if present, else return the local file data
*/
+ @Override
public byte[] getCentralDirectoryData() {
if (centralData != null) {
return ZipUtil.copy(centralData);
@@ -123,6 +128,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* @param length the number of bytes to use in the data array.
* @see ZipExtraField#parseFromLocalFileData(byte[], int, int)
*/
+ @Override
public void parseFromLocalFileData(byte[] data, int offset, int length) {
byte[] tmp = new byte[length];
System.arraycopy(data, offset, tmp, 0, length);
@@ -135,6 +141,7 @@ public class UnrecognizedExtraField implements ZipExtraField {
* @param length the number of bytes to use in the data array.
* @see ZipExtraField#parseFromCentralDirectoryData(byte[], int, int)
*/
+ @Override
public void parseFromCentralDirectoryData(byte[] data, int offset,
int length) {
byte[] tmp = new byte[length];
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
index e2bde27..e020720 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
@@ -77,6 +77,7 @@ public class X000A_NTFS implements ZipExtraField {
*
* @return the value for the header id for this extrafield
*/
+ @Override
public ZipShort getHeaderId() {
return HEADER_ID;
}
@@ -87,6 +88,7 @@ public class X000A_NTFS implements ZipExtraField {
*
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(4 /* reserved */
+ 2 /* Tag#1 */
@@ -104,6 +106,7 @@ public class X000A_NTFS implements ZipExtraField {
*
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
return getLocalFileDataLength();
}
@@ -114,6 +117,7 @@ public class X000A_NTFS implements ZipExtraField {
*
* @return get the data
*/
+ @Override
public byte[] getLocalFileDataData() {
byte[] data = new byte[getLocalFileDataLength().getValue()];
int pos = 4;
@@ -135,6 +139,7 @@ public class X000A_NTFS implements ZipExtraField {
*
* @return the central directory data
*/
+ @Override
public byte[] getCentralDirectoryData() {
return getLocalFileDataData();
}
@@ -147,6 +152,7 @@ public class X000A_NTFS implements ZipExtraField {
* @param length the number of bytes in the array from offset
* @throws java.util.zip.ZipException on error
*/
+ @Override
public void parseFromLocalFileData(
byte[] data, int offset, int length
) throws ZipException {
@@ -171,6 +177,7 @@ public class X000A_NTFS implements ZipExtraField {
* Doesn't do anything special since this class always uses the
* same parsing logic for both central directory and local file data.
*/
+ @Override
public void parseFromCentralDirectoryData(
byte[] buffer, int offset, int length
) throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java b/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
index 8a7c7df..81bd9ca 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
@@ -126,6 +126,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
*
* @return the value for the header id for this extrafield
*/
+ @Override
public ZipShort getHeaderId() {
return HEADER_ID;
}
@@ -136,6 +137,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
*
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(1 +
(bit0_modifyTimePresent ? 4 : 0) +
@@ -154,6 +156,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
*
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
return new ZipShort(1 +
(bit0_modifyTimePresent ? 4 : 0)
@@ -166,6 +169,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
*
* @return get the data
*/
+ @Override
public byte[] getLocalFileDataData() {
byte[] data = new byte[getLocalFileDataLength().getValue()];
int pos = 0;
@@ -194,6 +198,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
*
* @return the central directory data
*/
+ @Override
public byte[] getCentralDirectoryData() {
byte[] centralData = new byte[getCentralDirectoryLength().getValue()];
byte[] localData = getLocalFileDataData();
@@ -212,6 +217,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
* @param length the number of bytes in the array from offset
* @throws java.util.zip.ZipException on error
*/
+ @Override
public void parseFromLocalFileData(
byte[] data, int offset, int length
) throws ZipException {
@@ -239,6 +245,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial
* Doesn't do anything special since this class always uses the
* same parsing logic for both central directory and local file data.
*/
+ @Override
public void parseFromCentralDirectoryData(
byte[] buffer, int offset, int length
) throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
index e325b56..007ca50 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
@@ -81,6 +81,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
*
* @return the value for the header id for this extrafield
*/
+ @Override
public ZipShort getHeaderId() {
return HEADER_ID;
}
@@ -129,6 +130,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
*
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getLocalFileDataLength() {
int uidSize = trimLeadingZeroesForceMinLength(uid.toByteArray()).length;
int gidSize = trimLeadingZeroesForceMinLength(gid.toByteArray()).length;
@@ -143,6 +145,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
*
* @return a <code>ZipShort</code> for the length of the data of this extra field
*/
+ @Override
public ZipShort getCentralDirectoryLength() {
return ZERO;
}
@@ -153,6 +156,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
*
* @return get the data
*/
+ @Override
public byte[] getLocalFileDataData() {
byte[] uidBytes = uid.toByteArray();
byte[] gidBytes = gid.toByteArray();
@@ -190,6 +194,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
*
* @return get the data
*/
+ @Override
public byte[] getCentralDirectoryData() {
return new byte[0];
}
@@ -202,6 +207,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
* @param length the number of bytes in the array from offset
* @throws java.util.zip.ZipException on error
*/
+ @Override
public void parseFromLocalFileData(
byte[] data, int offset, int length
) throws ZipException {
@@ -223,6 +229,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
* Doesn't do anything since this class doesn't store anything
* inside the central directory.
*/
+ @Override
public void parseFromCentralDirectoryData(
byte[] buffer, int offset, int length
) throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
index c7bec68..0c5ec02 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
@@ -103,14 +103,17 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField {
this.diskStart = diskStart;
}
+ @Override
public ZipShort getHeaderId() {
return HEADER_ID;
}
+ @Override
public ZipShort getLocalFileDataLength() {
return new ZipShort(size != null ? 2 * DWORD : 0);
}
+ @Override
public ZipShort getCentralDirectoryLength() {
return new ZipShort((size != null ? DWORD : 0)
+ (compressedSize != null ? DWORD : 0)
@@ -118,6 +121,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField {
+ (diskStart != null ? WORD : 0));
}
+ @Override
public byte[] getLocalFileDataData() {
if (size != null || compressedSize != null) {
if (size == null || compressedSize == null) {
@@ -130,6 +134,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField {
return EMPTY;
}
+ @Override
public byte[] getCentralDirectoryData() {
byte[] data = new byte[getCentralDirectoryLength().getValue()];
int off = addSizes(data);
@@ -144,6 +149,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField {
return data;
}
+ @Override
public void parseFromLocalFileData(byte[] buffer, int offset, int length)
throws ZipException {
if (length == 0) {
@@ -173,6 +179,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField {
}
}
+ @Override
public void parseFromCentralDirectoryData(byte[] buffer, int offset,
int length)
throws ZipException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index 935f012..504646d 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -754,6 +754,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry
* leak through and the returned value may depend on your local
* time zone as well as your version of Java.</p>
*/
+ @Override
public Date getLastModifiedDate() {
return new Date(getTime());
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
----------------------------------------------------------------------
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 3b51b07..95e8c4c 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
@@ -239,6 +239,7 @@ public class ZipFile implements Closeable {
* Closes the archive.
* @throws IOException if an error occurs closing the archive.
*/
+ @Override
public void close() throws IOException {
// this flag is only written here and read in finalize() which
// can never be run in parallel.
@@ -1091,6 +1092,7 @@ public class ZipFile implements Closeable {
*/
private final Comparator<ZipArchiveEntry> OFFSET_COMPARATOR =
new Comparator<ZipArchiveEntry>() {
+ @Override
public int compare(ZipArchiveEntry e1, ZipArchiveEntry e2) {
if (e1 == e2) {
return 0;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
index 8ed861c..865fc09 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
@@ -244,12 +244,15 @@ public class ChangeSetPerformer {
ArchiveInputStreamIterator(ArchiveInputStream in) {
this.in = in;
}
+ @Override
public boolean hasNext() throws IOException {
return (next = in.getNextEntry()) != null;
}
+ @Override
public ArchiveEntry next() {
return next;
}
+ @Override
public InputStream getInputStream() {
return in;
}
@@ -264,12 +267,15 @@ public class ChangeSetPerformer {
this.in = in;
nestedEnum = in.getEntriesInPhysicalOrder();
}
+ @Override
public boolean hasNext() {
return nestedEnum.hasMoreElements();
}
+ @Override
public ArchiveEntry next() {
return current = nestedEnum.nextElement();
}
+ @Override
public InputStream getInputStream() throws IOException {
return in.getInputStream(current);
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java
----------------------------------------------------------------------
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 4163e7a..506d86c 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
@@ -42,16 +42,19 @@ class PureJavaCrc32C implements Checksum {
reset();
}
- public long getValue() {
+ @Override
+public long getValue() {
long ret = crc;
return (~ret) & 0xffffffffL;
}
- public void reset() {
+ @Override
+public void reset() {
crc = 0xffffffff;
}
- public void update(byte[] b, int off, int len) {
+ @Override
+public void update(byte[] b, int off, int len) {
int localCrc = crc;
while(len > 7) {
@@ -91,7 +94,8 @@ class PureJavaCrc32C implements Checksum {
crc = localCrc;
}
- final public void update(int b) {
+ @Override
+final public void update(int b) {
crc = (crc >>> 8) ^ T[T8_0_start + ((crc ^ b) & 0xff)];
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java b/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java
index 59ee680..b8225a3 100644
--- a/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java
+++ b/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java
@@ -39,10 +39,12 @@ public class FileBasedScatterGatherBackingStore implements ScatterGatherBackingS
os = new FileOutputStream(target);
}
+ @Override
public InputStream getInputStream() throws IOException {
return new FileInputStream(target);
}
+ @Override
@SuppressWarnings("ResultOfMethodCallIgnored")
public void closeForWriting() throws IOException {
if (!closed) {
@@ -51,10 +53,12 @@ public class FileBasedScatterGatherBackingStore implements ScatterGatherBackingS
}
}
+ @Override
public void writeOut(byte[] data, int offset, int length) throws IOException {
os.write(data, offset, length);
}
+ @Override
public void close() throws IOException {
closeForWriting();
target.delete();
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
index 91aad68..b34590e 100644
--- a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
@@ -54,6 +54,7 @@ public class BitInputStream implements Closeable {
this.byteOrder = byteOrder;
}
+ @Override
public void close() throws IOException {
in.close();
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/ArchiveReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java
index 9f67273..4cd72d0 100644
--- a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java
+++ b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java
@@ -77,6 +77,7 @@ public class ArchiveReadTest extends AbstractTestCase {
assertTrue(ARCDIR.exists());
Collection<Object[]> params = new ArrayList<Object[]>();
for (String f : ARCDIR.list(new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return !name.endsWith(".txt");
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
index 4f4d8ba..212cfb1 100644
--- a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
@@ -83,6 +83,7 @@ public class LongPathTest extends AbstractTestCase {
public static Collection<Object[]> data() {
Collection<Object[]> params = new ArrayList<Object[]>();
for (String f : ARCDIR.list(new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return !name.endsWith(".txt");
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java
index 5395588..61bfdea 100644
--- a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java
@@ -83,6 +83,7 @@ public class LongSymLinkTest extends AbstractTestCase {
public static Collection<Object[]> data() {
Collection<Object[]> params = new ArrayList<Object[]>();
for (String f : ARCDIR.list(new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return !name.endsWith(".txt");
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
index 9a506cd..4c952fb 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
@@ -313,6 +313,7 @@ public final class ZipTestCase extends AbstractTestCase {
String first_payload = "ABBA";
String second_payload = "AAAAAAAAAAAA";
ZipArchiveEntryPredicate allFilesPredicate = new ZipArchiveEntryPredicate() {
+ @Override
public boolean test(ZipArchiveEntry zipArchiveEntry) {
return true;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveEntry.java b/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveEntry.java
index c8dd561..86efb09 100644
--- a/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveEntry.java
+++ b/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveEntry.java
@@ -30,20 +30,24 @@ public final class MemoryArchiveEntry implements ArchiveEntry {
name = pName;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public long getSize() {
// TODO Auto-generated method stub
return 0;
}
+ @Override
public boolean isDirectory() {
// TODO Auto-generated method stub
return false;
}
+ @Override
public Date getLastModifiedDate() {
return new Date();
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
index 63b0acb..f99b8fa 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java
@@ -78,6 +78,7 @@ public class ParallelScatterZipCreatorTest {
ExecutorService es = Executors.newFixedThreadPool(1);
ScatterGatherBackingStoreSupplier supp = new ScatterGatherBackingStoreSupplier() {
+ @Override
public ScatterGatherBackingStore get() throws IOException {
return new FileBasedScatterGatherBackingStore(tmp = File.createTempFile("parallelscatter", "n1"));
}
@@ -113,6 +114,7 @@ public class ParallelScatterZipCreatorTest {
final byte[] payloadBytes = ("content" + i).getBytes();
ZipArchiveEntry za = createZipArchiveEntry(entries, i, payloadBytes);
zipCreator.addArchiveEntry(za, new InputStreamSupplier() {
+ @Override
public InputStream get() {
return new ByteArrayInputStream(payloadBytes);
}
@@ -127,6 +129,7 @@ public class ParallelScatterZipCreatorTest {
final byte[] payloadBytes = ("content" + i).getBytes();
ZipArchiveEntry za = createZipArchiveEntry(entries, i, payloadBytes);
final Callable<Object> callable = zipCreator.createCallable(za, new InputStreamSupplier() {
+ @Override
public InputStream get() {
return new ByteArrayInputStream(payloadBytes);
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
index b0da1c5..1d26789 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
@@ -45,6 +45,7 @@ public class ScatterSampleTest {
ZipArchiveEntry archiveEntry = new ZipArchiveEntry("test1.xml");
archiveEntry.setMethod(ZipEntry.DEFLATED);
InputStreamSupplier supp = new InputStreamSupplier() {
+ @Override
public InputStream get() {
return new ByteArrayInputStream("Hello".getBytes());
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
index 88836e4..f7550ce 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
@@ -79,6 +79,7 @@ public class ScatterZipOutputStreamTest {
private InputStreamSupplier createPayloadSupplier(final ByteArrayInputStream payload) {
return new InputStreamSupplier() {
+ @Override
public InputStream get() {
return payload;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
----------------------------------------------------------------------
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 c676b89..0dc521d 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
@@ -204,6 +204,7 @@ public class Zip64SupportIT {
private static ZipOutputTest write100KFiles(final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -321,6 +322,7 @@ public class Zip64SupportIT {
private static final ZipOutputTest write100KFilesModeNever =
new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Never);
@@ -348,7 +350,8 @@ public class Zip64SupportIT {
throws Throwable {
withTemporaryArchive("readSelfGenerated100KFilesUsingZipFile()",
new ZipOutputTest() {
- public void test(File f,
+ @Override
+ public void test(File f,
ZipArchiveOutputStream zos)
throws IOException {
write100KFilesToStream(zos);
@@ -372,6 +375,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
write3EntriesCreatingBigArchive(final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -485,6 +489,7 @@ public class Zip64SupportIT {
private static final ZipOutputTest write3EntriesCreatingBigArchiveModeNever =
new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Never);
@@ -516,7 +521,8 @@ public class Zip64SupportIT {
throws Throwable {
withTemporaryArchive("read3EntriesCreatingBigArchiveFileUsingZipFile",
new ZipOutputTest() {
- public void test(File f,
+ @Override
+ public void test(File f,
ZipArchiveOutputStream zos)
throws IOException {
write3EntriesCreatingBigArchiveToStream(zos);
@@ -570,6 +576,7 @@ public class Zip64SupportIT {
private static ZipOutputTest writeBigStoredEntry(final boolean knownSize,
final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -751,6 +758,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
writeBigStoredEntryModeNever(final boolean knownSize) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Never);
@@ -808,6 +816,7 @@ public class Zip64SupportIT {
writeBigDeflatedEntryToStream(final boolean knownSize,
final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f,
ZipArchiveOutputStream zos)
throws IOException {
@@ -994,6 +1003,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
writeBigDeflatedEntryUnknownSizeToStream(final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
try {
@@ -1050,6 +1060,7 @@ public class Zip64SupportIT {
writeBigDeflatedEntryToFile(final boolean knownSize,
final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -1221,7 +1232,8 @@ public class Zip64SupportIT {
throws Throwable {
withTemporaryArchive("writeBigDeflatedEntryKnownSizeToStreamModeNever",
new ZipOutputTest() {
- public void test(File f,
+ @Override
+ public void test(File f,
ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Never);
@@ -1254,6 +1266,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
writeBigDeflatedEntryToFileModeNever(final boolean knownSize) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Never);
@@ -1309,6 +1322,7 @@ public class Zip64SupportIT {
private static ZipOutputTest writeSmallStoredEntry(final boolean knownSize,
final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -1487,6 +1501,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
writeSmallStoredEntryModeAlways(final boolean knownSize) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Always);
@@ -1649,6 +1664,7 @@ public class Zip64SupportIT {
writeSmallDeflatedEntryToStream(final boolean knownSize,
final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -1821,6 +1837,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
writeSmallDeflatedEntryToStreamModeAlways(final boolean knownSize) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Always);
@@ -2003,6 +2020,7 @@ public class Zip64SupportIT {
writeSmallDeflatedEntryToFile(final boolean knownSize,
final Zip64Mode mode) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
if (mode != Zip64Mode.AsNeeded) {
@@ -2177,6 +2195,7 @@ public class Zip64SupportIT {
private static ZipOutputTest
writeSmallDeflatedEntryToFileModeAlways(final boolean knownSize) {
return new ZipOutputTest() {
+ @Override
public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
zos.setUseZip64(Zip64Mode.Always);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
index 0f38c28..3e15d52 100644
--- a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
@@ -38,6 +38,7 @@ public final class FramedSnappyTestCase
@Test
public void testDefaultExtraction() throws Exception {
testUnarchive(new StreamWrapper<CompressorInputStream>() {
+ @Override
public CompressorInputStream wrap(InputStream is) throws IOException {
return new FramedSnappyCompressorInputStream(is);
}
@@ -47,6 +48,7 @@ public final class FramedSnappyTestCase
@Test
public void testDefaultExtractionViaFactory() throws Exception {
testUnarchive(new StreamWrapper<CompressorInputStream>() {
+ @Override
public CompressorInputStream wrap(InputStream is) throws Exception {
return new CompressorStreamFactory()
.createCompressorInputStream(CompressorStreamFactory.SNAPPY_FRAMED,
@@ -58,6 +60,7 @@ public final class FramedSnappyTestCase
@Test
public void testDefaultExtractionViaFactoryAutodetection() throws Exception {
testUnarchive(new StreamWrapper<CompressorInputStream>() {
+ @Override
public CompressorInputStream wrap(InputStream is) throws Exception {
return new CompressorStreamFactory().createCompressorInputStream(is);
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java b/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
index 3ea1e2e..92f01bd 100644
--- a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
@@ -37,6 +37,7 @@ public final class ZTestCase extends AbstractTestCase {
@Test
public void testZUnarchive() throws Exception {
testUnarchive(new StreamWrapper<CompressorInputStream>() {
+ @Override
public CompressorInputStream wrap(InputStream is) throws IOException {
return new ZCompressorInputStream(is);
}
@@ -46,6 +47,7 @@ public final class ZTestCase extends AbstractTestCase {
@Test
public void testZUnarchiveViaFactory() throws Exception {
testUnarchive(new StreamWrapper<CompressorInputStream>() {
+ @Override
public CompressorInputStream wrap(InputStream is) throws Exception {
return new CompressorStreamFactory()
.createCompressorInputStream(CompressorStreamFactory.Z, is);
@@ -56,6 +58,7 @@ public final class ZTestCase extends AbstractTestCase {
@Test
public void testZUnarchiveViaAutoDetection() throws Exception {
testUnarchive(new StreamWrapper<CompressorInputStream>() {
+ @Override
public CompressorInputStream wrap(InputStream is) throws Exception {
return new CompressorStreamFactory()
.createCompressorInputStream(new BufferedInputStream(is));
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ab17a705/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
index 6310810..e468bd5 100644
--- a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
@@ -34,6 +34,7 @@ public class IOUtilsTest {
@Test
public void skipUsingSkip() throws Exception {
skip(new StreamWrapper() {
+ @Override
public InputStream wrap(InputStream toWrap) {
return toWrap;
}
@@ -43,6 +44,7 @@ public class IOUtilsTest {
@Test
public void skipUsingRead() throws Exception {
skip(new StreamWrapper() {
+ @Override
public InputStream wrap(InputStream toWrap) {
return new FilterInputStream(toWrap) {
@Override
@@ -57,6 +59,7 @@ public class IOUtilsTest {
@Test
public void skipUsingSkipAndRead() throws Exception {
skip(new StreamWrapper() {
+ @Override
public InputStream wrap(final InputStream toWrap) {
return new FilterInputStream(toWrap) {
boolean skipped;