Repository: commons-compress Updated Branches: refs/heads/master c84c34e86 -> bf85a64aa
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java index 4d0e85b..af0e4fd 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java @@ -143,15 +143,15 @@ public class TarArchiveEntryTest implements TarConstants { assertEquals("/foo", t.getName()); } - private void assertGnuMagic(TarArchiveEntry t) { + private void assertGnuMagic(final TarArchiveEntry t) { assertEquals(MAGIC_GNU + VERSION_GNU_SPACE, readMagic(t)); } - private void assertPosixMagic(TarArchiveEntry t) { + private void assertPosixMagic(final TarArchiveEntry t) { assertEquals(MAGIC_POSIX + VERSION_POSIX, readMagic(t)); } - private String readMagic(TarArchiveEntry t) { + private String readMagic(final TarArchiveEntry t) { byte[] buf = new byte[512]; t.writeEntryHeader(buf); return new String(buf, MAGIC_OFFSET, MAGICLEN + VERSIONLEN); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java index 11232c6..1289c21 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java @@ -135,7 +135,7 @@ public class TarArchiveInputStreamTest { datePriorToEpoch("preepoch-posix.tar"); } - private void datePriorToEpoch(String archive) throws Exception { + private void datePriorToEpoch(final String archive) throws Exception { TarArchiveInputStream in = null; try { in = new TarArchiveInputStream(new FileInputStream(getFile(archive))); @@ -297,7 +297,7 @@ public class TarArchiveInputStreamTest { } } - private TarArchiveInputStream getTestStream(String name) { + private TarArchiveInputStream getTestStream(final String name) { return new TarArchiveInputStream( TarArchiveInputStreamTest.class.getResourceAsStream(name)); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java index 3f80be9..3996bf4 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java @@ -194,7 +194,7 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase { + "0123\n", new String(data, 512, 101, CharsetNames.UTF_8)); } - private byte[] writePaxHeader(Map<String, String> m) throws Exception { + private byte[] writePaxHeader(final Map<String, String> m) throws Exception { ByteArrayOutputStream bos = new ByteArrayOutputStream(); TarArchiveOutputStream tos = new TarArchiveOutputStream(bos, "ASCII"); tos.writePaxHeaders(new TarArchiveEntry("x"), "foo", m); @@ -375,7 +375,7 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase { testRoundtripWith67CharFileName(TarArchiveOutputStream.LONGFILE_POSIX); } - private void testRoundtripWith67CharFileName(int mode) throws Exception { + private void testRoundtripWith67CharFileName(final int mode) throws Exception { String n = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAA"; assertEquals(67, n.length()); @@ -454,7 +454,7 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase { testWriteLongDirectoryName(TarArchiveOutputStream.LONGFILE_POSIX); } - private void testWriteLongDirectoryName(int mode) throws Exception { + private void testWriteLongDirectoryName(final int mode) throws Exception { String n = "01234567890123456789012345678901234567890123456789" + "01234567890123456789012345678901234567890123456789" + "01234567890123456789012345678901234567890123456789/"; @@ -584,7 +584,7 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase { /** * @see "https://issues.apache.org/jira/browse/COMPRESS-237"; */ - private void testWriteLongLinkName(int mode) throws Exception { + private void testWriteLongLinkName(final int mode) throws Exception { String linkname = "01234567890123456789012345678901234567890123456789" + "01234567890123456789012345678901234567890123456789" + "01234567890123456789012345678901234567890123456789/test"; @@ -663,7 +663,7 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase { tarIn.close(); } - private static byte[] createTarArchiveContainingOneDirectory(String fname, Date modificationDate) throws IOException { + private static byte[] createTarArchiveContainingOneDirectory(final String fname, final Date modificationDate) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); TarArchiveOutputStream tarOut = new TarArchiveOutputStream(baos, 1024); tarOut.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java index 090bd77..590e5c3 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java @@ -33,7 +33,7 @@ import java.io.InputStream; */ public final class TarLister { - public static void main(String[] args) throws Exception { + public static void main(final String[] args) throws Exception { if (args.length == 0) { usage(); return; @@ -63,7 +63,7 @@ public final class TarLister { System.out.println("Parameters: archive-name [encoding]"); } - private static void log(TarArchiveEntry ae) { + private static void log(final TarArchiveEntry ae) { StringBuilder sb = new StringBuilder(Integer.toOctalString(ae.getMode())) .append(" "); String name = ae.getUserName(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java index ed77194..e0649ac 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java @@ -155,7 +155,7 @@ public class TarUtilsTest { checkRoundTripOctalOrBinary(Long.MIN_VALUE + 1, 12); } - private void testRoundTripOctalOrBinary(int length) { + private void testRoundTripOctalOrBinary(final int length) { checkRoundTripOctalOrBinary(0, length); checkRoundTripOctalOrBinary(1, length); checkRoundTripOctalOrBinary(TarConstants.MAXSIZE, length); // will need binary format @@ -217,7 +217,7 @@ public class TarUtilsTest { assertEquals(s, TarUtils.parseName(buff, 0, len, enc)); } - private void checkName(String string) { + private void checkName(final String string) { byte buff[] = new byte[100]; int len = TarUtils.formatNameBytes(string, buff, 0, buff.length); assertEquals(string, TarUtils.parseName(buff, 0, len)); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java index 4c8d39a..3e21be2 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java @@ -34,7 +34,7 @@ import org.junit.Test; public class ExplodeSupportTest { - private void testArchiveWithImplodeCompression(String filename, String entryName) throws IOException { + private void testArchiveWithImplodeCompression(final String filename, final String entryName) throws IOException { ZipFile zip = new ZipFile(new File(filename)); ZipArchiveEntry entry = zip.getEntries().nextElement(); assertEquals("entry name", entryName, entry.getName()); @@ -66,7 +66,7 @@ public class ExplodeSupportTest { testArchiveWithImplodeCompression("target/test-classes/moby-imploded.zip", "README"); } - private void testZipStreamWithImplodeCompression(String filename, String entryName) throws IOException { + private void testZipStreamWithImplodeCompression(final String filename, final String entryName) throws IOException { ZipArchiveInputStream zin = new ZipArchiveInputStream(new FileInputStream(new File(filename))); ZipArchiveEntry entry = zin.getNextZipEntry(); assertEquals("entry name", entryName, entry.getName()); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java index 2233b69..3e792af 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java @@ -46,7 +46,7 @@ public final class Lister { String dir; } - public static void main(String[] args) throws IOException { + public static void main(final String[] args) throws IOException { CommandLine cl = parse(args); File f = new File(cl.archive); if (!f.isFile()) { @@ -94,12 +94,12 @@ public final class Lister { } } - private static void list(ZipArchiveEntry entry) { + private static void list(final ZipArchiveEntry entry) { System.out.println(entry.getName()); } - private static void extract(String dir, ZipArchiveEntry entry, - InputStream is) throws IOException { + private static void extract(final String dir, final ZipArchiveEntry entry, + final InputStream is) throws IOException { File f = new File(dir, entry.getName()); if (!f.getParentFile().exists()) { f.getParentFile().mkdirs(); @@ -115,7 +115,7 @@ public final class Lister { } } - private static CommandLine parse(String[] args) { + private static CommandLine parse(final String[] args) { CommandLine cl = new CommandLine(); boolean error = false; for (int i = 0; i < args.length; i++) { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/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 f99b8fa..c4eabeb 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 @@ -95,7 +95,7 @@ public class ParallelScatterZipCreatorTest { assertNotNull(zipCreator.getStatisticsMessage()); } - private void removeEntriesFoundInZipFile(File result, Map<String, byte[]> entries) throws IOException { + private void removeEntriesFoundInZipFile(final File result, final Map<String, byte[]> entries) throws IOException { ZipFile zf = new ZipFile(result); Enumeration<ZipArchiveEntry> entriesInPhysicalOrder = zf.getEntriesInPhysicalOrder(); while (entriesInPhysicalOrder.hasMoreElements()){ @@ -108,7 +108,7 @@ public class ParallelScatterZipCreatorTest { zf.close(); } - private Map<String, byte[]> writeEntries(ParallelScatterZipCreator zipCreator) { + private Map<String, byte[]> writeEntries(final ParallelScatterZipCreator zipCreator) { Map<String, byte[]> entries = new HashMap<String, byte[]>(); for (int i = 0; i < NUMITEMS; i++){ final byte[] payloadBytes = ("content" + i).getBytes(); @@ -123,7 +123,7 @@ public class ParallelScatterZipCreatorTest { return entries; } - private Map<String, byte[]> writeEntriesAsCallable(ParallelScatterZipCreator zipCreator) { + private Map<String, byte[]> writeEntriesAsCallable(final ParallelScatterZipCreator zipCreator) { Map<String, byte[]> entries = new HashMap<String, byte[]>(); for (int i = 0; i < NUMITEMS; i++){ final byte[] payloadBytes = ("content" + i).getBytes(); @@ -139,7 +139,7 @@ public class ParallelScatterZipCreatorTest { return entries; } - private ZipArchiveEntry createZipArchiveEntry(Map<String, byte[]> entries, int i, byte[] payloadBytes) { + private ZipArchiveEntry createZipArchiveEntry(final Map<String, byte[]> entries, final int i, final byte[] payloadBytes) { ZipArchiveEntry za = new ZipArchiveEntry( "file" + i); entries.put( za.getName(), payloadBytes); za.setMethod(ZipEntry.DEFLATED); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java index 7802137..deb7a7e 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java @@ -31,7 +31,7 @@ public class ScatterSample { public ScatterSample() throws IOException { } - public void addEntry(ZipArchiveEntry zipArchiveEntry, InputStreamSupplier streamSupplier) throws IOException { + public void addEntry(final ZipArchiveEntry zipArchiveEntry, final InputStreamSupplier streamSupplier) throws IOException { if (zipArchiveEntry.isDirectory() && !zipArchiveEntry.isUnixSymlink()) { dirs.addArchiveEntry(ZipArchiveEntryRequest.createZipArchiveEntryRequest(zipArchiveEntry, streamSupplier)); } else { @@ -39,7 +39,7 @@ public class ScatterSample { } } - public void writeTo(ZipArchiveOutputStream zipArchiveOutputStream) + public void writeTo(final ZipArchiveOutputStream zipArchiveOutputStream) throws IOException, ExecutionException, InterruptedException { dirs.writeTo(zipArchiveOutputStream); dirs.close(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/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 1d26789..8125576 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 @@ -40,7 +40,7 @@ public class ScatterSampleTest { checkFile(result); } - private void createFile(File result) throws IOException, ExecutionException, InterruptedException { + private void createFile(final File result) throws IOException, ExecutionException, InterruptedException { ScatterSample scatterSample = new ScatterSample(); ZipArchiveEntry archiveEntry = new ZipArchiveEntry("test1.xml"); archiveEntry.setMethod(ZipEntry.DEFLATED); @@ -57,7 +57,7 @@ public class ScatterSampleTest { zipArchiveOutputStream.close(); } - private void checkFile(File result) throws IOException { + private void checkFile(final File result) throws IOException { ZipFile zf = new ZipFile(result); ZipArchiveEntry archiveEntry1 = zf.getEntries().nextElement(); assertEquals( "test1.xml", archiveEntry1.getName()); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java index c1a5294..27d1889 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java @@ -143,7 +143,7 @@ public class UTF8ZipFilesTest extends AbstractTestCase { } } - private void assertCanRead(ZipFile zf, String fileName) throws IOException { + private void assertCanRead(final ZipFile zf, final String fileName) throws IOException { ZipArchiveEntry entry = zf.getEntry(fileName); assertNotNull("Entry doesn't exist", entry); InputStream is = zf.getInputStream(entry); @@ -239,8 +239,8 @@ public class UTF8ZipFilesTest extends AbstractTestCase { } } - private static void testFileRoundtrip(String encoding, boolean withEFS, - boolean withExplicitUnicodeExtra) + private static void testFileRoundtrip(final String encoding, final boolean withEFS, + final boolean withExplicitUnicodeExtra) throws IOException { File file = File.createTempFile(encoding + "-test", ".zip"); @@ -253,9 +253,9 @@ public class UTF8ZipFilesTest extends AbstractTestCase { } } - private static void createTestFile(File file, String encoding, - boolean withEFS, - boolean withExplicitUnicodeExtra) + private static void createTestFile(final File file, final String encoding, + final boolean withEFS, + final boolean withExplicitUnicodeExtra) throws UnsupportedEncodingException, IOException { ZipEncoding zipEncoding = ZipEncodingHelper.getZipEncoding(encoding); @@ -333,7 +333,7 @@ public class UTF8ZipFilesTest extends AbstractTestCase { } } - private static void testFile(File file, String encoding) + private static void testFile(final File file, final String encoding) throws IOException { ZipFile zf = null; try { @@ -358,14 +358,14 @@ public class UTF8ZipFilesTest extends AbstractTestCase { } } - private static UnicodePathExtraField findUniCodePath(ZipArchiveEntry ze) { + private static UnicodePathExtraField findUniCodePath(final ZipArchiveEntry ze) { return (UnicodePathExtraField) ze.getExtraField(UnicodePathExtraField.UPATH_ID); } - private static void assertUnicodeName(ZipArchiveEntry ze, - String expectedName, - String encoding) + private static void assertUnicodeName(final ZipArchiveEntry ze, + final String expectedName, + final String encoding) throws IOException { if (!expectedName.equals(ze.getName())) { UnicodePathExtraField ucpf = findUniCodePath(ze); @@ -394,7 +394,7 @@ public class UTF8ZipFilesTest extends AbstractTestCase { } - private static void assertRawNameOfAcsiiTxt(ZipArchiveEntry ze) { + private static void assertRawNameOfAcsiiTxt(final ZipArchiveEntry ze) { byte[] b = ze.getRawName(); assertNotNull(b); final int len = ASCII_TXT.length(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java index 8447669..17ec460 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java @@ -537,7 +537,7 @@ public class X5455_ExtendedTimestampTest { } } - private static boolean isFlagSet(byte data, byte flag) { return (data & flag) == flag; } + private static boolean isFlagSet(final byte data, final byte flag) { return (data & flag) == flag; } /** * InfoZIP seems to adjust the time stored inside the LFH and CD @@ -547,7 +547,7 @@ public class X5455_ExtendedTimestampTest { * The archive read in {@link #testSampleFile} has been created * with GMT-8 so we need to adjust for the difference. */ - private static Date adjustFromGMTToExpectedOffset(Date from) { + private static Date adjustFromGMTToExpectedOffset(final Date from) { Calendar cal = Calendar.getInstance(); cal.setTime(from); cal.add(Calendar.MILLISECOND, cal.get(Calendar.ZONE_OFFSET)); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java index 03326f1..db53171 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java @@ -133,7 +133,7 @@ public class X7875_NewUnixTest { assertTrue(Arrays.equals(SEQUENCE6, trimTest(SEQUENCE6_LEADING_ZERO))); } - private static byte[] trimTest(byte[] b) { return X7875_NewUnix.trimLeadingZeroesForceMinLength(b); } + private static byte[] trimTest(final byte[] b) { return X7875_NewUnix.trimLeadingZeroesForceMinLength(b); } @Test public void testParseReparse() throws ZipException { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraFieldTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraFieldTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraFieldTest.java index 07eb700..8e2f23b 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraFieldTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraFieldTest.java @@ -212,7 +212,7 @@ public class Zip64ExtendedInformationExtraFieldTest { assertNull(f.getDiskStartNumber()); } - private static void checkSizes(byte[] b) { + private static void checkSizes(final byte[] b) { assertEquals(0x78, b[0]); assertEquals(0x56, b[1]); assertEquals(0x34, b[2]); @@ -231,7 +231,7 @@ public class Zip64ExtendedInformationExtraFieldTest { assertEquals(0x00, b[15]); } - private static void checkOffset(byte[] b, int off) { + private static void checkOffset(final byte[] b, final int off) { assertEquals(0x78, b[0 + off]); assertEquals(0x56, b[1 + off]); assertEquals(0x34, b[2 + off]); @@ -242,7 +242,7 @@ public class Zip64ExtendedInformationExtraFieldTest { assertEquals((byte) 0xAB, b[7 + off]); } - private static void checkDisk(byte[] b, int off) { + private static void checkDisk(final byte[] b, final int off) { assertEquals(0x12, b[0 + off]); assertEquals(0x00, b[1 + off]); assertEquals(0x00, b[2 + off]); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/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 0dc521d..821329b 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 @@ -142,7 +142,7 @@ public class Zip64SupportIT { } } - private static File write5GBZerosFile(String testName) throws Throwable { + private static File write5GBZerosFile(final String testName) throws Throwable { File f = getTempFile(testName); ZipArchiveOutputStream zos = new ZipArchiveOutputStream(f); try { @@ -205,7 +205,7 @@ public class Zip64SupportIT { private static ZipOutputTest write100KFiles(final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -323,7 +323,7 @@ public class Zip64SupportIT { private static final ZipOutputTest write100KFilesModeNever = new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Never); try { @@ -351,8 +351,8 @@ public class Zip64SupportIT { withTemporaryArchive("readSelfGenerated100KFilesUsingZipFile()", new ZipOutputTest() { @Override - public void test(File f, - ZipArchiveOutputStream zos) + public void test(final File f, + final ZipArchiveOutputStream zos) throws IOException { write100KFilesToStream(zos); read100KFilesUsingZipFileImpl(f); @@ -376,7 +376,7 @@ public class Zip64SupportIT { write3EntriesCreatingBigArchive(final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -490,7 +490,7 @@ public class Zip64SupportIT { private static final ZipOutputTest write3EntriesCreatingBigArchiveModeNever = new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Never); try { @@ -522,8 +522,8 @@ public class Zip64SupportIT { withTemporaryArchive("read3EntriesCreatingBigArchiveFileUsingZipFile", new ZipOutputTest() { @Override - public void test(File f, - ZipArchiveOutputStream zos) + public void test(final File f, + final ZipArchiveOutputStream zos) throws IOException { write3EntriesCreatingBigArchiveToStream(zos); ZipFile zf = null; @@ -577,7 +577,7 @@ public class Zip64SupportIT { final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -759,7 +759,7 @@ public class Zip64SupportIT { writeBigStoredEntryModeNever(final boolean knownSize) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Never); try { @@ -817,8 +817,8 @@ public class Zip64SupportIT { final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, - ZipArchiveOutputStream zos) + public void test(final File f, + final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -1004,7 +1004,7 @@ public class Zip64SupportIT { writeBigDeflatedEntryUnknownSizeToStream(final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { try { if (mode != Zip64Mode.AsNeeded) { @@ -1061,7 +1061,7 @@ public class Zip64SupportIT { final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -1233,8 +1233,8 @@ public class Zip64SupportIT { withTemporaryArchive("writeBigDeflatedEntryKnownSizeToStreamModeNever", new ZipOutputTest() { @Override - public void test(File f, - ZipArchiveOutputStream zos) + public void test(final File f, + final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Never); try { @@ -1267,7 +1267,7 @@ public class Zip64SupportIT { writeBigDeflatedEntryToFileModeNever(final boolean knownSize) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Never); try { @@ -1323,7 +1323,7 @@ public class Zip64SupportIT { final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -1502,7 +1502,7 @@ public class Zip64SupportIT { writeSmallStoredEntryModeAlways(final boolean knownSize) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Always); byte[] buf = new byte[ONE_MILLION]; @@ -1665,7 +1665,7 @@ public class Zip64SupportIT { final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -1838,7 +1838,7 @@ public class Zip64SupportIT { writeSmallDeflatedEntryToStreamModeAlways(final boolean knownSize) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Always); byte[] buf = new byte[ONE_MILLION]; @@ -2021,7 +2021,7 @@ public class Zip64SupportIT { final Zip64Mode mode) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { if (mode != Zip64Mode.AsNeeded) { zos.setUseZip64(mode); @@ -2196,7 +2196,7 @@ public class Zip64SupportIT { writeSmallDeflatedEntryToFileModeAlways(final boolean knownSize) { return new ZipOutputTest() { @Override - public void test(File f, ZipArchiveOutputStream zos) + public void test(final File f, final ZipArchiveOutputStream zos) throws IOException { zos.setUseZip64(Zip64Mode.Always); byte[] buf = new byte[ONE_MILLION]; @@ -2348,9 +2348,9 @@ public class Zip64SupportIT { void test(File f, ZipArchiveOutputStream zos) throws IOException; } - private static void withTemporaryArchive(String testName, - ZipOutputTest test, - boolean useRandomAccessFile) + private static void withTemporaryArchive(final String testName, + final ZipOutputTest test, + final boolean useRandomAccessFile) throws Throwable { File f = getTempFile(testName); BufferedOutputStream os = null; @@ -2420,13 +2420,13 @@ public class Zip64SupportIT { return getFile("100k_Files_PKZip.zip"); } - private static File getTempFile(String testName) throws Throwable { + private static File getTempFile(final String testName) throws Throwable { File f = File.createTempFile("commons-compress-" + testName, ".zip"); f.deleteOnExit(); return f; } - private static void read5GBOfZerosImpl(File f, String expectedName) + private static void read5GBOfZerosImpl(final File f, final String expectedName) throws IOException { FileInputStream fin = new FileInputStream(f); ZipArchiveInputStream zin = null; @@ -2461,8 +2461,8 @@ public class Zip64SupportIT { } } - private static void read5GBOfZerosUsingZipFileImpl(File f, - String expectedName) + private static void read5GBOfZerosUsingZipFileImpl(final File f, + final String expectedName) throws IOException { ZipFile zf = null; try { @@ -2500,7 +2500,7 @@ public class Zip64SupportIT { } } - private static void read100KFilesImpl(File f) throws IOException { + private static void read100KFilesImpl(final File f) throws IOException { FileInputStream fin = new FileInputStream(f); ZipArchiveInputStream zin = null; try { @@ -2522,7 +2522,7 @@ public class Zip64SupportIT { } } - private static void read100KFilesUsingZipFileImpl(File f) + private static void read100KFilesUsingZipFileImpl(final File f) throws IOException { ZipFile zf = null; try { @@ -2541,7 +2541,7 @@ public class Zip64SupportIT { } } - private static long getLengthAndPositionAtCentralDirectory(RandomAccessFile a) + private static long getLengthAndPositionAtCentralDirectory(final RandomAccessFile a) throws IOException { final long end = a.length(); a.seek(end - 22 - 20); @@ -2562,7 +2562,7 @@ public class Zip64SupportIT { return end; } - private static long getLengthAndPositionAtCentralDirectory32(RandomAccessFile a, final long end) + private static long getLengthAndPositionAtCentralDirectory32(final RandomAccessFile a, final long end) throws IOException { a.seek(end - 22 + 16); byte[] cdOffset = new byte[4]; @@ -2571,7 +2571,7 @@ public class Zip64SupportIT { return end; } - private static void write100KFilesToStream(ZipArchiveOutputStream zos) + private static void write100KFilesToStream(final ZipArchiveOutputStream zos) throws IOException { for (int i = 0; i < ONE_HUNDRED_THOUSAND; i++) { ZipArchiveEntry zae = new ZipArchiveEntry(String.valueOf(i)); @@ -2583,7 +2583,7 @@ public class Zip64SupportIT { } private static void - write3EntriesCreatingBigArchiveToStream(ZipArchiveOutputStream zos) + write3EntriesCreatingBigArchiveToStream(final ZipArchiveOutputStream zos) throws IOException { byte[] buf = new byte[ONE_MILLION]; ZipArchiveEntry zae = null; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java index a2d204f..237adf2 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java @@ -112,7 +112,7 @@ public class ZipEncodingTest { doSimpleEncodingTest("Cp1252",b); } - private static void assertEquals(byte[] expected, ByteBuffer actual) { + private static void assertEquals(final byte[] expected, final ByteBuffer actual) { Assert.assertEquals(expected.length, actual.limit()); @@ -123,7 +123,7 @@ public class ZipEncodingTest { } - private void doSimpleEncodingTest(String name, byte[] testBytes) + private void doSimpleEncodingTest(final String name, byte[] testBytes) throws IOException { ZipEncoding enc = ZipEncodingHelper.getZipEncoding(name); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java ---------------------------------------------------------------------- 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 c9e512a..8a35b5d 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 @@ -311,9 +311,9 @@ public class ZipFileTest { zf = new ZipFile(archive); } - private static void assertEntryName(ArrayList<ZipArchiveEntry> entries, - int index, - String expectedName) { + private static void assertEntryName(final ArrayList<ZipArchiveEntry> entries, + final int index, + final String expectedName) { ZipArchiveEntry ze = entries.get(index); assertEquals("src/main/java/org/apache/commons/compress/archivers/zip/" + expectedName + ".java", http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java b/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java index ea3f115..b9edb0b 100644 --- a/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java +++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java @@ -49,7 +49,7 @@ import org.junit.Test; public final class ChangeSetTestCase extends AbstractTestCase { // Delete a directory tree - private void archiveListDeleteDir(String prefix){ + private void archiveListDeleteDir(final String prefix){ Iterator<String> it = archiveList.iterator(); while(it.hasNext()){ String entry = it.next(); @@ -60,7 +60,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { } // Delete a single file - private void archiveListDelete(String prefix){ + private void archiveListDelete(final String prefix){ Iterator<String> it = archiveList.iterator(); while(it.hasNext()){ String entry = it.next(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java index 218d913..eccbd5e 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java @@ -59,7 +59,7 @@ public final class DetectCompressorTestCase { final char[] entryNames; // expected entries ... final CompressorStreamFactory factory; // ... when using this factory final boolean concat; // expected value for decompressConcatenated - TestData(String name, char[] names, CompressorStreamFactory factory, boolean concat) { + TestData(final String name, final char[] names, final CompressorStreamFactory factory, final boolean concat) { this.fileName = name; this.entryNames = names; this.factory = factory; @@ -160,14 +160,14 @@ public final class DetectCompressorTestCase { } } - private CompressorInputStream getStreamFor(String resource) + private CompressorInputStream getStreamFor(final String resource) throws CompressorException, IOException { return factory.createCompressorInputStream( new BufferedInputStream(new FileInputStream( getFile(resource)))); } - private CompressorInputStream getStreamFor(String resource, CompressorStreamFactory factory) + private CompressorInputStream getStreamFor(final String resource, final CompressorStreamFactory factory) throws CompressorException, IOException { return factory.createCompressorInputStream( new BufferedInputStream(new FileInputStream( http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/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 3e15d52..67b5c82 100644 --- a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java @@ -39,7 +39,7 @@ public final class FramedSnappyTestCase public void testDefaultExtraction() throws Exception { testUnarchive(new StreamWrapper<CompressorInputStream>() { @Override - public CompressorInputStream wrap(InputStream is) throws IOException { + public CompressorInputStream wrap(final InputStream is) throws IOException { return new FramedSnappyCompressorInputStream(is); } }); @@ -49,7 +49,7 @@ public final class FramedSnappyTestCase public void testDefaultExtractionViaFactory() throws Exception { testUnarchive(new StreamWrapper<CompressorInputStream>() { @Override - public CompressorInputStream wrap(InputStream is) throws Exception { + public CompressorInputStream wrap(final InputStream is) throws Exception { return new CompressorStreamFactory() .createCompressorInputStream(CompressorStreamFactory.SNAPPY_FRAMED, is); @@ -61,13 +61,13 @@ public final class FramedSnappyTestCase public void testDefaultExtractionViaFactoryAutodetection() throws Exception { testUnarchive(new StreamWrapper<CompressorInputStream>() { @Override - public CompressorInputStream wrap(InputStream is) throws Exception { + public CompressorInputStream wrap(final InputStream is) throws Exception { return new CompressorStreamFactory().createCompressorInputStream(is); } }); } - private void testUnarchive(StreamWrapper<CompressorInputStream> wrapper) throws Exception { + private void testUnarchive(final StreamWrapper<CompressorInputStream> wrapper) throws Exception { final File input = getFile("bla.tar.sz"); final File output = new File(dir, "bla.tar"); final FileInputStream is = new FileInputStream(input); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java index 58d9f2f..5f133ab 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java @@ -237,7 +237,7 @@ public final class GZipTestCase extends AbstractTestCase { } } - private void testExtraFlags(int compressionLevel, int flag) throws Exception { + private void testExtraFlags(final int compressionLevel, final int flag) throws Exception { FileInputStream fis = new FileInputStream(getFile("test3.xml")); byte[] content; try { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java b/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java index 56b5c71..12381bd 100644 --- a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java @@ -59,7 +59,7 @@ public final class LZMATestCase extends AbstractTestCase { } } - private void copy(InputStream in, File output) throws IOException { + private void copy(final InputStream in, final File output) throws IOException { FileOutputStream out = null; try { out = new FileOutputStream(output); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java b/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java index c2dc7a1..3f30f0d 100644 --- a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java @@ -64,7 +64,7 @@ public final class Pack200TestCase extends AbstractTestCase { jarUnarchiveAll(true, Pack200Strategy.TEMP_FILE); } - private void jarUnarchiveAll(boolean useFile, Pack200Strategy mode) + private void jarUnarchiveAll(final boolean useFile, final Pack200Strategy mode) throws Exception { final File input = getFile("bla.pack"); final InputStream is = useFile @@ -106,7 +106,7 @@ public final class Pack200TestCase extends AbstractTestCase { jarArchiveCreation(Pack200Strategy.TEMP_FILE); } - private void jarArchiveCreation(Pack200Strategy mode) throws Exception { + private void jarArchiveCreation(final Pack200Strategy mode) throws Exception { final File output = new File(dir, "bla.pack"); final File file1 = getFile("test1.xml"); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/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 92f01bd..f2804a9 100644 --- a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java @@ -38,7 +38,7 @@ public final class ZTestCase extends AbstractTestCase { public void testZUnarchive() throws Exception { testUnarchive(new StreamWrapper<CompressorInputStream>() { @Override - public CompressorInputStream wrap(InputStream is) throws IOException { + public CompressorInputStream wrap(final InputStream is) throws IOException { return new ZCompressorInputStream(is); } }); @@ -48,7 +48,7 @@ public final class ZTestCase extends AbstractTestCase { public void testZUnarchiveViaFactory() throws Exception { testUnarchive(new StreamWrapper<CompressorInputStream>() { @Override - public CompressorInputStream wrap(InputStream is) throws Exception { + public CompressorInputStream wrap(final InputStream is) throws Exception { return new CompressorStreamFactory() .createCompressorInputStream(CompressorStreamFactory.Z, is); } @@ -59,7 +59,7 @@ public final class ZTestCase extends AbstractTestCase { public void testZUnarchiveViaAutoDetection() throws Exception { testUnarchive(new StreamWrapper<CompressorInputStream>() { @Override - public CompressorInputStream wrap(InputStream is) throws Exception { + public CompressorInputStream wrap(final InputStream is) throws Exception { return new CompressorStreamFactory() .createCompressorInputStream(new BufferedInputStream(is)); } @@ -78,7 +78,7 @@ public final class ZTestCase extends AbstractTestCase { 4)); } - private void testUnarchive(StreamWrapper<CompressorInputStream> wrapper) throws Exception { + private void testUnarchive(final StreamWrapper<CompressorInputStream> wrapper) throws Exception { final File input = getFile("bla.tar.Z"); final File output = new File(dir, "bla.tar"); final InputStream is = new FileInputStream(input); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java index 8af9b0f..c69b2d0 100644 --- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java @@ -134,7 +134,7 @@ public class BlockSortTest { return setUpFixture(FIXTURE); } - private void assertFixtureSorted(BZip2CompressorOutputStream.Data data) { + private void assertFixtureSorted(final BZip2CompressorOutputStream.Data data) { assertFixtureSorted(data, FIXTURE, FIXTURE_BWT); } @@ -142,18 +142,18 @@ public class BlockSortTest { return setUpFixture(FIXTURE2); } - private void assertFixture2Sorted(BZip2CompressorOutputStream.Data data) { + private void assertFixture2Sorted(final BZip2CompressorOutputStream.Data data) { assertFixtureSorted(data, FIXTURE2, FIXTURE2_BWT); } - private DS setUpFixture(byte[] fixture) { + private DS setUpFixture(final byte[] fixture) { BZip2CompressorOutputStream.Data data = new BZip2CompressorOutputStream.Data(1); System.arraycopy(fixture, 0, data.block, 1, fixture.length); return new DS(data, new BlockSort(data)); } - private void assertFixtureSorted(BZip2CompressorOutputStream.Data data, - byte[] fixture, byte[] fixtureBwt) { + private void assertFixtureSorted(final BZip2CompressorOutputStream.Data data, + final byte[] fixture, final byte[] fixtureBwt) { assertEquals(fixture[fixture.length - 1], data.block[0]); for (int i = 0; i < fixture.length; i++) { assertEquals(fixtureBwt[i], data.block[data.fmap[i]]); @@ -163,7 +163,7 @@ public class BlockSortTest { private static class DS { private final BZip2CompressorOutputStream.Data data; private final BlockSort s; - DS(BZip2CompressorOutputStream.Data data, BlockSort s) { + DS(final BZip2CompressorOutputStream.Data data, final BlockSort s) { this.data = data; this.s = s; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java index 6d4e900..cf06ade 100644 --- a/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java +++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java @@ -102,7 +102,7 @@ public class PythonTruncatedBzip2Test { } } - private static ReadableByteChannel makeBZ2C(InputStream source) throws IOException { + private static ReadableByteChannel makeBZ2C(final InputStream source) throws IOException { BufferedInputStream bin = new BufferedInputStream(source); BZip2CompressorInputStream bZin = new BZip2CompressorInputStream(bin, true); @@ -111,7 +111,7 @@ public class PythonTruncatedBzip2Test { // Helper method since Arrays#copyOfRange is Java 1.6+ // Does not check parameters, so may fail if they are incompatible - private static byte[] copyOfRange(byte[] original, int from, int to) { + private static byte[] copyOfRange(final byte[] original, final int from, final int to) { int length = to - from; byte buff[] = new byte[length]; System.arraycopy(original, from, buff, 0, length); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java index 6a73c3b..ec4eb2f 100644 --- a/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java @@ -170,13 +170,13 @@ public final class FramedSnappyCompressorInputStreamTest testChecksumUnmasking(0xffffc757l); } - private void testChecksumUnmasking(long x) { + private void testChecksumUnmasking(final long x) { assertEquals(Long.toHexString(x), Long.toHexString(FramedSnappyCompressorInputStream .unmask(mask(x)))); } - private long mask(long x) { + private long mask(final long x) { return (((x >>> 15) | (x << 17)) + FramedSnappyCompressorInputStream.MASK_OFFSET) & 0xffffFFFFL; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/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 e468bd5..33ef7b9 100644 --- a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java @@ -35,7 +35,7 @@ public class IOUtilsTest { public void skipUsingSkip() throws Exception { skip(new StreamWrapper() { @Override - public InputStream wrap(InputStream toWrap) { + public InputStream wrap(final InputStream toWrap) { return toWrap; } }); @@ -45,10 +45,10 @@ public class IOUtilsTest { public void skipUsingRead() throws Exception { skip(new StreamWrapper() { @Override - public InputStream wrap(InputStream toWrap) { + public InputStream wrap(final InputStream toWrap) { return new FilterInputStream(toWrap) { @Override - public long skip(long s) { + public long skip(final long s) { return 0; } }; @@ -64,7 +64,7 @@ public class IOUtilsTest { return new FilterInputStream(toWrap) { boolean skipped; @Override - public long skip(long s) throws IOException { + public long skip(final long s) throws IOException { if (!skipped) { toWrap.skip(5); skipped = true; @@ -77,7 +77,7 @@ public class IOUtilsTest { }); } - private void skip(StreamWrapper wrapper) throws Exception { + private void skip(final StreamWrapper wrapper) throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 });
