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 2025/02/09 20:03:20 UTC

(commons-imaging) branch master updated (d4749409 -> f26e1133)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git


    from d4749409 Keep same matrix order [skip ci]
     new 256fba7b Checkstyle issues in tests
     new e9db3592 Checkstyle issues in tests
     new f26e1133 Enabled Checkstyle for tests

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |  2 +-
 .../imaging/formats/png/PngImageParser.java        |  2 +-
 .../org/apache/commons/imaging/ImageDumpTest.java  |  2 +-
 .../imaging/bytesource/ByteSourceDataTest.java     |  2 +-
 .../tiff/ExampleReadFloatingPointData.java         |  2 +-
 .../imaging/examples/tiff/ReadTagsAndImages.java   | 11 +++---
 .../imaging/examples/tiff/SurveyTiffFile.java      |  2 +-
 .../imaging/examples/tiff/SurveyTiffFolder.java    |  4 +--
 .../imaging/formats/bmp/BmpWriterRgbTest.java      |  2 +-
 .../imaging/formats/gif/AbstractGifTest.java       |  4 +--
 .../imaging/formats/icns/IcnsRoundTripTest.java    | 32 ++++++++---------
 .../imaging/formats/ico/IcoRoundtripTest.java      | 40 +++++++++++-----------
 .../imaging/formats/jpeg/exif/ExifRewriteTest.java |  2 +-
 .../imaging/formats/jpeg/iptc/IptcAddTest.java     |  2 +-
 .../imaging/formats/jpeg/iptc/IptcParserTest.java  |  1 +
 .../formats/jpeg/iptc/IptcTypeLookupTest.java      |  2 +-
 .../imaging/formats/jpeg/iptc/IptcUpdateTest.java  |  2 +-
 .../formats/jpeg/segments/AppnSegmentTest.java     |  2 +-
 .../formats/jpeg/segments/JfifSegmentTest.java     |  2 +-
 .../formats/jpeg/segments/SosSegmentTest.java      |  2 +-
 .../formats/jpeg/xmp/JpegXmpParserTest.java        |  2 +-
 .../formats/jpeg/xmp/JpegXmpRewriteTest.java       |  4 +--
 .../commons/imaging/formats/pcx/RleReaderTest.java |  2 +-
 .../commons/imaging/formats/png/PngCrcTest.java    |  2 +-
 .../formats/png/PngWriteForceTrueColorText.java    |  2 +-
 .../formats/png/chunks/PngChunkTextTest.java       |  2 +-
 .../scanlinefilters/ScanlineFilterAverageTest.java |  2 +-
 .../scanlinefilters/ScanlineFilterPaethTest.java   |  2 +-
 .../png/scanlinefilters/ScanlineFilterUpTest.java  |  2 +-
 .../TransparencyFilterIndexedColorTest.java        |  2 +-
 .../imaging/formats/pnm/PbmFileInfoTest.java       |  2 +-
 .../imaging/formats/pnm/WhiteSpaceReaderTest.java  |  2 +-
 .../formats/psd/ImageResourceBlockTest.java        |  2 +-
 .../imaging/formats/psd/ImageResourceTypeTest.java |  2 +-
 .../psd/dataparsers/DataParserCmykTest.java        |  2 +-
 .../psd/dataparsers/DataParserGrayscaleTest.java   |  2 +-
 .../psd/dataparsers/DataParserIndexedTest.java     |  2 +-
 .../formats/psd/dataparsers/DataParserLabTest.java |  2 +-
 .../imaging/formats/tiff/JpegImageDataTest.java    |  2 +-
 .../formats/tiff/TiffAlphaRoundTripTest.java       |  2 +-
 .../tiff/TiffFloatingPointMultivariableTest.java   | 13 ++++---
 .../tiff/TiffFloatingPointRoundTripTest.java       | 12 +++----
 .../commons/imaging/formats/tiff/TiffLzwTest.java  | 11 +++---
 .../imaging/formats/tiff/TiffReadAlphaTest.java    |  4 +--
 .../formats/tiff/TiffRoundTripInt32Test.java       | 11 +++---
 .../formats/tiff/TiffShortIntRoundTripTest.java    | 10 +++---
 .../imaging/formats/tiff/TiffSubImageTest.java     |  2 +-
 .../commons/imaging/formats/tiff/TiffTagsTest.java |  2 +-
 .../tiff/datareaders/DataReaderStripsTest.java     |  2 +-
 .../formats/tiff/fieldtypes/FieldTypeByteTest.java |  2 +-
 .../formats/tiff/fieldtypes/FieldTypeLongTest.java |  2 +-
 .../tiff/fieldtypes/FieldTypeShortTest.java        |  2 +-
 .../formats/tiff/fieldtypes/FieldTypeTest.java     |  2 +-
 .../tiff/itu_t4/HuffmanTreeExceptionTest.java      |  2 +-
 .../formats/tiff/itu_t4/T4_T6_TablesTest.java      |  4 +--
 .../formats/tiff/taginfos/TagInfoByteTest.java     |  2 +-
 .../formats/tiff/taginfos/TagInfoSByteTest.java    |  2 +-
 .../formats/tiff/taginfos/TagInfoSBytesTest.java   |  2 +-
 .../formats/tiff/taginfos/TagInfoSLongTest.java    |  2 +-
 .../formats/tiff/taginfos/TagInfoSShortTest.java   |  2 +-
 .../formats/tiff/taginfos/TagInfoSShortsTest.java  |  2 +-
 .../formats/tiff/taginfos/TagInfoUnknownTest.java  |  2 +-
 .../tiff/write/TiffOutputDirectoryTest.java        |  2 +-
 .../commons/imaging/palette/SimplePaletteTest.java |  2 +-
 .../commons/imaging/roundtrip/RoundtripBase.java   |  4 +--
 65 files changed, 134 insertions(+), 131 deletions(-)


(commons-imaging) 03/03: Enabled Checkstyle for tests

Posted by gg...@apache.org.
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

commit f26e11333035cc191dce0e645d16592b1fb1bf52
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 9 15:03:15 2025 -0500

    Enabled Checkstyle for tests
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f0cf80c..5a417f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
             <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
             <!-- <suppressionsLocation>${basedir}/src/conf/checkstyle-suppressions.xml</suppressionsLocation> -->
             <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-            <includeTestSourceDirectory>false</includeTestSourceDirectory>
+            <includeTestSourceDirectory>true</includeTestSourceDirectory>
             <enableRulesSummary>false</enableRulesSummary>
            <excludes>target/**</excludes>
           </configuration>


(commons-imaging) 02/03: Checkstyle issues in tests

Posted by gg...@apache.org.
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

commit e9db3592f709a0512504d78901523b6fb883202f
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 9 15:02:59 2025 -0500

    Checkstyle issues in tests
---
 .../org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
index d4a5b70b..e0743da0 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
@@ -224,6 +224,7 @@ public class ReadTagsAndImages {
             default:
                 break;
             }
+            break;
         case GTRasterTypeGeoKey:
             switch (valueOrPosition) {
             case 1:
@@ -244,6 +245,7 @@ public class ReadTagsAndImages {
             default:
                 break;
             }
+            break;
         case GTCitationGeoKey:
             return extractAscii(asciiParameters, valueOrPosition, len);
         case GeogCitationGeoKey:
@@ -257,6 +259,7 @@ public class ReadTagsAndImages {
             default:
                 break;
             }
+            break;
         case GeogSemiMajorAxisGeoKey:
             return extractDouble(doubleParameters, valueOrPosition, len);
         case GeogInvFlatteningGeoKey:


(commons-imaging) 01/03: Checkstyle issues in tests

Posted by gg...@apache.org.
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

commit 256fba7b4159b895d42b83a5d1c3222c1c623f0e
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 9 15:02:52 2025 -0500

    Checkstyle issues in tests
---
 .../imaging/formats/png/PngImageParser.java        |  2 +-
 .../org/apache/commons/imaging/ImageDumpTest.java  |  2 +-
 .../imaging/bytesource/ByteSourceDataTest.java     |  2 +-
 .../tiff/ExampleReadFloatingPointData.java         |  2 +-
 .../imaging/examples/tiff/ReadTagsAndImages.java   |  8 ++---
 .../imaging/examples/tiff/SurveyTiffFile.java      |  2 +-
 .../imaging/examples/tiff/SurveyTiffFolder.java    |  4 +--
 .../imaging/formats/bmp/BmpWriterRgbTest.java      |  2 +-
 .../imaging/formats/gif/AbstractGifTest.java       |  4 +--
 .../imaging/formats/icns/IcnsRoundTripTest.java    | 32 ++++++++---------
 .../imaging/formats/ico/IcoRoundtripTest.java      | 40 +++++++++++-----------
 .../imaging/formats/jpeg/exif/ExifRewriteTest.java |  2 +-
 .../imaging/formats/jpeg/iptc/IptcAddTest.java     |  2 +-
 .../imaging/formats/jpeg/iptc/IptcParserTest.java  |  1 +
 .../formats/jpeg/iptc/IptcTypeLookupTest.java      |  2 +-
 .../imaging/formats/jpeg/iptc/IptcUpdateTest.java  |  2 +-
 .../formats/jpeg/segments/AppnSegmentTest.java     |  2 +-
 .../formats/jpeg/segments/JfifSegmentTest.java     |  2 +-
 .../formats/jpeg/segments/SosSegmentTest.java      |  2 +-
 .../formats/jpeg/xmp/JpegXmpParserTest.java        |  2 +-
 .../formats/jpeg/xmp/JpegXmpRewriteTest.java       |  4 +--
 .../commons/imaging/formats/pcx/RleReaderTest.java |  2 +-
 .../commons/imaging/formats/png/PngCrcTest.java    |  2 +-
 .../formats/png/PngWriteForceTrueColorText.java    |  2 +-
 .../formats/png/chunks/PngChunkTextTest.java       |  2 +-
 .../scanlinefilters/ScanlineFilterAverageTest.java |  2 +-
 .../scanlinefilters/ScanlineFilterPaethTest.java   |  2 +-
 .../png/scanlinefilters/ScanlineFilterUpTest.java  |  2 +-
 .../TransparencyFilterIndexedColorTest.java        |  2 +-
 .../imaging/formats/pnm/PbmFileInfoTest.java       |  2 +-
 .../imaging/formats/pnm/WhiteSpaceReaderTest.java  |  2 +-
 .../formats/psd/ImageResourceBlockTest.java        |  2 +-
 .../imaging/formats/psd/ImageResourceTypeTest.java |  2 +-
 .../psd/dataparsers/DataParserCmykTest.java        |  2 +-
 .../psd/dataparsers/DataParserGrayscaleTest.java   |  2 +-
 .../psd/dataparsers/DataParserIndexedTest.java     |  2 +-
 .../formats/psd/dataparsers/DataParserLabTest.java |  2 +-
 .../imaging/formats/tiff/JpegImageDataTest.java    |  2 +-
 .../formats/tiff/TiffAlphaRoundTripTest.java       |  2 +-
 .../tiff/TiffFloatingPointMultivariableTest.java   | 13 ++++---
 .../tiff/TiffFloatingPointRoundTripTest.java       | 12 +++----
 .../commons/imaging/formats/tiff/TiffLzwTest.java  | 11 +++---
 .../imaging/formats/tiff/TiffReadAlphaTest.java    |  4 +--
 .../formats/tiff/TiffRoundTripInt32Test.java       | 11 +++---
 .../formats/tiff/TiffShortIntRoundTripTest.java    | 10 +++---
 .../imaging/formats/tiff/TiffSubImageTest.java     |  2 +-
 .../commons/imaging/formats/tiff/TiffTagsTest.java |  2 +-
 .../tiff/datareaders/DataReaderStripsTest.java     |  2 +-
 .../formats/tiff/fieldtypes/FieldTypeByteTest.java |  2 +-
 .../formats/tiff/fieldtypes/FieldTypeLongTest.java |  2 +-
 .../tiff/fieldtypes/FieldTypeShortTest.java        |  2 +-
 .../formats/tiff/fieldtypes/FieldTypeTest.java     |  2 +-
 .../tiff/itu_t4/HuffmanTreeExceptionTest.java      |  2 +-
 .../formats/tiff/itu_t4/T4_T6_TablesTest.java      |  4 +--
 .../formats/tiff/taginfos/TagInfoByteTest.java     |  2 +-
 .../formats/tiff/taginfos/TagInfoSByteTest.java    |  2 +-
 .../formats/tiff/taginfos/TagInfoSBytesTest.java   |  2 +-
 .../formats/tiff/taginfos/TagInfoSLongTest.java    |  2 +-
 .../formats/tiff/taginfos/TagInfoSShortTest.java   |  2 +-
 .../formats/tiff/taginfos/TagInfoSShortsTest.java  |  2 +-
 .../formats/tiff/taginfos/TagInfoUnknownTest.java  |  2 +-
 .../tiff/write/TiffOutputDirectoryTest.java        |  2 +-
 .../commons/imaging/palette/SimplePaletteTest.java |  2 +-
 .../commons/imaging/roundtrip/RoundtripBase.java   |  4 +--
 64 files changed, 130 insertions(+), 130 deletions(-)

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 68224237..f982e443 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
@@ -145,7 +145,7 @@ public class PngImageParser extends AbstractImageParser<PngImagingParameters> im
         };
     }
 
-    // private final static int tRNS = CharsToQuad('t', 'R', 'N', 's');
+    // private static final int tRNS = CharsToQuad('t', 'R', 'N', 's');
 
     @Override
     public BufferedImage getBufferedImage(final ByteSource byteSource, final PngImagingParameters params) throws ImagingException, IOException {
diff --git a/src/test/java/org/apache/commons/imaging/ImageDumpTest.java b/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
index 895e6898..5ecdcc83 100644
--- a/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
@@ -44,4 +44,4 @@ public class ImageDumpTest {
         assertEquals(3, colorSpace.getNumComponents());
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceDataTest.java b/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceDataTest.java
index a29b7acf..c4e82485 100644
--- a/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceDataTest.java
+++ b/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceDataTest.java
@@ -127,7 +127,7 @@ public class ByteSourceDataTest extends AbstractByteSourceTest {
         }
         // test cache by completely reading InputStream N times.
         for (int j = 0; j < 5; j++) {
-            try (final InputStream is = byteSource.getInputStream()) {
+            try (InputStream is = byteSource.getInputStream()) {
                 final byte[] dst = IOUtils.toByteArray(is);
                 assertArrayEquals(src, dst);
             }
diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java b/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
index 13da7826..f6b9e067 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
@@ -112,7 +112,7 @@ public class ExampleReadFloatingPointData {
         // the value 9999 as a special "No Data" indicator. In that case,
         // we do not want to include 9999 in the simple-statistics survey.
         final float excludedValue = Float.NaN;
-        TiffRasterStatistics simpleStats;
+        final TiffRasterStatistics simpleStats;
         if ("Sample64BitFloatingPointPix451x337.tiff".equals(target.getName())) {
             simpleStats = rasterData.getSimpleStatistics(9999);
         } else {
diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
index c9c8fb9d..d4a5b70b 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
@@ -510,9 +510,9 @@ public class ReadTagsAndImages {
 
             // The first four elements in the integer array are not
             // actually a GeoKey, but rather an overall identifier
-            GeoKey geoKey;
-            String name;
-            String interpretation;
+            final GeoKey geoKey;
+            final String name;
+            final String interpretation;
             if (i == 0) {
                 name = "~~~";
                 interpretation = "~~~";
@@ -540,7 +540,7 @@ public class ReadTagsAndImages {
         // a negative number. But by the GeoTIFF standard,
         // the vertical spacing is given as a positive number.
         final TiffField pixelScaleField = directory.findField(GeoTiffTagConstants.EXIF_TAG_MODEL_PIXEL_SCALE_TAG);
-        double[] pixelScale;
+        final double[] pixelScale;
         if (pixelScaleField == null) {
             ps.format("%nModelPixelScale is not supplied%n");
         } else {
diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
index f8c00570..99dd81e0 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
@@ -287,7 +287,7 @@ public class SurveyTiffFile {
         }
 
         final StringBuilder sb = new StringBuilder();
-        try (final Formatter fmt = new Formatter(sb)) {
+        try (Formatter fmt = new Formatter(sb)) {
 
             // Establish a TiffReader. This is just a simple constructor that
             // does not actually access the file. So the application cannot
diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
index 3e6e8c22..ddaf9675 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
@@ -46,7 +46,7 @@ public class SurveyTiffFolder {
         @Override
         public int compare(final String[] a, final String[] b) {
             for (int i = 0; i < a.length && i < b.length; i++) {
-                int test;
+                final int test;
                 if (isNumeric(a[i]) && isNumeric(b[i])) {
                     final int iA = Integer.parseInt(a[i]);
                     final int iB = Integer.parseInt(b[i]);
@@ -203,7 +203,7 @@ public class SurveyTiffFolder {
                 }
             }
 
-            String result;
+            final String result;
             try {
                 result = surveyor.surveyFile(file, csv);
             } catch (final IOException ex) {
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 5354f137..d5c850f1 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
@@ -37,4 +37,4 @@ public class BmpWriterRgbTest {
         assertArrayEquals(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, byteArray);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java b/src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java
index 2f9d97a7..f3a11ccd 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java
@@ -29,9 +29,9 @@ import org.apache.commons.imaging.ImagingException;
 
 public abstract class AbstractGifTest extends AbstractImagingTest {
 
-    private final static String ANIMATED_FOLDER_NAME = "animated";
+    private static final String ANIMATED_FOLDER_NAME = "animated";
 
-    private final static String SINGLE_IMAGE_FOLDER_NAME = "single";
+    private static final String SINGLE_IMAGE_FOLDER_NAME = "single";
 
     private static final ImageFilter IMAGE_FILTER = AbstractGifTest::isGif;
 
diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
index 0f38eb3d..47e26e92 100644
--- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
@@ -47,8 +47,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test1BPPIconMaskVersus8BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xff000000;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 2 * 16 * 16 / 8 + 4 + 4 + 16 * 16);
             bos.write4Bytes(IcnsType.ICNS_16x16_1BIT_IMAGE_AND_MASK.getType());
@@ -84,8 +84,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test32BPPHalfMaskedIcon() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xff0000ff;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 4 * 16 * 16 + 4 + 4 + 16 * 16 / 8);
             bos.write4Bytes(IcnsType.ICNS_16x16_32BIT_IMAGE.getType());
@@ -130,8 +130,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test32BPPMaskedIcon() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x000000ff;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 4 * 16 * 16 + 4 + 4 + 2 * 16 * 16 / 8);
             bos.write4Bytes(IcnsType.ICNS_16x16_32BIT_IMAGE.getType());
@@ -186,8 +186,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test32BPPMaskMissingIcon() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xff0000ff;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 4 * 16 * 16);
             bos.write4Bytes(IcnsType.ICNS_16x16_32BIT_IMAGE.getType());
@@ -216,8 +216,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test8BPPIcon1BPPMaskVersus8BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x00cccccc;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 16 * 16 + 4 + 4 + 16 * 16 + 4 + 4 + 2 * 16 * 16 / 8);
             bos.write4Bytes(IcnsType.ICNS_16x16_8BIT_IMAGE.getType());
@@ -273,8 +273,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test8BPPIcon8BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x00cccccc;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 16 * 16 + 4 + 4 + 16 * 16);
             bos.write4Bytes(IcnsType.ICNS_16x16_8BIT_IMAGE.getType());
@@ -310,8 +310,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test8BPPIcon8BPPMaskVersus1BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x00cccccc;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 16 * 16 + 4 + 4 + 16 * 16 + 4 + 4 + 2 * 16 * 16 / 8);
             bos.write4Bytes(IcnsType.ICNS_16x16_8BIT_IMAGE.getType());
@@ -367,8 +367,8 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
     public void test8BPPIconNoMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xffcccccc;
-        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                final BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                BinaryOutputStream bos = BinaryOutputStream.bigEndian(baos)) {
             bos.write4Bytes(IcnsImageParser.ICNS_MAGIC);
             bos.write4Bytes(4 + 4 + 4 + 4 + 16 * 16);
             bos.write4Bytes(IcnsType.ICNS_16x16_8BIT_IMAGE.getType());
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
index 3f3a74a4..f7118e04 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
@@ -44,8 +44,8 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     private static final class GeneratorFor16BitBitmaps implements BitmapGenerator {
         @Override
         public byte[] generateBitmap(final int foreground, final int background, final int paletteSize) throws IOException, ImagingException {
-            try (final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-                    final BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
+            try (ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
+                    BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
                 // Palette
                 for (int i = 0; i < paletteSize; i++) {
                     bos.write4Bytes(0);
@@ -77,8 +77,8 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     private static final class GeneratorFor1BitBitmaps implements BitmapGenerator {
         @Override
         public byte[] generateBitmap(final int foreground, final int background, final int paletteSize) throws IOException, ImagingException {
-            try (final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-                    final BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
+            try (ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
+                    BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
                 // Palette
                 bos.write3Bytes(background);
                 bos.write(0);
@@ -114,8 +114,8 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     private static final class GeneratorFor24BitBitmaps implements BitmapGenerator {
         @Override
         public byte[] generateBitmap(final int foreground, final int background, final int paletteSize) throws IOException, ImagingException {
-            try (final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-                    final BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
+            try (ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
+                    BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
                 // Palette
                 for (int i = 0; i < paletteSize; i++) {
                     bos.write4Bytes(0);
@@ -146,8 +146,8 @@ public class IcoRoundtripTest extends AbstractIcoTest {
 
     private static final class GeneratorFor32BitBitmaps implements BitmapGenerator {
         public byte[] generate32bitRGBABitmap(final int foreground, final int background, final int paletteSize, final boolean writeMask) throws IOException {
-            try (final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-                    final BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
+            try (ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
+                    BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
                 // Palette
                 for (int i = 0; i < paletteSize; i++) {
                     bos.write4Bytes(0);
@@ -186,8 +186,8 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     private static final class GeneratorFor4BitBitmaps implements BitmapGenerator {
         @Override
         public byte[] generateBitmap(final int foreground, final int background, final int paletteSize) throws IOException, ImagingException {
-            try (final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-                    final BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
+            try (ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
+                    BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
                 // Palette
                 bos.write3Bytes(background);
                 bos.write(0);
@@ -219,8 +219,8 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     private static final class GeneratorFor8BitBitmaps implements BitmapGenerator {
         @Override
         public byte[] generateBitmap(final int foreground, final int background, final int paletteSize) throws IOException, ImagingException {
-            try (final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-                    final BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
+            try (ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
+                    BinaryOutputStream bos = BinaryOutputStream.littleEndian(byteArrayStream)) {
                 // Palette
                 bos.write3Bytes(background);
                 bos.write(0);
@@ -275,7 +275,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
         final int foreground = 0xFFF000E0;
         final int background = 0xFF102030;
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+        try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
             // For 32 bit RGBA, the AND mask can be missing:
             final byte[] bitmap = new GeneratorFor32BitBitmaps().generate32bitRGBABitmap(foreground, background, 0, false);
             writeICONDIR(bos, 0, 1, 1);
@@ -290,7 +290,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     @Test
     public void testAlphaVersusANDMask() throws Exception {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+        try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
             final byte[] bitmap = new GeneratorFor32BitBitmaps().generate32bitRGBABitmap(0xFF000000, 0x00000000, 0, true);
             writeICONDIR(bos, 0, 1, 1);
             writeICONDIRENTRY(bos, 16, 16, 0, 0, 1, 32, 40 + bitmap.length);
@@ -313,7 +313,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
             final BitmapGenerator bitmapGenerator = entry.getValue();
 
             final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+            try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
                 final byte[] bitmap = bitmapGenerator.generateBitmap(foreground, background, bitDepth <= 8 ? 1 << bitDepth : 0);
                 writeICONDIR(bos, 0, 1, 1);
                 writeICONDIRENTRY(bos, 3 /* width, should be 16 */, 4 /*
@@ -336,7 +336,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     @Test
     public void testBitfieldCompression() throws Exception {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+        try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
             final byte[] bitmap = new GeneratorFor32BitBitmaps().generate32bitRGBABitmap(0xFFFF0000, 0xFFFFFFFF, 0, true);
             writeICONDIR(bos, 0, 1, 1);
             writeICONDIRENTRY(bos, 16, 16, 0, 0, 1, 32, 40 + bitmap.length);
@@ -359,7 +359,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
             final BitmapGenerator bitmapGenerator = entry.getValue();
 
             final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+            try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
                 final byte[] bitmap = bitmapGenerator.generateBitmap(foreground, background, 2);
                 writeICONDIR(bos, 0, 1, 1);
                 writeICONDIRENTRY(bos, 3, 4, 7, 20, 11, 19, 40 + bitmap.length);
@@ -374,7 +374,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
     @Test
     public void testFullyTransparent32bitRGBA() throws Exception {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+        try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
             final byte[] bitmap = new GeneratorFor32BitBitmaps().generate32bitRGBABitmap(0x00000000, 0x00FFFFFF, 0, true);
             writeICONDIR(bos, 0, 1, 1);
             writeICONDIRENTRY(bos, 16, 16, 0, 0, 1, 32, 40 + bitmap.length);
@@ -395,7 +395,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
             final BitmapGenerator bitmapGenerator = entry.getValue();
 
             final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+            try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
                 final byte[] bitmap = bitmapGenerator.generateBitmap(foreground, background, bitDepth <= 8 ? 1 << bitDepth : 0);
                 writeICONDIR(bos, 0, 1, 1);
                 writeICONDIRENTRY(bos, 16, 16, 0, 0, 1, bitDepth, 40 + bitmap.length);
@@ -416,7 +416,7 @@ public class IcoRoundtripTest extends AbstractIcoTest {
             final BitmapGenerator bitmapGenerator = entry.getValue();
 
             final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            try (final BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
+            try (BinaryOutputStream bos = BinaryOutputStream.littleEndian(baos)) {
                 final byte[] bitmap = bitmapGenerator.generateBitmap(foreground, background, bitDepth <= 8 ? 1 << bitDepth : 0);
                 writeICONDIR(bos, 0, 1, 1);
                 writeICONDIRENTRY(bos, 16, 16, 0, 0, 1, bitDepth, 40 + bitmap.length);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
index 2b451c14..9a03d0b4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
@@ -272,7 +272,7 @@ public class ExifRewriteTest extends AbstractExifTest {
             final TiffImageMetadata oldExifMetadata = originalMetadata.getExif();
             assertNotNull(oldExifMetadata);
 
-            ByteSource stripped;
+            final ByteSource stripped;
             {
                 final ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 new ExifRewriter().removeExifMetadata(byteSource, baos);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
index 211f3888..f6fc9fe9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
@@ -70,7 +70,7 @@ public class IptcAddTest extends IptcBaseTest {
 
         final PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords, newBlocks);
 
-        byte[] bytes;
+        final byte[] bytes;
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             new JpegIptcRewriter().writeIptc(byteSource, os, newData);
             bytes = os.toByteArray();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java
index 0b7a7e79..8461fc9c 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java
@@ -28,6 +28,7 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.commons.imaging.ImagingException;
 import org.apache.commons.imaging.bytesource.ByteSource;
 import org.apache.commons.imaging.common.BinaryOutputStream;
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 31a21742..8e53f9ce 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
@@ -30,4 +30,4 @@ public class IptcTypeLookupTest {
         assertEquals("Unknown", iptcType.getName());
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
index d71eda7a..d8161153 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
@@ -69,7 +69,7 @@ public class IptcUpdateTest extends IptcBaseTest {
 
         final PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords, newBlocks);
 
-        byte[] updated;
+        final byte[] updated;
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             new JpegIptcRewriter().writeIptc(ByteSource.array(noIptcFile, "test.jpg"), os, newData);
             updated = os.toByteArray();
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 3d61e3c2..880a7159 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
@@ -35,4 +35,4 @@ public class AppnSegmentTest {
         assertEquals("[Segment: APPN (APP-65504) (Unknown)]", appnSegment.toString());
     }
 
-}
\ No newline at end of file
+}
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 0438e6ab..87b0dd8d 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
@@ -40,4 +40,4 @@ public class JfifSegmentTest {
 
     }
 
-}
\ No newline at end of file
+}
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 e6cff7b4..ef435e78 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
@@ -45,4 +45,4 @@ public class SosSegmentTest {
         assertEquals(0, sosSegment.successiveApproximationBitLow);
     }
 
-}
\ No newline at end of file
+}
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 688d699e..f8fcb708 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
@@ -37,4 +37,4 @@ public class JpegXmpParserTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
index bc9dfe1d..8da02b22 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
@@ -45,7 +45,7 @@ public class JpegXmpRewriteTest extends AbstractJpegXmpTest {
         final String xmpXml = new JpegImageParser().getXmpXml(byteSource, params);
         assertNotNull(xmpXml);
 
-        byte[] noXmpFile;
+        final byte[] noXmpFile;
         {
             // test remove
 
@@ -65,7 +65,7 @@ public class JpegXmpRewriteTest extends AbstractJpegXmpTest {
             // test update
 
             final String newXmpXml = "test";
-            byte[] updated;
+            final byte[] updated;
             try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
                 new JpegXmpRewriter().updateXmpXml(byteSource, os, newXmpXml);
                 updated = os.toByteArray();
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 ad774f40..a4c6b452 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
@@ -40,4 +40,4 @@ public class RleReaderTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 021585ba..469e0f02 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
@@ -40,4 +40,4 @@ public class PngCrcTest {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
index c0911fd1..b0fd4772 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
@@ -52,7 +52,7 @@ public class PngWriteForceTrueColorText extends AbstractPngTest {
                 // Debug.debug("outFile", outFile);
 
                 final PngImagingParameters params = new PngImagingParameters();
-                byte[] outFile;
+                final byte[] outFile;
                 try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
                     params.setForceTrueColor(Boolean.TRUE);
                     pngImageParser.writeImage(image, os, params);
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 79cd3459..120870c6 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
@@ -37,4 +37,4 @@ public class PngChunkTextTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 01cacfa6..645a3165 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
@@ -34,4 +34,4 @@ public class ScanlineFilterAverageTest {
         assertArrayEquals(new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0 }, byteArray);
     }
 
-}
\ No newline at end of file
+}
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 d1f198f0..ed05af1b 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
@@ -34,4 +34,4 @@ public class ScanlineFilterPaethTest {
         assertArrayEquals(new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0 }, byteArray);
     }
 
-}
\ No newline at end of file
+}
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 b91d2f08..f3569fa6 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
@@ -34,4 +34,4 @@ public class ScanlineFilterUpTest {
         assertArrayEquals(new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0 }, byteArray);
     }
 
-}
\ No newline at end of file
+}
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 98e1b9b8..22322219 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
@@ -38,4 +38,4 @@ public class TransparencyFilterIndexedColorTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 b6bb9aee..5ffc2c11 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
@@ -43,4 +43,4 @@ public class PbmFileInfoTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 13c6d944..f84e2fe3 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
@@ -37,4 +37,4 @@ public class WhiteSpaceReaderTest {
         assertEquals("[0, 0, 0, 0]", Arrays.toString(whiteSpaceReader.readLine().getBytes()));
     }
 
-}
\ No newline at end of file
+}
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 6f0d11e5..4e39c49d 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
@@ -32,4 +32,4 @@ public class ImageResourceBlockTest {
         assertEquals(new String(byteArray, StandardCharsets.ISO_8859_1), imageResourceBlock.getName());
     }
 
-}
\ No newline at end of file
+}
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 3e0ca070..1691257c 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
@@ -36,4 +36,4 @@ public class ImageResourceTypeTest {
         assertEquals("Unknown", string);
     }
 
-}
\ No newline at end of file
+}
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 a16b424d..d3461bef 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
@@ -29,4 +29,4 @@ public class DataParserCmykTest {
         assertEquals(4, dataParserCmyk.getBasicChannelsCount());
     }
 
-}
\ No newline at end of file
+}
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 0e7b299e..9b7ecf95 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
@@ -29,4 +29,4 @@ public class DataParserGrayscaleTest {
         assertEquals(1, dataParserGrayscale.getBasicChannelsCount());
     }
 
-}
\ No newline at end of file
+}
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 53c9e2d6..3db1a607 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
@@ -36,4 +36,4 @@ public class DataParserIndexedTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 bd40b724..199682ab 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
@@ -29,4 +29,4 @@ public class DataParserLabTest {
         assertEquals(3, dataParserLab.getBasicChannelsCount());
     }
 
-}
\ No newline at end of file
+}
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 fa3de93b..898493ba 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
@@ -31,4 +31,4 @@ public class JpegImageDataTest {
         assertEquals("JPEG image data: 5 bytes", string);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java
index cfaa6052..223c3554 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java
@@ -84,7 +84,7 @@ public class TiffAlphaRoundTripTest {
             // and one giving 50 percent opaque red.
             final int width = 400;
             final int height = 400;
-            BufferedImage image0;
+            final BufferedImage image0;
             if (i == 0) {
                 image0 = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
             } else {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
index 9196c865..4db4cca8 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
@@ -54,7 +54,7 @@ public class TiffFloatingPointMultivariableTest extends TiffBaseTest {
     int width = 48;
     int height = 23;
     int samplesPerPixel = 2;
-    float f0 = 0.0F;
+    float f0;
     float f1 = 1.0F;
     float[] fSample = new float[width * height * samplesPerPixel];
 
@@ -251,9 +251,9 @@ public class TiffFloatingPointMultivariableTest extends TiffBaseTest {
         final int bytesPerSample = 4 * samplesPerPixel;
         final int bitsPerSample = 8 * bytesPerSample;
 
-        int nRowsInBlock;
-        int nColsInBlock;
-        int nBytesInBlock;
+        final int nRowsInBlock;
+        final int nColsInBlock;
+        final int nBytesInBlock;
         if (useTiles) {
             // Define the tiles so that they will not evenly subdivide
             // the image. This will allow the test to evaluate how the
@@ -269,8 +269,7 @@ public class TiffFloatingPointMultivariableTest extends TiffBaseTest {
         }
         nBytesInBlock = nRowsInBlock * nColsInBlock * bytesPerSample;
 
-        byte[][] blocks;
-        blocks = getBytesForOutput32(nRowsInBlock, nColsInBlock, byteOrder, useTiles, planarConfiguration);
+        final byte[][] blocks = getBytesForOutput32(nRowsInBlock, nColsInBlock, byteOrder, useTiles, planarConfiguration);
 
         final TiffOutputSet outputSet = new TiffOutputSet(byteOrder);
         final TiffOutputDirectory outDir = outputSet.addRootDirectory();
@@ -309,7 +308,7 @@ public class TiffFloatingPointMultivariableTest extends TiffBaseTest {
             imageData[i] = new AbstractTiffImageData.Data(0, blocks[i].length, blocks[i]);
         }
 
-        AbstractTiffImageData abstractTiffImageData;
+        final AbstractTiffImageData abstractTiffImageData;
         if (useTiles) {
             abstractTiffImageData = new AbstractTiffImageData.Tiles(imageData, nColsInBlock, nRowsInBlock);
         } else {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointRoundTripTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointRoundTripTest.java
index c13c168d..2a822781 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointRoundTripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointRoundTripTest.java
@@ -53,7 +53,7 @@ public class TiffFloatingPointRoundTripTest extends TiffBaseTest {
 
     int width = 48;
     int height = 23;
-    float f0 = 0.0F;
+    float f0;
     float f1 = 1.0F;
     float[] f = new float[width * height];
     int[] argb = new int[width * height];
@@ -250,9 +250,9 @@ public class TiffFloatingPointRoundTripTest extends TiffBaseTest {
         final File outputFile = new File(tempDir.toFile(), name);
 
         final int bytesPerSample = bitsPerSample / 8;
-        int nRowsInBlock;
-        int nColsInBlock;
-        int nBytesInBlock;
+        final int nRowsInBlock;
+        final int nColsInBlock;
+        final int nBytesInBlock;
         if (useTiles) {
             // Define the tiles so that they will not evenly subdivide
             // the image. This will allow the test to evaluate how the
@@ -268,7 +268,7 @@ public class TiffFloatingPointRoundTripTest extends TiffBaseTest {
         }
         nBytesInBlock = nRowsInBlock * nColsInBlock * bytesPerSample;
 
-        byte[][] blocks;
+        final byte[][] blocks;
         if (bitsPerSample == 32) {
             blocks = getBytesForOutput32(f, width, height, nRowsInBlock, nColsInBlock, byteOrder);
         } else {
@@ -304,7 +304,7 @@ public class TiffFloatingPointRoundTripTest extends TiffBaseTest {
             imageData[i] = new AbstractTiffImageData.Data(0, blocks[i].length, blocks[i]);
         }
 
-        AbstractTiffImageData abstractTiffImageData;
+        final AbstractTiffImageData abstractTiffImageData;
         if (useTiles) {
             abstractTiffImageData = new AbstractTiffImageData.Tiles(imageData, nColsInBlock, nRowsInBlock);
         } else {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
index b7f47a6d..f2470632 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
@@ -74,8 +74,9 @@ public class TiffLzwTest extends TiffBaseTest {
 
         final MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener() {
 
-            int index = 0;
-            int clearCode, eoiCode;
+            int index;
+            int clearCode;
+            int eoiCode;
 
             @Override
             public void code(final int code) {
@@ -144,9 +145,9 @@ public class TiffLzwTest extends TiffBaseTest {
 
         final MyLzwCompressor.Listener compressionListener = new MyLzwCompressor.Listener() {
 
-            int clearCode, eoiCode;
-
-            int index = 0;
+            int clearCode;
+            int eoiCode;
+            int index;
 
             @Override
             public void clearCode(final int code) {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
index 802cccef..f4c79bb0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
@@ -34,10 +34,10 @@ import org.junit.jupiter.api.Test;
  */
 public class TiffReadAlphaTest {
 
-    private final static String[] names = { "TransparencyTestStripAssociated.tif", "TransparencyTestStripUnassociated.tif",
+    private static final String[] names = { "TransparencyTestStripAssociated.tif", "TransparencyTestStripUnassociated.tif",
             "TransparencyTestTileAssociated.tif", "TransparencyTestTileUnassociated.tif" };
 
-    private final static int[][] testSite = { { 40, 40, 0xffff0000 }, { 60, 40, 0xff77ff77 }, { 40, 60, 0xffff0000 }, { 60, 60, 0xff008800 } };
+    private static final int[][] testSite = { { 40, 40, 0xffff0000 }, { 60, 40, 0xff77ff77 }, { 40, 60, 0xffff0000 }, { 60, 60, 0xff008800 } };
 
     /**
      * Gets a file from the TIFF test directory that contains floating-point data.
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
index f10ba2aa..e699ca03 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
@@ -153,9 +153,9 @@ public class TiffRoundTripInt32Test extends TiffBaseTest {
         final File outputFile = new File(tempDir.toFile(), name);
 
         final int bytesPerSample = bitsPerSample / 8;
-        int nRowsInBlock;
-        int nColsInBlock;
-        int nBytesInBlock;
+        final int nRowsInBlock;
+        final int nColsInBlock;
+        final int nBytesInBlock;
         if (useTiles) {
             // Define the tiles so that they will not evenly subdivide
             // the image. This will allow the test to evaluate how the
@@ -171,8 +171,7 @@ public class TiffRoundTripInt32Test extends TiffBaseTest {
         }
         nBytesInBlock = nRowsInBlock * nColsInBlock * bytesPerSample;
 
-        byte[][] blocks;
-        blocks = getBytesForOutput32(sample, width, height, nRowsInBlock, nColsInBlock, byteOrder);
+        final byte[][] blocks = getBytesForOutput32(sample, width, height, nRowsInBlock, nColsInBlock, byteOrder);
 
         // NOTE: At this time, Tile format is not supported.
         // When it is, modify the tags below to populate
@@ -203,7 +202,7 @@ public class TiffRoundTripInt32Test extends TiffBaseTest {
             imageData[i] = new AbstractTiffImageData.Data(0, blocks[i].length, blocks[i]);
         }
 
-        AbstractTiffImageData abstractTiffImageData;
+        final AbstractTiffImageData abstractTiffImageData;
         if (useTiles) {
             abstractTiffImageData = new AbstractTiffImageData.Tiles(imageData, nColsInBlock, nRowsInBlock);
         } else {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
index b815a1f1..4acbe647 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
@@ -149,9 +149,9 @@ public class TiffShortIntRoundTripTest extends TiffBaseTest {
         final File outputFile = new File(tempDir.toFile(), name);
 
         final int bytesPerSample = bitsPerSample / 8;
-        int nRowsInBlock;
-        int nColsInBlock;
-        int nBytesInBlock;
+        final int nRowsInBlock;
+        final int nColsInBlock;
+        final int nBytesInBlock;
         if (useTiles) {
             // Define the tiles so that they will not evenly subdivide
             // the image. This will allow the test to evaluate how the
@@ -167,7 +167,7 @@ public class TiffShortIntRoundTripTest extends TiffBaseTest {
         }
         nBytesInBlock = nRowsInBlock * nColsInBlock * bytesPerSample;
 
-        byte[][] blocks;
+        final byte[][] blocks;
         blocks = getBytesForOutput16(sample, width, height, nRowsInBlock, nColsInBlock, byteOrder);
 
         // NOTE: At this time, Tile format is not supported.
@@ -199,7 +199,7 @@ public class TiffShortIntRoundTripTest extends TiffBaseTest {
             imageData[i] = new AbstractTiffImageData.Data(0, blocks[i].length, blocks[i]);
         }
 
-        AbstractTiffImageData abstractTiffImageData;
+        final AbstractTiffImageData abstractTiffImageData;
         if (useTiles) {
             abstractTiffImageData = new AbstractTiffImageData.Tiles(imageData, nColsInBlock, nRowsInBlock);
         } else {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
index baae3630..3c8ddc17 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
@@ -119,4 +119,4 @@ public class TiffSubImageTest extends TiffBaseTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 b9fc1723..13bfc9c7 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
@@ -31,4 +31,4 @@ public class TiffTagsTest {
         assertEquals("Unknown Tag", tagInfo.name);
     }
 
-}
\ No newline at end of file
+}
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 b5afef4c..53902d17 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
@@ -35,4 +35,4 @@ public class DataReaderStripsTest {
         predicted = strips.applyPredictor(samples);
         assertArrayEquals(expected, predicted);
     }
-}
\ No newline at end of file
+}
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 42aac5ba..d2a40197 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
@@ -33,4 +33,4 @@ public class FieldTypeByteTest {
         assertThrows(ImagingException.class, () -> fieldTypeByte.writeData(null, byteOrder));
     }
 
-}
\ No newline at end of file
+}
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 f1fac39f..b8c2aa2b 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
@@ -39,4 +39,4 @@ public class FieldTypeLongTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 e936c434..4414ca93 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
@@ -39,4 +39,4 @@ public class FieldTypeShortTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 a023cc5d..f173dfff 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
@@ -34,4 +34,4 @@ public class FieldTypeTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java
index f1c4a9a8..b8478fe1 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java
@@ -31,4 +31,4 @@ public class HuffmanTreeExceptionTest {
         assertNotEquals(huffmanTreeExceptionTwo, huffmanTreeException);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java
index 5485ffcb..09048a25 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java
@@ -26,7 +26,7 @@ public class T4_T6_TablesTest {
 
     @Test
     public void testCreatesT4_T6_TablesTakingNoArgumentsAndCallsWriteBits() {
-        try (final BitArrayOutputStream bitArrayOutputStream = new BitArrayOutputStream(2309)) {
+        try (BitArrayOutputStream bitArrayOutputStream = new BitArrayOutputStream(2309)) {
             T4_T6_Tables.EOL16.writeBits(bitArrayOutputStream);
 
             assertEquals(2, bitArrayOutputStream.size());
@@ -34,4 +34,4 @@ public class T4_T6_TablesTest {
         }
     }
 
-}
\ No newline at end of file
+}
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 e4c5b674..60ae2e6a 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
@@ -31,4 +31,4 @@ public class TagInfoByteTest {
         assertArrayEquals(new byte[] { (byte) 0 }, tagInfoByte.encodeValue(null, (byte) 0));
     }
 
-}
\ No newline at end of file
+}
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 cd1e796f..7aaaf957 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
@@ -35,4 +35,4 @@ public class TagInfoSByteTest {
         assertArrayEquals(new byte[] { (byte) 6 }, byteArray);
     }
 
-}
\ No newline at end of file
+}
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 482ad95b..c9257cb6 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
@@ -36,4 +36,4 @@ public class TagInfoSBytesTest {
         assertSame(byteArrayTwo, byteArray);
     }
 
-}
\ No newline at end of file
+}
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 5354742f..e5339a93 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
@@ -34,4 +34,4 @@ public class TagInfoSLongTest {
         assertArrayEquals(new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0 }, tagInfoSLong.encodeValue(byteOrder, 0));
     }
 
-}
\ No newline at end of file
+}
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 16a3d67b..c4ef826d 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
@@ -34,4 +34,4 @@ public class TagInfoSShortTest {
         assertEquals((short) -10231, tagInfoSShort.getValue(null, tagInfoSShort.encodeValue(byteOrder, (short) 2520)));
     }
 
-}
\ No newline at end of file
+}
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 a1d74d8e..027d830c 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
@@ -35,4 +35,4 @@ public class TagInfoSShortsTest {
         assertArrayEquals(new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0 }, tagInfoSShorts.encodeValue(byteOrder, shortArray));
     }
 
-}
\ No newline at end of file
+}
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 18d360f0..502cea2c 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
@@ -31,4 +31,4 @@ public class TagInfoUnknownTest {
         assertEquals(-1, TagInfo.LENGTH_UNKNOWN);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectoryTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectoryTest.java
index d1ee5d78..463b3cc9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectoryTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectoryTest.java
@@ -46,4 +46,4 @@ public class TiffOutputDirectoryTest {
         final byte[] documentNameAsBytes = TIFF_TAG_DOCUMENT_NAME.encodeValue(TiffConstants.DEFAULT_TIFF_BYTE_ORDER, "Test.tiff");
         assertArrayEquals(field.getData(), documentNameAsBytes);
     }
-}
\ No newline at end of file
+}
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 3d4ceffe..08a7bba2 100644
--- a/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
+++ b/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
@@ -33,4 +33,4 @@ public class SimplePaletteTest {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java b/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java
index 7738ff71..1babf777 100644
--- a/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java
+++ b/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java
@@ -43,7 +43,7 @@ public class RoundtripBase {
         final AbstractImageParser abstractImageParser = ImageParserFactory.getImageParser(formatInfo.format);
 
         final ImagingParameters params = ImageParserFactory.getImageParser(formatInfo.format).getDefaultParameters();
-        byte[] temp1;
+        final byte[] temp1;
         try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
             abstractImageParser.writeImage(testImage, bos, params);
             temp1 = bos.toByteArray();
@@ -61,7 +61,7 @@ public class RoundtripBase {
         }
 
         if (formatInfo.identicalSecondWrite) {
-            byte[] temp2;
+            final byte[] temp2;
             try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
                 abstractImageParser.writeImage(image2, bos, params);
                 temp2 = bos.toByteArray();