You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/03/31 13:50:01 UTC
[commons-imaging] branch master updated: Use final.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 84a2239 Use final.
84a2239 is described below
commit 84a2239f1b3e7aa702bb202bde13d34ec1eb1814
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Mar 31 09:49:55 2019 -0400
Use final.
---
.../org/apache/commons/imaging/FormatCompliance.java | 2 +-
src/main/java/org/apache/commons/imaging/Imaging.java | 2 +-
.../apache/commons/imaging/common/BinaryFileParser.java | 2 +-
.../apache/commons/imaging/formats/icns/IcnsType.java | 2 +-
.../commons/imaging/formats/png/PngImageParser.java | 2 +-
.../commons/imaging/formats/psd/PsdHeaderInfo.java | 2 +-
.../commons/imaging/formats/psd/PsdImageContents.java | 2 +-
.../apache/commons/imaging/formats/tiff/TiffField.java | 2 +-
.../imaging/formats/tiff/fieldtypes/FieldTypeAscii.java | 6 +++---
.../commons/imaging/formats/xbm/XbmImageParser.java | 2 +-
.../java/org/apache/commons/imaging/ImageDumpTest.java | 8 ++++----
.../imaging/common/RgbBufferedImageFactoryTest.java | 4 ++--
.../imaging/common/bytesource/ByteSourceTest.java | 2 +-
.../imaging/common/itu_t4/HuffmanTreeExceptionTest.java | 4 ++--
.../commons/imaging/common/itu_t4/T4_T6_TablesTest.java | 2 +-
.../commons/imaging/formats/bmp/BmpWriterRgbTest.java | 6 +++---
.../imaging/formats/jpeg/decoder/JpegDecoderTest.java | 4 ++--
.../formats/jpeg/exif/WriteExifMetadataExampleTest.java | 16 ++++++++--------
.../imaging/formats/jpeg/iptc/IptcTypeLookupTest.java | 2 +-
.../imaging/formats/jpeg/segments/AppnSegmentTest.java | 4 ++--
.../imaging/formats/jpeg/segments/JfifSegmentTest.java | 4 ++--
.../formats/jpeg/segments/NegSizeSegmentTest.java | 10 +++++-----
.../imaging/formats/jpeg/segments/SosSegmentTest.java | 8 ++++----
.../imaging/formats/jpeg/xmp/JpegXmpParserTest.java | 6 +++---
.../commons/imaging/formats/pcx/RleReaderTest.java | 8 ++++----
.../apache/commons/imaging/formats/png/PngCrcTest.java | 4 ++--
.../imaging/formats/png/chunks/PngChunkTextTest.java | 4 ++--
.../png/scanlinefilters/ScanlineFilterAverageTest.java | 4 ++--
.../png/scanlinefilters/ScanlineFilterPaethTest.java | 4 ++--
.../png/scanlinefilters/ScanlineFilterUpTest.java | 4 ++--
.../TransparencyFilterIndexedColorTest.java | 6 +++---
.../commons/imaging/formats/pnm/PbmFileInfoTest.java | 8 ++++----
.../commons/imaging/formats/pnm/PnmImageParserTest.java | 10 +++++-----
.../imaging/formats/pnm/WhiteSpaceReaderTest.java | 6 +++---
.../imaging/formats/psd/ImageResourceBlockTest.java | 4 ++--
.../imaging/formats/psd/ImageResourceTypeTest.java | 4 ++--
.../formats/psd/dataparsers/DataParserCmykTest.java | 2 +-
.../formats/psd/dataparsers/DataParserGrayscaleTest.java | 2 +-
.../formats/psd/dataparsers/DataParserIndexedTest.java | 4 ++--
.../formats/psd/dataparsers/DataParserLabTest.java | 2 +-
.../commons/imaging/formats/rgbe/RgbeReadTest.java | 6 +++---
.../commons/imaging/formats/tiff/JpegImageDataTest.java | 6 +++---
.../commons/imaging/formats/tiff/TiffTagsTest.java | 2 +-
.../formats/tiff/datareaders/DataReaderStripsTest.java | 6 +++---
.../formats/tiff/fieldtypes/FieldTypeByteTest.java | 4 ++--
.../formats/tiff/fieldtypes/FieldTypeLongTest.java | 6 +++---
.../formats/tiff/fieldtypes/FieldTypeShortTest.java | 6 +++---
.../imaging/formats/tiff/fieldtypes/FieldTypeTest.java | 2 +-
.../imaging/formats/tiff/taginfos/TagInfoByteTest.java | 4 ++--
.../imaging/formats/tiff/taginfos/TagInfoSByteTest.java | 8 ++++----
.../imaging/formats/tiff/taginfos/TagInfoSBytesTest.java | 10 +++++-----
.../imaging/formats/tiff/taginfos/TagInfoSLongTest.java | 6 +++---
.../imaging/formats/tiff/taginfos/TagInfoSShortTest.java | 6 +++---
.../formats/tiff/taginfos/TagInfoSShortsTest.java | 8 ++++----
.../formats/tiff/taginfos/TagInfoUnknownTest.java | 2 +-
.../commons/imaging/palette/SimplePaletteTest.java | 4 ++--
56 files changed, 133 insertions(+), 133 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/FormatCompliance.java b/src/main/java/org/apache/commons/imaging/FormatCompliance.java
index b5a3c01..9f10c14 100644
--- a/src/main/java/org/apache/commons/imaging/FormatCompliance.java
+++ b/src/main/java/org/apache/commons/imaging/FormatCompliance.java
@@ -77,7 +77,7 @@ public class FormatCompliance {
pw.flush();
sw.flush();
LOGGER.fine(sw.toString());
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/Imaging.java b/src/main/java/org/apache/commons/imaging/Imaging.java
index 1aece53..8a06a23 100644
--- a/src/main/java/org/apache/commons/imaging/Imaging.java
+++ b/src/main/java/org/apache/commons/imaging/Imaging.java
@@ -167,7 +167,7 @@ public final class Imaging {
return false;
}
- String normalizedFilename = filename.toLowerCase(Locale.ENGLISH);
+ final String normalizedFilename = filename.toLowerCase(Locale.ENGLISH);
for (final ImageParser imageParser : ImageParser.getAllImageParsers()) {
for (final String extension : imageParser.getAcceptedExtensions()) {
diff --git a/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java b/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java
index c14c726..4ecbb78 100644
--- a/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java
+++ b/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java
@@ -55,7 +55,7 @@ public class BinaryFileParser {
pw.flush();
sw.flush();
LOGGER.fine(sw.toString());
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java
index 021cd7d..91b6468 100644
--- a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java
+++ b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java
@@ -166,7 +166,7 @@ enum IcnsType {
}
public static int typeAsInt(final String type) {
- byte[] bytes = type.getBytes(StandardCharsets.US_ASCII);
+ final byte[] bytes = type.getBytes(StandardCharsets.US_ASCII);
if (bytes.length != 4) {
throw new IllegalArgumentException("Invalid ICNS type");
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index ed7d87f..140a3ae 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -392,7 +392,7 @@ public class PngImageParser extends ImageParser {
final List<PngChunk> zTXts = filterChunks(chunks, ChunkType.zTXt);
final List<PngChunk> iTXts = filterChunks(chunks, ChunkType.iTXt);
- int chunkCount = tEXts.size() + zTXts.size() + iTXts.size();
+ final int chunkCount = tEXts.size() + zTXts.size() + iTXts.size();
final List<String> comments = new ArrayList<>(chunkCount);
final List<PngText> textChunks = new ArrayList<>(chunkCount);
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java b/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java
index 6fc93fd..041aafb 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java
@@ -55,7 +55,7 @@ public class PsdHeaderInfo {
pw.flush();
sw.flush();
LOGGER.fine(sw.toString());
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java
index 8e9cbd4..a4838a7 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageContents.java
@@ -50,7 +50,7 @@ public class PsdImageContents {
pw.flush();
sw.flush();
LOGGER.fine(sw.toString());
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
index 43bcc69..45d1356 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
@@ -361,7 +361,7 @@ public class TiffField {
pw.flush();
sw.flush();
LOGGER.fine(sw.toString());
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java b/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java
index 2ab66e5..ed764ec 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java
@@ -74,7 +74,7 @@ public class FieldTypeAscii extends FieldType {
result[result.length - 1] = 0;
return result;
} else if (o instanceof String) {
- byte[] bytes = ((String) o).getBytes(StandardCharsets.UTF_8);
+ final byte[] bytes = ((String) o).getBytes(StandardCharsets.UTF_8);
final byte[] result = new byte[bytes.length + 1];
System.arraycopy(bytes, 0, result, 0, bytes.length);
result[result.length - 1] = 0;
@@ -83,13 +83,13 @@ public class FieldTypeAscii extends FieldType {
final String[] strings = (String[]) o;
int totalLength = 0;
for (final String string : strings) {
- byte[] bytes = string.getBytes(StandardCharsets.UTF_8);
+ final byte[] bytes = string.getBytes(StandardCharsets.UTF_8);
totalLength += (bytes.length + 1);
}
final byte[] result = new byte[totalLength];
int position = 0;
for (final String string : strings) {
- byte[] bytes = string.getBytes(StandardCharsets.UTF_8);
+ final byte[] bytes = string.getBytes(StandardCharsets.UTF_8);
System.arraycopy(bytes, 0, result, position, bytes.length);
position += (bytes.length + 1);
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
index bd54b14..c08b5c5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
@@ -174,7 +174,7 @@ public class XbmImageParser extends ImageParser {
}
}
- private static int parseCIntegerLiteral(String value) {
+ private static int parseCIntegerLiteral(final String value) {
if (value.startsWith("0")) {
if (value.length() >= 2) {
if (value.charAt(1) == 'x' || value.charAt(1) == 'X') {
diff --git a/src/test/java/org/apache/commons/imaging/ImageDumpTest.java b/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
index 4bb9a5d..edeaa7a 100644
--- a/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
@@ -27,8 +27,8 @@ public class ImageDumpTest {
@Test
public void testDumpColorSpace() {
- ImageDump imageDump = new ImageDump();
- ColorSpace colorSpace = ColorSpace.getInstance(1004);
+ final ImageDump imageDump = new ImageDump();
+ final ColorSpace colorSpace = ColorSpace.getInstance(1004);
imageDump.dumpColorSpace("Ku&]N>!4'C#Jzn+", colorSpace);
assertEquals(3, colorSpace.getNumComponents());
@@ -36,8 +36,8 @@ public class ImageDumpTest {
@Test
public void testDump() {
- ImageDump imageDump = new ImageDump();
- BufferedImage bufferedImage = new BufferedImage(10, 10, 10);
+ final ImageDump imageDump = new ImageDump();
+ final BufferedImage bufferedImage = new BufferedImage(10, 10, 10);
imageDump.dump(bufferedImage);
assertEquals(10, bufferedImage.getHeight());
diff --git a/src/test/java/org/apache/commons/imaging/common/RgbBufferedImageFactoryTest.java b/src/test/java/org/apache/commons/imaging/common/RgbBufferedImageFactoryTest.java
index 12565be..99b53a8 100644
--- a/src/test/java/org/apache/commons/imaging/common/RgbBufferedImageFactoryTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/RgbBufferedImageFactoryTest.java
@@ -27,12 +27,12 @@ public class RgbBufferedImageFactoryTest{
@Test
public void testGetColorBufferedImageThrowsIllegalArgumentException() {
- RgbBufferedImageFactory rgbBufferedImageFactory = new RgbBufferedImageFactory();
+ final RgbBufferedImageFactory rgbBufferedImageFactory = new RgbBufferedImageFactory();
try {
rgbBufferedImageFactory.getColorBufferedImage(0, 0, true);
fail("Expecting exception: IllegalArgumentException");
- } catch(IllegalArgumentException e) {
+ } catch(final IllegalArgumentException e) {
assertEquals("Width (0) and height (0) cannot be <= 0",e.getMessage());
assertEquals(DirectColorModel.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
index beabeca..8e016f3 100644
--- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
@@ -66,7 +66,7 @@ public abstract class ByteSourceTest extends ImagingTest {
@Test(expected = NullPointerException.class)
public void testGetInputStreamThrowsNullPointerException() throws IOException {
- ByteSourceArray byteSourceArray = new ByteSourceArray(null);
+ final ByteSourceArray byteSourceArray = new ByteSourceArray(null);
byteSourceArray.getInputStream(0L);
}
diff --git a/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java b/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
index 55fdb1b..c83b8f3 100644
--- a/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
@@ -24,8 +24,8 @@ public class HuffmanTreeExceptionTest{
@Test
public void testCreatesHuffmanTreeExceptionTakingString() {
- HuffmanTreeException huffmanTreeException = new HuffmanTreeException("");
- HuffmanTreeException huffmanTreeExceptionTwo = new HuffmanTreeException("", huffmanTreeException);
+ final HuffmanTreeException huffmanTreeException = new HuffmanTreeException("");
+ final HuffmanTreeException huffmanTreeExceptionTwo = new HuffmanTreeException("", huffmanTreeException);
assertFalse(huffmanTreeExceptionTwo.equals(huffmanTreeException));
}
diff --git a/src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java b/src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java
index b828329..918c488 100644
--- a/src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java
@@ -26,7 +26,7 @@ public class T4_T6_TablesTest{
@Test
public void testCreatesT4_T6_TablesTakingNoArgumentsAndCallsWriteBits() {
- BitArrayOutputStream bitArrayOutputStream = new BitArrayOutputStream(2309);
+ final BitArrayOutputStream bitArrayOutputStream = new BitArrayOutputStream(2309);
T4_T6_Tables.EOL16.writeBits(bitArrayOutputStream);
assertEquals(2, bitArrayOutputStream.size());
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgbTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgbTest.java
index 60a4895..2b6f3c8 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgbTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgbTest.java
@@ -27,9 +27,9 @@ public class BmpWriterRgbTest{
@Test
public void testGetImageData() {
- BmpWriterRgb bmpWriterRgb = new BmpWriterRgb();
- BufferedImage bufferedImage = new BufferedImage(2, 2, 5);
- byte[] byteArray = bmpWriterRgb.getImageData(bufferedImage);
+ final BmpWriterRgb bmpWriterRgb = new BmpWriterRgb();
+ final BufferedImage bufferedImage = new BufferedImage(2, 2, 5);
+ final byte[] byteArray = bmpWriterRgb.getImageData(bufferedImage);
assertEquals(24, bmpWriterRgb.getBitsPerPixel());
assertEquals(0, bmpWriterRgb.getPaletteSize());
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java
index e613649..104244e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java
@@ -38,10 +38,10 @@ public class JpegDecoderTest {
@Test(expected = ImageReadException.class, timeout = 2000)
public void testDecodeBadFile() throws ImageReadException, IOException {
// From IMAGING-220
- File inputFile = new File(
+ final File inputFile = new File(
JpegDecoderTest.class.getResource("/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78.jpeg")
.getFile());
- ByteSourceFile byteSourceFile = new ByteSourceFile(inputFile);
+ final ByteSourceFile byteSourceFile = new ByteSourceFile(inputFile);
new JpegDecoder().decode(byteSourceFile);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
index eb704e2..5332a1e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
@@ -63,15 +63,15 @@ public class WriteExifMetadataExampleTest extends ExifBaseTest {
return;
}
new WriteExifMetadataExample().changeExifMetadata(imageFile, tempFile);
- JpegImageParser parser = new JpegImageParser();
- ByteSourceFile byteSource = new ByteSourceFile(tempFile);
- TiffImageMetadata tiff = parser.getExifMetadata(byteSource, null);
- for (TiffField tiffField : tiff.getAllFields()) {
+ final JpegImageParser parser = new JpegImageParser();
+ final ByteSourceFile byteSource = new ByteSourceFile(tempFile);
+ final TiffImageMetadata tiff = parser.getExifMetadata(byteSource, null);
+ for (final TiffField tiffField : tiff.getAllFields()) {
if (!tiffField.isLocalValue()) {
- int offset = tiffField.getOffset();
- String tag = tiffField.getTagName();
- String message = String.format("Odd offset %d, field %s", offset, tag);
- boolean isOdd = (tiffField.getOffset() & 1l) == 0;
+ final int offset = tiffField.getOffset();
+ final String tag = tiffField.getTagName();
+ final String message = String.format("Odd offset %d, field %s", offset, tag);
+ final boolean isOdd = (tiffField.getOffset() & 1l) == 0;
assertTrue(message, isOdd);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookupTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookupTest.java
index bc7d878..4dc3252 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookupTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookupTest.java
@@ -24,7 +24,7 @@ public class IptcTypeLookupTest{
@Test
public void testGetIptcTypeWithPositive() {
- IptcType iptcType = IptcTypeLookup.getIptcType(1117);
+ final IptcType iptcType = IptcTypeLookup.getIptcType(1117);
assertEquals(1117, iptcType.getType());
assertEquals("Unknown", iptcType.getName());
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java
index be3383a..ffc47a7 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java
@@ -28,8 +28,8 @@ public class AppnSegmentTest{
@Test
public void testCreatesAppnSegment() throws IOException {
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- AppnSegment appnSegment = new AppnSegment(0, 0, inputStream);
+ final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+ final AppnSegment appnSegment = new AppnSegment(0, 0, inputStream);
assertEquals("[Segment: APPN (APP-65504) (Unknown)]", appnSegment.toString());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegmentTest.java
index 158f3bb..160160d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegmentTest.java
@@ -28,12 +28,12 @@ public class JfifSegmentTest{
@Test
public void testCreatesJfifSegment() throws IOException {
- byte[] byteArray = new byte[25];
+ final byte[] byteArray = new byte[25];
try {
new JfifSegment((-2275), byteArray);
fail("Expecting exception: Exception");
- } catch(ImageReadException e) {
+ } catch(final ImageReadException e) {
assertEquals("Not a Valid JPEG File: missing JFIF string",e.getMessage());
assertEquals(JfifSegment.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/NegSizeSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/NegSizeSegmentTest.java
index 71957d9..f084ad0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/NegSizeSegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/NegSizeSegmentTest.java
@@ -35,7 +35,7 @@ public class NegSizeSegmentTest {
@Test
public void testCreatesNegSizeSegment() throws IOException {
- byte[] bytes = new byte[8];
+ final byte[] bytes = new byte[8];
bytes[0] = (byte) 0xff;
bytes[1] = (byte) 0xd8;
bytes[2] = (byte) 0xe1;
@@ -46,12 +46,12 @@ public class NegSizeSegmentTest {
bytes[7] = (byte) 0x00;
try {
- InputStream inputStream = new ByteArrayInputStream(bytes);
- ByteSource bs = new ByteSourceInputStream(inputStream, "NegSizeSegment");
- JpegImageParser p = new JpegImageParser();
+ final InputStream inputStream = new ByteArrayInputStream(bytes);
+ final ByteSource bs = new ByteSourceInputStream(inputStream, "NegSizeSegment");
+ final JpegImageParser p = new JpegImageParser();
p.getBufferedImage(bs, new HashMap<String, Object>());
fail("Expecting exception: ImageReadException");
- } catch (ImageReadException e) {
+ } catch (final ImageReadException e) {
assertEquals("Invalid segment size", e.getMessage());
assertEquals(JpegUtils.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegmentTest.java
index 3032048..d2aa50f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegmentTest.java
@@ -26,8 +26,8 @@ public class SosSegmentTest{
@Test
public void testGetComponentsTakingNoArguments() throws IOException {
- byte[] byteArray = new byte[5];
- SosSegment sosSegment = new SosSegment((-1044), byteArray);
+ final byte[] byteArray = new byte[5];
+ final SosSegment sosSegment = new SosSegment((-1044), byteArray);
sosSegment.getComponents();
assertEquals(0, sosSegment.successiveApproximationBitHigh);
@@ -36,8 +36,8 @@ public class SosSegmentTest{
@Test
public void testCreatesSosSegmentTakingThreeArguments() throws IOException {
- byte[] byteArray = new byte[5];
- SosSegment sosSegment = new SosSegment((-1044), byteArray);
+ final byte[] byteArray = new byte[5];
+ final SosSegment sosSegment = new SosSegment((-1044), byteArray);
assertEquals(0, sosSegment.successiveApproximationBitLow);
assertEquals(0, sosSegment.successiveApproximationBitHigh);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParserTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParserTest.java
index 2d0e539..99faa91 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParserTest.java
@@ -25,13 +25,13 @@ public class JpegXmpParserTest{
@Test
public void testCreatesJpegXmpParserAndCallsParseXmpJpegSegment() {
- JpegXmpParser jpegXmpParser = new JpegXmpParser();
- byte[] byteArray = new byte[1];
+ final JpegXmpParser jpegXmpParser = new JpegXmpParser();
+ final byte[] byteArray = new byte[1];
try {
jpegXmpParser.parseXmpJpegSegment(byteArray);
fail("Expecting exception: Exception");
- } catch(Exception e) {
+ } catch(final Exception e) {
assertEquals("Invalid JPEG XMP Segment.",e.getMessage());
assertEquals(JpegXmpParser.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/RleReaderTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/RleReaderTest.java
index 324fdd8..6aa2213 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pcx/RleReaderTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pcx/RleReaderTest.java
@@ -27,14 +27,14 @@ public class RleReaderTest{
@Test
public void testReadWithNonNull() {
- RleReader rleReader = new RleReader(false);
- byte[] byteArray = new byte[1];
- ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArray, (byte) (-64), (byte) (-64));
+ final RleReader rleReader = new RleReader(false);
+ final byte[] byteArray = new byte[1];
+ final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArray, (byte) (-64), (byte) (-64));
try {
rleReader.read(byteArrayInputStream, byteArray);
fail("Expecting exception: Exception");
- } catch(Exception e) {
+ } catch(final Exception e) {
assertEquals("Premature end of file reading image data",e.getMessage());
assertEquals(RleReader.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java
index 3735bf9..6861343 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngCrcTest.java
@@ -33,8 +33,8 @@ public class PngCrcTest{
@Test
public void testCrc() {
- PngCrc pngCrc = new PngCrc();
- byte[] byteArray = new byte[4];
+ final PngCrc pngCrc = new PngCrc();
+ final byte[] byteArray = new byte[4];
assertEquals(558161692, pngCrc.crc(byteArray, (byte)32));
assertEquals(3736805603L, pngCrc.start_partial_crc(byteArray, 0));
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java
index fc8c4a5..91d0688 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java
@@ -25,11 +25,11 @@ public class PngChunkTextTest{
@Test
public void testCreatesPngChunkText() {
- byte[] byteArray = new byte[0];
+ final byte[] byteArray = new byte[0];
try {
new PngChunkText(1214, 1214, 0, byteArray);
fail("Expecting exception: Exception");
- } catch(Throwable e) {
+ } catch(final Throwable e) {
assertEquals("PNG tEXt chunk keyword is not terminated.",e.getMessage());
assertEquals(PngChunkText.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverageTest.java b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverageTest.java
index 7a604eb..f43bc59 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverageTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverageTest.java
@@ -27,8 +27,8 @@ public class ScanlineFilterAverageTest{
@Test
public void testUnfilterWithNull() throws IOException, ImageReadException {
- ScanlineFilterAverage scanlineFilterAverage = new ScanlineFilterAverage(2);
- byte[] byteArray = new byte[9];
+ final ScanlineFilterAverage scanlineFilterAverage = new ScanlineFilterAverage(2);
+ final byte[] byteArray = new byte[9];
scanlineFilterAverage.unfilter(byteArray, byteArray, (byte[]) null);
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0}, byteArray);
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaethTest.java b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaethTest.java
index b152ff9..58b318d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaethTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaethTest.java
@@ -27,8 +27,8 @@ public class ScanlineFilterPaethTest{
@Test
public void testUnfilter() throws IOException, ImageReadException {
- ScanlineFilterPaeth scanlineFilterPaeth = new ScanlineFilterPaeth(0);
- byte[] byteArray = new byte[5];
+ final ScanlineFilterPaeth scanlineFilterPaeth = new ScanlineFilterPaeth(0);
+ final byte[] byteArray = new byte[5];
scanlineFilterPaeth.unfilter(byteArray, byteArray, (byte[]) null);
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0, (byte)0}, byteArray);
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUpTest.java b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUpTest.java
index 0269801..9f5d331 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUpTest.java
@@ -27,8 +27,8 @@ public class ScanlineFilterUpTest {
@Test
public void testUnfilterWithNull() throws IOException, ImageReadException {
- ScanlineFilterUp scanlineFilterUp = new ScanlineFilterUp();
- byte[] byteArray = new byte[4];
+ final ScanlineFilterUp scanlineFilterUp = new ScanlineFilterUp();
+ final byte[] byteArray = new byte[4];
scanlineFilterUp.unfilter(byteArray, byteArray, (byte[]) null);
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0}, byteArray);
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java b/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java
index 7c918d4..a93b85a 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java
@@ -25,13 +25,13 @@ public class TransparencyFilterIndexedColorTest{
@Test
public void testFilterWithNegativeAndNegative() {
- byte[] byteArray = new byte[0];
- TransparencyFilterIndexedColor transparencyFilterIndexedColor = new TransparencyFilterIndexedColor(byteArray);
+ final byte[] byteArray = new byte[0];
+ final TransparencyFilterIndexedColor transparencyFilterIndexedColor = new TransparencyFilterIndexedColor(byteArray);
try {
transparencyFilterIndexedColor.filter((-416), (-398));
fail("Expecting exception: Exception");
- } catch(Exception e) {
+ } catch(final Exception e) {
assertEquals("TransparencyFilterIndexedColor index: -398, bytes.length: 0",e.getMessage());
assertEquals(TransparencyFilterIndexedColor.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/pnm/PbmFileInfoTest.java b/src/test/java/org/apache/commons/imaging/formats/pnm/PbmFileInfoTest.java
index 8963eaf..ed97c34 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pnm/PbmFileInfoTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pnm/PbmFileInfoTest.java
@@ -29,15 +29,15 @@ public class PbmFileInfoTest{
@Test
public void testGetRGBThrowsIOException() throws IOException {
- PbmFileInfo pbmFileInfo = new PbmFileInfo(2764, 354, true);
- byte[] byteArray = new byte[2];
- InputStream inputStream = new ByteArrayInputStream(byteArray);
+ final PbmFileInfo pbmFileInfo = new PbmFileInfo(2764, 354, true);
+ final byte[] byteArray = new byte[2];
+ final InputStream inputStream = new ByteArrayInputStream(byteArray);
inputStream.read(byteArray);
try {
pbmFileInfo.getRGB(inputStream);
fail("Expecting exception: IOException");
- } catch(IOException e) {
+ } catch(final IOException e) {
assertEquals("PBM: Unexpected EOF",e.getMessage());
assertEquals(PbmFileInfo.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
index 16fb996..0cd70b4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
@@ -55,7 +55,7 @@ public class PnmImageParserTest {
@Test
public void testWriteImageRaw_happyCase() throws ImageWriteException,
ImageReadException, IOException {
- BufferedImage srcImage = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
+ final BufferedImage srcImage = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
final Map<String, Object> params = new HashMap<>();
params.put(PnmImageParser.PARAM_KEY_PNM_RAWBITS, PnmImageParser.PARAM_VALUE_PNM_RAWBITS_YES);
@@ -65,12 +65,12 @@ public class PnmImageParserTest {
assertTrue(srcImage.getWidth() == dstImage.getWidth());
assertTrue(srcImage.getHeight() == dstImage.getHeight());
- DataBufferInt srcData = (DataBufferInt) srcImage.getRaster().getDataBuffer();
- DataBufferInt dstData = (DataBufferInt) dstImage.getRaster().getDataBuffer();
+ final DataBufferInt srcData = (DataBufferInt) srcImage.getRaster().getDataBuffer();
+ final DataBufferInt dstData = (DataBufferInt) dstImage.getRaster().getDataBuffer();
for (int bank = 0; bank < srcData.getNumBanks(); bank++) {
- int[] actual = srcData.getData(bank);
- int[] expected = dstData.getData(bank);
+ final int[] actual = srcData.getData(bank);
+ final int[] expected = dstData.getData(bank);
assertArrayEquals(actual, expected);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReaderTest.java b/src/test/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReaderTest.java
index 4a7cc83..6922a6e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReaderTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReaderTest.java
@@ -28,10 +28,10 @@ public class WhiteSpaceReaderTest{
@Test
public void testReadLineReturningNonEmptyString() throws IOException {
- byte[] byteArray = new byte[6];
+ final byte[] byteArray = new byte[6];
byteArray[4] = (byte)13;
- ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArray);
- WhiteSpaceReader whiteSpaceReader = new WhiteSpaceReader(byteArrayInputStream);
+ final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArray);
+ final WhiteSpaceReader whiteSpaceReader = new WhiteSpaceReader(byteArrayInputStream);
assertEquals(6, byteArrayInputStream.available());
assertEquals("[0, 0, 0, 0]", Arrays.toString( whiteSpaceReader.readLine().getBytes() ) );
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceBlockTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceBlockTest.java
index e89cea2..0f29c60 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceBlockTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceBlockTest.java
@@ -26,8 +26,8 @@ public class ImageResourceBlockTest{
@Test
public void testCreatesImageResourceBlockAndCallsGetName() throws UnsupportedEncodingException {
- byte[] byteArray = new byte[3];
- ImageResourceBlock imageResourceBlock = new ImageResourceBlock(0, byteArray, byteArray);
+ final byte[] byteArray = new byte[3];
+ final ImageResourceBlock imageResourceBlock = new ImageResourceBlock(0, byteArray, byteArray);
assertEquals( new String(byteArray, "ISO-8859-1"), imageResourceBlock.getName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceTypeTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceTypeTest.java
index d862c0b..d7098f6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceTypeTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/ImageResourceTypeTest.java
@@ -24,14 +24,14 @@ public class ImageResourceTypeTest{
@Test
public void testGetDescriptionWithPositive() {
- String string = ImageResourceType.getDescription(2309);
+ final String string = ImageResourceType.getDescription(2309);
assertEquals("Path Information (saved paths).", string);
}
@Test
public void testGetDescriptionWithZero() {
- String string = ImageResourceType.getDescription(0);
+ final String string = ImageResourceType.getDescription(0);
assertEquals("Unknown", string);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmykTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmykTest.java
index 4b79198..81131c6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmykTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmykTest.java
@@ -24,7 +24,7 @@ public class DataParserCmykTest {
@Test
public void testGetBasicChannelsCount() {
- DataParserCmyk dataParserCmyk = new DataParserCmyk();
+ final DataParserCmyk dataParserCmyk = new DataParserCmyk();
assertEquals(4, dataParserCmyk.getBasicChannelsCount());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscaleTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscaleTest.java
index 3c3ff91..98e7490 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscaleTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscaleTest.java
@@ -24,7 +24,7 @@ public class DataParserGrayscaleTest{
@Test
public void testGetBasicChannelsCount() {
- DataParserGrayscale dataParserGrayscale = new DataParserGrayscale();
+ final DataParserGrayscale dataParserGrayscale = new DataParserGrayscale();
assertEquals(1, dataParserGrayscale.getBasicChannelsCount());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexedTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexedTest.java
index f1c9693..32e3347 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexedTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexedTest.java
@@ -25,11 +25,11 @@ public class DataParserIndexedTest{
@Test
public void testFailsToCreateDataParserIndexedThrowsArrayIndexOutOfBoundsException() {
- byte[] byteArray = new byte[24];
+ final byte[] byteArray = new byte[24];
try {
new DataParserIndexed(byteArray);
fail("Expecting exception: ArrayIndexOutOfBoundsException");
- } catch(ArrayIndexOutOfBoundsException e) {
+ } catch(final ArrayIndexOutOfBoundsException e) {
assertEquals("256",e.getMessage());
assertEquals(DataParserIndexed.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLabTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLabTest.java
index dac67fc..858cfe9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLabTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLabTest.java
@@ -24,7 +24,7 @@ public class DataParserLabTest{
@Test
public void testGetBasicChannelsCount() {
- DataParserLab dataParserLab = new DataParserLab();
+ final DataParserLab dataParserLab = new DataParserLab();
assertEquals(3, dataParserLab.getBasicChannelsCount());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
index ab854d7..289f207 100644
--- a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
@@ -65,11 +65,11 @@ public class RgbeReadTest extends RgbeBaseTest {
@Test(expected = ImageReadException.class, timeout = 2000)
public void testErrorDecompressingInvalidFile() throws ImageReadException, IOException {
// From IMAGING-219
- File inputFile = new File(
+ final File inputFile = new File(
RgbeReadTest.class.getResource("/IMAGING-219/timeout-9713502c9c371f1654b493650c16ab17c0444369")
.getFile());
- ByteSourceFile byteSourceFile = new ByteSourceFile(inputFile);
- Map<String, Object> params = Collections.<String, Object>emptyMap();
+ final ByteSourceFile byteSourceFile = new ByteSourceFile(inputFile);
+ final Map<String, Object> params = Collections.<String, Object>emptyMap();
new RgbeImageParser().getBufferedImage(byteSourceFile, params);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/JpegImageDataTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/JpegImageDataTest.java
index 812f59f..54ae1bf 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/JpegImageDataTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/JpegImageDataTest.java
@@ -24,9 +24,9 @@ public class JpegImageDataTest{
@Test
public void testCreatesJpegImageDataAndCallsGetElementDescription() {
- byte[] byteArray = new byte[5];
- JpegImageData jpegImageData = new JpegImageData((-1L), 1, byteArray);
- String string = jpegImageData.getElementDescription();
+ final byte[] byteArray = new byte[5];
+ final JpegImageData jpegImageData = new JpegImageData((-1L), 1, byteArray);
+ final String string = jpegImageData.getElementDescription();
assertEquals("Jpeg image data: 5 bytes", string);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagsTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagsTest.java
index 78b4bea..15d818b 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagsTest.java
@@ -25,7 +25,7 @@ public class TiffTagsTest{
@Test
public void testGetTagWithNegativeAndPositive() {
- TagInfo tagInfo = TiffTags.getTag((-1), 50933);
+ final TagInfo tagInfo = TiffTags.getTag((-1), 50933);
assertEquals((-1), tagInfo.tag);
assertEquals( "Unknown Tag", tagInfo.name );
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStripsTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStripsTest.java
index 8bcf0c0..3ddf5f9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStripsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStripsTest.java
@@ -23,10 +23,10 @@ import static org.junit.Assert.assertArrayEquals;
public class DataReaderStripsTest {
@Test
public void testApplyPredictor() throws Exception {
- int[] bitsPerPixel = {1,2,3};
- DataReaderStrips strips = new DataReaderStrips(null, null, 3, bitsPerPixel , 2, 4, 3, 1, 1, null, 2, null);
+ final int[] bitsPerPixel = {1,2,3};
+ final DataReaderStrips strips = new DataReaderStrips(null, null, 3, bitsPerPixel , 2, 4, 3, 1, 1, null, 2, null);
strips.resetPredictor();
- int[] samples = {10, 355, 355, 255};
+ final int[] samples = {10, 355, 355, 255};
int[] expected = {10, 99, 99, 255};
int[] predicted = strips.applyPredictor(samples);
assertArrayEquals(expected, predicted);
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeByteTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeByteTest.java
index cf5c71b..477620e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeByteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeByteTest.java
@@ -25,8 +25,8 @@ public class FieldTypeByteTest{
@Test(expected = ImageWriteException.class)
public void testWriteDataWithNull() throws ImageWriteException {
- FieldTypeByte fieldTypeByte = FieldType.UNDEFINED;
- ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
+ final FieldTypeByte fieldTypeByte = FieldType.UNDEFINED;
+ final ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
fieldTypeByte.writeData( null, byteOrder);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLongTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLongTest.java
index 0e927a3..ad16fec 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLongTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLongTest.java
@@ -27,13 +27,13 @@ public class FieldTypeLongTest {
@Test
public void testWriteDataWithNonNull() {
- FieldTypeLong fieldTypeLong = FieldType.IFD;
- ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
+ final FieldTypeLong fieldTypeLong = FieldType.IFD;
+ final ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
try {
fieldTypeLong.writeData(byteOrder, byteOrder);
fail("Expecting exception: Exception");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertEquals("Invalid data: BIG_ENDIAN (java.nio.ByteOrder)", e.getMessage());
assertEquals(FieldTypeLong.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShortTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShortTest.java
index 6792653..fcc0253 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShortTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShortTest.java
@@ -27,13 +27,13 @@ public class FieldTypeShortTest {
@Test
public void testCreatesFieldTypeShortAndCallsWriteData() {
- FieldTypeShort fieldTypeShort = new FieldTypeShort(1234, "");
- ByteOrder byteOrder = ByteOrder.LITTLE_ENDIAN;
+ final FieldTypeShort fieldTypeShort = new FieldTypeShort(1234, "");
+ final ByteOrder byteOrder = ByteOrder.LITTLE_ENDIAN;
try {
fieldTypeShort.writeData("", byteOrder);
fail("Expecting exception: Exception");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertEquals("Invalid data: (java.lang.String)", e.getMessage());
assertEquals(FieldTypeShort.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeTest.java
index 762a185..a8c62d4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeTest.java
@@ -28,7 +28,7 @@ public class FieldTypeTest{
try {
FieldType.getFieldType((-748));
fail("Expecting exception: Exception");
- } catch(Exception e) {
+ } catch(final Exception e) {
assertEquals("Field type -748 is unsupported",e.getMessage());
assertEquals(FieldType.class.getName(), e.getStackTrace()[0].getClassName());
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteTest.java
index 06d2689..1f45dd1 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteTest.java
@@ -27,8 +27,8 @@ public class TagInfoByteTest {
@Test
public void testCreatesTagInfoByteTakingFourArgumentsAndCallsEncodeValue() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
- TagInfoByte tagInfoByte = new TagInfoByte("", 347, tiffDirectoryType);
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
+ final TagInfoByte tagInfoByte = new TagInfoByte("", 347, tiffDirectoryType);
assertArrayEquals(new byte[]{(byte) 0}, tagInfoByte.encodeValue((ByteOrder) null, (byte) 0));
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByteTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByteTest.java
index 6515418..66ecadc 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSByteTest.java
@@ -27,10 +27,10 @@ public class TagInfoSByteTest{
@Test
public void testCreatesTagInfoSByteAndCallsEncodeValue() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.EXIF_DIRECTORY_GPS;
- TagInfoSByte tagInfoSByte = new TagInfoSByte("", 0, tiffDirectoryType);
- ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
- byte[] byteArray = tagInfoSByte.encodeValue(byteOrder, (byte)6);
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.EXIF_DIRECTORY_GPS;
+ final TagInfoSByte tagInfoSByte = new TagInfoSByte("", 0, tiffDirectoryType);
+ final ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
+ final byte[] byteArray = tagInfoSByte.encodeValue(byteOrder, (byte)6);
assertArrayEquals(new byte[] {(byte)6}, byteArray);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSBytesTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSBytesTest.java
index 68b2e7d..14c1e6a 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSBytesTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSBytesTest.java
@@ -27,11 +27,11 @@ public class TagInfoSBytesTest{
@Test
public void testCreatesTagInfoSBytesAndCallsEncodeValue() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD3;
- TagInfoSBytes tagInfoSBytes = new TagInfoSBytes("", (-198), 10, tiffDirectoryType);
- ByteOrder byteOrder = ByteOrder.LITTLE_ENDIAN;
- byte[] byteArray = new byte[2];
- byte[] byteArrayTwo = tagInfoSBytes.encodeValue(byteOrder, byteArray);
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD3;
+ final TagInfoSBytes tagInfoSBytes = new TagInfoSBytes("", (-198), 10, tiffDirectoryType);
+ final ByteOrder byteOrder = ByteOrder.LITTLE_ENDIAN;
+ final byte[] byteArray = new byte[2];
+ final byte[] byteArrayTwo = tagInfoSBytes.encodeValue(byteOrder, byteArray);
assertSame(byteArrayTwo, byteArray);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongTest.java
index 150d369..0ceee00 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongTest.java
@@ -27,9 +27,9 @@ public class TagInfoSLongTest{
@Test
public void testEncodeValue() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
- TagInfoSLong tagInfoSLong = new TagInfoSLong("ttq{\"0r{s}'RQ", (-1770), tiffDirectoryType);
- ByteOrder byteOrder = ByteOrder.nativeOrder();
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
+ final TagInfoSLong tagInfoSLong = new TagInfoSLong("ttq{\"0r{s}'RQ", (-1770), tiffDirectoryType);
+ final ByteOrder byteOrder = ByteOrder.nativeOrder();
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0}, tagInfoSLong.encodeValue(byteOrder, 0));
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortTest.java
index 054c1a6..bbc7cc0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortTest.java
@@ -27,9 +27,9 @@ public class TagInfoSShortTest{
@Test
public void testGetValue() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD3;
- TagInfoSShort tagInfoSShort = new TagInfoSShort("n1SN[2cj\"2),+O", (-1785), tiffDirectoryType);
- ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD3;
+ final TagInfoSShort tagInfoSShort = new TagInfoSShort("n1SN[2cj\"2),+O", (-1785), tiffDirectoryType);
+ final ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
assertEquals((short) (-10231), tagInfoSShort.getValue(null, tagInfoSShort.encodeValue(byteOrder, (short) 2520)));
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortsTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortsTest.java
index e9993d9..f9d04c8 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShortsTest.java
@@ -27,10 +27,10 @@ public class TagInfoSShortsTest{
@Test
public void testEncodeValue() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
- TagInfoSShorts tagInfoSShorts = new TagInfoSShorts("", 2269, 2269, tiffDirectoryType);
- ByteOrder byteOrder = ByteOrder.nativeOrder();
- short[] shortArray = new short[2];
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
+ final TagInfoSShorts tagInfoSShorts = new TagInfoSShorts("", 2269, 2269, tiffDirectoryType);
+ final ByteOrder byteOrder = ByteOrder.nativeOrder();
+ final short[] shortArray = new short[2];
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0}, tagInfoSShorts.encodeValue(byteOrder, shortArray));
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUnknownTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUnknownTest.java
index 39a68d3..fa2db7d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUnknownTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUnknownTest.java
@@ -25,7 +25,7 @@ public class TagInfoUnknownTest{
@Test
public void testCreatesTagInfoUnknown() {
- TiffDirectoryType tiffDirectoryType = TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD;
+ final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD;
new TagInfoUnknown("", 2670, tiffDirectoryType);
assertEquals((-1), TagInfo.LENGTH_UNKNOWN);
diff --git a/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java b/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
index 2c8f14a..354c421 100644
--- a/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
+++ b/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
@@ -26,8 +26,8 @@ public class SimplePaletteTest{
@Test
public void testGetPaletteIndexReturningNegative() {
- int[] intArray = new int[1];
- SimplePalette simplePalette = new SimplePalette(intArray);
+ final int[] intArray = new int[1];
+ final SimplePalette simplePalette = new SimplePalette(intArray);
assertEquals( -1, simplePalette.getPaletteIndex((-1)));
assertEquals(1, simplePalette.length() );