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 2020/10/25 20:26:26 UTC
[commons-imaging] branch master updated: General cleanups.
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 7b01853 General cleanups.
7b01853 is described below
commit 7b018531c3ddaa23659374a7c852f058cdc79a12
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Oct 25 16:26:20 2020 -0400
General cleanups.
Better lambdas.
Remove unused exceptions.
Don't need to nest else.
Remove unused and organize imports.
Use diamonds.
Remove unnecessary casts.
Better use of Map APIs.
Remove trailing whitespace.
---
.../commons/imaging/common/ByteConversions.java | 6 +-
.../imaging/common/GenericImageMetadata.java | 3 +-
.../commons/imaging/common/RationalNumber.java | 3 +-
.../imaging/common/itu_t4/T4AndT6Compression.java | 15 ++--
.../imaging/common/mylzw/MyLzwDecompressor.java | 2 +-
.../imaging/formats/gif/GifImageMetadata.java | 4 +-
.../imaging/formats/jpeg/JpegImageMetadata.java | 4 +-
.../imaging/formats/jpeg/decoder/JpegDecoder.java | 18 +++--
.../imaging/formats/jpeg/iptc/IptcParser.java | 3 +-
.../imaging/formats/jpeg/xmp/JpegRewriter.java | 6 +-
.../commons/imaging/formats/pcx/PcxWriter.java | 6 +-
.../commons/imaging/formats/pcx/RleWriter.java | 3 +-
.../commons/imaging/formats/png/PngColorType.java | 3 +-
.../commons/imaging/formats/png/ScanExpediter.java | 2 +-
.../imaging/formats/png/chunks/PngChunkScal.java | 7 +-
.../imaging/formats/png/chunks/PngChunkText.java | 3 +-
.../formats/psd/dataparsers/DataParser.java | 2 +-
.../psd/datareaders/CompressedDataReader.java | 2 +-
.../psd/datareaders/UncompressedDataReader.java | 2 +-
.../commons/imaging/formats/rgbe/RgbeInfo.java | 2 +-
.../imaging/formats/tiff/TiffDirectory.java | 84 ++++++++--------------
.../imaging/formats/tiff/TiffImageData.java | 4 +-
.../commons/imaging/formats/tiff/TiffReader.java | 30 ++++----
.../formats/tiff/datareaders/DataReaderStrips.java | 6 +-
.../formats/tiff/datareaders/DataReaderTiled.java | 2 +-
.../formats/tiff/datareaders/ImageDataReader.java | 6 +-
.../floatingpoint/PhotometricInterpreterFloat.java | 1 +
.../formats/tiff/taginfos/TagInfoDirectory.java | 1 +
.../formats/tiff/write/TiffImageWriterBase.java | 4 +-
.../imaging/formats/xbm/XbmImageParser.java | 9 +--
.../apache/commons/imaging/palette/ColorGroup.java | 2 +-
.../imaging/palette/MedianCutQuantizer.java | 4 +-
.../commons/imaging/palette/QuantizedPalette.java | 1 +
.../org/apache/commons/imaging/ImageDumpTest.java | 4 +-
.../commons/imaging/color/ColorCieLabTest.java | 18 ++---
.../commons/imaging/color/ColorCieLchTest.java | 12 ++--
.../commons/imaging/color/ColorCieLuvTest.java | 12 ++--
.../apache/commons/imaging/color/ColorCmyTest.java | 10 +--
.../commons/imaging/color/ColorCmykTest.java | 16 +++--
.../imaging/color/ColorConversionsTest.java | 8 +--
.../apache/commons/imaging/color/ColorHslTest.java | 12 ++--
.../apache/commons/imaging/color/ColorHsvTest.java | 12 ++--
.../commons/imaging/color/ColorHunterLabTest.java | 12 ++--
.../apache/commons/imaging/color/ColorXyzTest.java | 12 ++--
.../common/RgbBufferedImageFactoryTest.java | 6 +-
.../imaging/common/bytesource/ByteSourceTest.java | 15 ++--
.../common/itu_t4/HuffmanTreeExceptionTest.java | 4 +-
.../imaging/common/itu_t4/T4_T6_TablesTest.java | 4 +-
.../examples/ApacheImagingSpeedAndMemoryTest.java | 1 +
.../commons/imaging/examples/ImageReadExample.java | 5 +-
.../commons/imaging/examples/SampleUsage.java | 2 +-
.../tiff/ExampleReadFloatingPointData.java | 4 +-
.../examples/tiff/ReadAndRenderFloatingPoint.java | 3 +-
.../imaging/examples/tiff/ReadTagsAndImages.java | 3 +-
.../imaging/examples/tiff/SurveyTiffFile.java | 26 +++----
.../imaging/examples/tiff/SurveyTiffFolder.java | 4 +-
.../commons/imaging/formats/bmp/BmpBaseTest.java | 2 +-
.../imaging/formats/bmp/BmpImageParserTest.java | 4 +-
.../commons/imaging/formats/bmp/BmpReadTest.java | 4 +-
.../imaging/formats/bmp/BmpWriterRgbTest.java | 6 +-
.../commons/imaging/formats/dcx/DcxBaseTest.java | 2 +-
.../commons/imaging/formats/dcx/DcxReadTest.java | 2 +-
.../commons/imaging/formats/gif/GifBaseTest.java | 2 +-
.../commons/imaging/formats/gif/GifReadTest.java | 2 +-
.../commons/imaging/formats/icns/IcnsBaseTest.java | 2 +-
.../commons/imaging/formats/icns/IcnsReadTest.java | 2 +-
.../commons/imaging/formats/ico/IcoBaseTest.java | 2 +-
.../commons/imaging/formats/ico/IcoReadTest.java | 4 +-
.../commons/imaging/formats/jpeg/JpegBaseTest.java | 2 +-
.../jpeg/JpegWithInvalidDhtSegmentTest.java | 2 +-
.../imaging/formats/jpeg/decoder/DctTest.java | 4 +-
.../formats/jpeg/decoder/JpegDecoderTest.java | 6 +-
.../formats/jpeg/decoder/JpegInputStreamTest.java | 6 +-
.../imaging/formats/jpeg/exif/ExifBaseTest.java | 2 +-
.../imaging/formats/jpeg/exif/ExifRewriteTest.java | 4 +-
.../imaging/formats/jpeg/iptc/IptcBaseTest.java | 2 +-
.../imaging/formats/jpeg/iptc/IptcParserTest.java | 5 +-
.../formats/jpeg/iptc/IptcTypeLookupTest.java | 4 +-
.../formats/jpeg/segments/AppnSegmentTest.java | 4 +-
.../formats/jpeg/segments/JfifSegmentTest.java | 8 +--
.../formats/jpeg/segments/NegSizeSegmentTest.java | 16 ++---
.../formats/jpeg/segments/SosSegmentTest.java | 4 +-
.../imaging/formats/jpeg/xmp/JpegXmpBaseTest.java | 2 +-
.../formats/jpeg/xmp/JpegXmpParserTest.java | 4 +-
.../commons/imaging/formats/pam/PamBaseTest.java | 2 +-
.../commons/imaging/formats/pcx/PcxBaseTest.java | 2 +-
.../commons/imaging/formats/pcx/RleReaderTest.java | 6 +-
.../imaging/formats/png/PhysicalScaleTest.java | 4 +-
.../commons/imaging/formats/png/PngBaseTest.java | 2 +-
.../commons/imaging/formats/png/PngCrcTest.java | 4 +-
.../commons/imaging/formats/png/PngReadTest.java | 6 +-
.../commons/imaging/formats/png/PngTextTest.java | 2 +-
.../png/PngWithInvalidPngChunkSizeTest.java | 11 +--
.../formats/png/chunks/PngChunkIccpTest.java | 8 +--
.../formats/png/chunks/PngChunkScalTest.java | 20 +++---
.../formats/png/chunks/PngChunkTextTest.java | 4 +-
.../scanlinefilters/ScanlineFilterAverageTest.java | 6 +-
.../scanlinefilters/ScanlineFilterPaethTest.java | 6 +-
.../png/scanlinefilters/ScanlineFilterUpTest.java | 6 +-
.../TransparencyFilterIndexedColorTest.java | 4 +-
.../imaging/formats/pnm/PbmFileInfoTest.java | 6 +-
.../imaging/formats/pnm/PgmFileInfoTest.java | 4 +-
.../imaging/formats/pnm/PnmImageParserTest.java | 14 ++--
.../imaging/formats/pnm/PpmFileInfoTest.java | 4 +-
.../imaging/formats/pnm/WhiteSpaceReaderTest.java | 4 +-
.../formats/psd/ImageResourceBlockTest.java | 7 +-
.../imaging/formats/psd/ImageResourceTypeTest.java | 4 +-
.../commons/imaging/formats/psd/PsdBaseTest.java | 2 +-
.../psd/dataparsers/DataParserCmykTest.java | 4 +-
.../psd/dataparsers/DataParserGrayscaleTest.java | 4 +-
.../psd/dataparsers/DataParserIndexedTest.java | 4 +-
.../formats/psd/dataparsers/DataParserLabTest.java | 4 +-
.../commons/imaging/formats/rgbe/RgbeBaseTest.java | 2 +-
.../commons/imaging/formats/rgbe/RgbeReadTest.java | 5 +-
.../imaging/formats/tiff/JpegImageDataTest.java | 4 +-
.../commons/imaging/formats/tiff/TiffBaseTest.java | 2 +-
.../formats/tiff/TiffFloatingPointReadTest.java | 11 +--
.../tiff/TiffFloatingPointRoundTripTest.java | 11 ++-
.../imaging/formats/tiff/TiffRasterDataTest.java | 15 ++--
.../formats/tiff/TiffRasterStatisticsTest.java | 6 +-
.../commons/imaging/formats/tiff/TiffReadTest.java | 6 --
.../imaging/formats/tiff/TiffSubImageTest.java | 18 ++---
.../commons/imaging/formats/tiff/TiffTagsTest.java | 4 +-
.../tiff/datareaders/DataReaderStripsTest.java | 9 ++-
.../tiff/fieldtypes/FieldTypeAsciiTest.java | 2 +-
.../formats/tiff/fieldtypes/FieldTypeByteTest.java | 8 +--
.../formats/tiff/fieldtypes/FieldTypeLongTest.java | 6 +-
.../tiff/fieldtypes/FieldTypeRationalTest.java | 2 +-
.../tiff/fieldtypes/FieldTypeShortTest.java | 6 +-
.../formats/tiff/fieldtypes/FieldTypeTest.java | 4 +-
.../PhotometricInterpreterLogLuvTest.java | 4 +-
.../PhotometricInterpreterRgbTest.java | 2 -
.../floatingpoint/PaletteEntryForRangeTest.java | 7 +-
.../floatingpoint/PaletteEntryForValueTest.java | 7 +-
.../PhotometricInterpreterFloatTest.java | 25 ++++---
.../formats/tiff/taginfos/TagInfoByteTest.java | 4 +-
.../formats/tiff/taginfos/TagInfoSByteTest.java | 6 +-
.../formats/tiff/taginfos/TagInfoSBytesTest.java | 6 +-
.../formats/tiff/taginfos/TagInfoSLongTest.java | 6 +-
.../formats/tiff/taginfos/TagInfoSShortTest.java | 6 +-
.../formats/tiff/taginfos/TagInfoSShortsTest.java | 6 +-
.../formats/tiff/taginfos/TagInfoUnknownTest.java | 4 +-
.../tiff/write/TiffOutputDirectoryTest.java | 2 +-
.../formats/tiff/write/TiffOutputSetTest.java | 2 +-
.../commons/imaging/formats/wbmp/WbmpBaseTest.java | 2 +-
.../commons/imaging/formats/xbm/XbmBaseTest.java | 2 +-
.../commons/imaging/formats/xpm/XpmBaseTest.java | 2 +-
.../commons/imaging/palette/DitheringTest.java | 2 +-
.../commons/imaging/palette/SimplePaletteTest.java | 4 +-
.../imaging/roundtrip/PixelDensityRoundtrip.java | 4 +-
150 files changed, 452 insertions(+), 490 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/common/ByteConversions.java b/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
index c282f95..12d34e0 100644
--- a/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
+++ b/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
@@ -233,9 +233,8 @@ public final class ByteConversions {
final int byte1 = 0xff & bytes[offset + 1];
if (byteOrder == ByteOrder.BIG_ENDIAN) {
return ((byte0 << 8) | byte1);
- } else {
- return ((byte1 << 8) | byte0);
}
+ return ((byte1 << 8) | byte0);
}
public static int[] toUInt16s(final byte[] bytes, final ByteOrder byteOrder) {
@@ -262,9 +261,8 @@ public final class ByteConversions {
final int byte3 = 0xff & bytes[offset + 3];
if (byteOrder == ByteOrder.BIG_ENDIAN) {
return (byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3;
- } else {
- return (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | byte0;
}
+ return (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | byte0;
}
public static int[] toInts(final byte[] bytes, final ByteOrder byteOrder) {
diff --git a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
index 95c6c6e..dc47f74 100644
--- a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
@@ -92,9 +92,8 @@ public class GenericImageMetadata implements ImageMetadata {
final String result = keyword + ": " + text;
if (null != prefix) {
return prefix + result;
- } else {
- return result;
}
+ return result;
}
}
diff --git a/src/main/java/org/apache/commons/imaging/common/RationalNumber.java b/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
index b7ad844..639301a 100644
--- a/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
+++ b/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
@@ -69,9 +69,8 @@ public class RationalNumber extends Number {
private static long gcd(final long a, final long b) {
if (b == 0) {
return a;
- } else {
- return gcd(b, a % b);
}
+ return gcd(b, a % b);
}
public RationalNumber negate() {
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java b/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
index 7fa4ca6..66bf31b 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
+++ b/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
@@ -265,15 +265,14 @@ public final class T4AndT6Compression {
entry.writeBits(outputStream);
return a1;
- } else {
- final int a2 = nextChangingElement(codingLine, 1 - codingA0Color, a1 + 1);
- final int a0a1 = a1 - a0;
- final int a1a2 = a2 - a1;
- T4_T6_Tables.H.writeBits(outputStream);
- writeRunLength(outputStream, a0a1, codingA0Color);
- writeRunLength(outputStream, a1a2, 1 - codingA0Color);
- return a2;
}
+ final int a2 = nextChangingElement(codingLine, 1 - codingA0Color, a1 + 1);
+ final int a0a1 = a1 - a0;
+ final int a1a2 = a2 - a1;
+ T4_T6_Tables.H.writeBits(outputStream);
+ writeRunLength(outputStream, a0a1, codingA0Color);
+ writeRunLength(outputStream, a1a2, 1 - codingA0Color);
+ return a2;
}
public static byte[] compressT4_2D(final byte[] uncompressed, final int width,
final int height, final boolean hasFill, final int parameterK)
diff --git a/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java b/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
index aa05686..42fd349 100644
--- a/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
+++ b/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
@@ -104,7 +104,7 @@ public final class MyLzwDecompressor {
return bytes[0];
}
- private void addStringToTable(final byte[] bytes) throws IOException {
+ private void addStringToTable(final byte[] bytes) {
if (codes < (1 << codeSize)) {
table[codes] = bytes;
codes++;
diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java
index 4947380..f734ffc 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.gif;
-import org.apache.commons.imaging.common.ImageMetadata;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.commons.imaging.common.ImageMetadata;
+
public class GifImageMetadata implements ImageMetadata {
private static final String NEWLINE = System.getProperty("line.separator");
private final int width;
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
index e1bb2dc..0a99dc5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
@@ -92,10 +92,8 @@ public class JpegImageMetadata implements ImageMetadata {
* Returns the data of the first JPEG thumbnail found in the EXIF metadata.
*
* @return JPEG data or null if no thumbnail.
- * @throws ImageReadException if it fails to read the image
- * @throws IOException if an IO error occurred
*/
- public byte[] getEXIFThumbnailData() throws ImageReadException, IOException {
+ public byte[] getEXIFThumbnailData() {
if (exif == null) {
return null;
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
index 684e66a..857d6c1 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
@@ -15,6 +15,9 @@
package org.apache.commons.imaging.formats.jpeg.decoder;
+import static org.apache.commons.imaging.common.BinaryFunctions.read2Bytes;
+import static org.apache.commons.imaging.common.BinaryFunctions.readBytes;
+
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.DataBuffer;
@@ -39,9 +42,6 @@ import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment;
import org.apache.commons.imaging.formats.jpeg.segments.SofnSegment;
import org.apache.commons.imaging.formats.jpeg.segments.SosSegment;
-import static org.apache.commons.imaging.common.BinaryFunctions.read2Bytes;
-import static org.apache.commons.imaging.common.BinaryFunctions.readBytes;
-
public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
/*
* JPEG is an advanced image format that takes significant computation to
@@ -337,7 +337,7 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
}
private void readMCU(final JpegInputStream is, final int[] preds, final Block[] mcu)
- throws IOException, ImageReadException {
+ throws ImageReadException {
for (int i = 0; i < sosSegment.numberOfComponents; i++) {
final SosSegment.Component scanComponent = sosSegment.getComponents(i);
SofnSegment.Component frameComponent = null;
@@ -388,9 +388,8 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
if (k == 63) {
break;
- } else {
- k++;
}
+ k++;
}
}
@@ -465,7 +464,7 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
* @return the start positions
*/
static List<Integer> getIntervalStartPositions(final int[] scanPayload) {
- final List<Integer> intervalStarts = new ArrayList<Integer>();
+ final List<Integer> intervalStarts = new ArrayList<>();
intervalStarts.add(0);
boolean foundFF = false;
boolean foundD0toD7 = false;
@@ -511,8 +510,7 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
return v;
}
- private int receive(final int ssss, final JpegInputStream is) throws IOException,
- ImageReadException {
+ private int receive(final int ssss, final JpegInputStream is) throws ImageReadException {
// "RECEIVE", section F.2.2.4, figure F.17, page 110 of T.81
int i = 0;
int v = 0;
@@ -524,7 +522,7 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
}
private int decode(final JpegInputStream is, final DhtSegment.HuffmanTable huffmanTable)
- throws IOException, ImageReadException {
+ throws ImageReadException {
// "DECODE", section F.2.2.3, figure F.16, page 109 of T.81
int i = 1;
int code = is.nextBit();
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index 5915009..0693bc7 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -142,8 +142,7 @@ public class IptcParser extends BinaryFileParser {
return new PhotoshopApp13Data(records, blocks);
}
- protected List<IptcRecord> parseIPTCBlock(final byte[] bytes)
- throws IOException {
+ protected List<IptcRecord> parseIPTCBlock(final byte[] bytes) {
final List<IptcRecord> elements = new ArrayList<>();
int index = 0;
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
index 62261e6..5bb626f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
@@ -39,9 +39,9 @@ import org.apache.commons.imaging.formats.jpeg.iptc.IptcParser;
*/
public class JpegRewriter extends BinaryFileParser {
private static final ByteOrder JPEG_BYTE_ORDER = ByteOrder.BIG_ENDIAN;
- private static final SegmentFilter EXIF_SEGMENT_FILTER = segment -> segment.isExifSegment();
- private static final SegmentFilter XMP_SEGMENT_FILTER = segment -> segment.isXmpSegment();
- private static final SegmentFilter PHOTOSHOP_APP13_SEGMENT_FILTER = segment -> segment.isPhotoshopApp13Segment();
+ private static final SegmentFilter EXIF_SEGMENT_FILTER = JFIFPieceSegment::isExifSegment;
+ private static final SegmentFilter XMP_SEGMENT_FILTER = JFIFPieceSegment::isXmpSegment;
+ private static final SegmentFilter PHOTOSHOP_APP13_SEGMENT_FILTER = JFIFPieceSegment::isPhotoshopApp13Segment;
/**
* Constructor. to guess whether a file contains an image based on its file
diff --git a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
index 1d9fb2a..a238d3e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
@@ -112,7 +112,7 @@ class PcxWriter {
}
public void writeImage(final BufferedImage src, final OutputStream os)
- throws ImageWriteException, IOException {
+ throws IOException {
final PaletteFactory paletteFactory = new PaletteFactory();
final SimplePalette palette = paletteFactory.makeExactRgbPaletteSimple(src, 256);
final BinaryOutputStream bos = new BinaryOutputStream(os,
@@ -235,7 +235,7 @@ class PcxWriter {
}
private void writePixels(final BufferedImage src, final int bitDepth, final int planes,
- final int bytesPerLine, final SimplePalette palette, final BinaryOutputStream bos) throws IOException, ImageWriteException {
+ final int bytesPerLine, final SimplePalette palette, final BinaryOutputStream bos) throws IOException {
final byte[] plane0 = new byte[bytesPerLine];
final byte[] plane1 = new byte[bytesPerLine];
final byte[] plane2 = new byte[bytesPerLine];
@@ -317,7 +317,7 @@ class PcxWriter {
}
private void writePixels32(final BufferedImage src, final int bytesPerLine,
- final BinaryOutputStream bos) throws IOException, ImageWriteException {
+ final BinaryOutputStream bos) throws IOException {
final int[] rgbs = new int[src.getWidth()];
final byte[] plane = new byte[4 * bytesPerLine];
diff --git a/src/main/java/org/apache/commons/imaging/formats/pcx/RleWriter.java b/src/main/java/org/apache/commons/imaging/formats/pcx/RleWriter.java
index afb9b1b..1fb4485 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pcx/RleWriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pcx/RleWriter.java
@@ -17,7 +17,6 @@ package org.apache.commons.imaging.formats.pcx;
import java.io.IOException;
-import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
class RleWriter {
@@ -30,7 +29,7 @@ class RleWriter {
}
void write(final BinaryOutputStream bos, final byte[] samples)
- throws IOException, ImageWriteException {
+ throws IOException {
if (isCompressed) {
for (final byte element : samples) {
if ((element & 0xff) == previousByte
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java b/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
index 117fa0b..da1c61d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
@@ -77,9 +77,8 @@ public enum PngColorType {
if (grayscale) {
if (alpha) {
return PngColorType.GREYSCALE_WITH_ALPHA;
- } else {
- return PngColorType.GREYSCALE;
}
+ return PngColorType.GREYSCALE;
} else if (alpha) {
return PngColorType.TRUE_COLOR_WITH_ALPHA;
} else {
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
index 9e494c4..52752ca 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
@@ -169,7 +169,7 @@ abstract class ScanExpediter {
}
}
- ScanlineFilter getScanlineFilter(final FilterType filterType, final int bytesPerPixel) throws ImageReadException {
+ ScanlineFilter getScanlineFilter(final FilterType filterType, final int bytesPerPixel) {
switch (filterType) {
case NONE:
return new ScanlineFilterNone();
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
index 56f5d4b..3611980 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
@@ -16,12 +16,11 @@
*/
package org.apache.commons.imaging.formats.png.chunks;
-import org.apache.commons.imaging.ImageReadException;
+import static org.apache.commons.imaging.common.BinaryFunctions.findNull;
-import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import static org.apache.commons.imaging.common.BinaryFunctions.findNull;
+import org.apache.commons.imaging.ImageReadException;
public class PngChunkScal extends PngChunk {
public final double unitsPerPixelXAxis;
@@ -29,7 +28,7 @@ public class PngChunkScal extends PngChunk {
public final int unitSpecifier;
public PngChunkScal(final int length, final int chunkType, final int crc, final byte[] bytes)
- throws ImageReadException, IOException {
+ throws ImageReadException {
super(length, chunkType, crc, bytes);
unitSpecifier = bytes[0];
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
index a9a6855..4774139 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
@@ -18,7 +18,6 @@ package org.apache.commons.imaging.formats.png.chunks;
import static org.apache.commons.imaging.common.BinaryFunctions.findNull;
-import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -34,7 +33,7 @@ public class PngChunkText extends PngTextChunk {
public final String text;
public PngChunkText(final int length, final int chunkType, final int crc, final byte[] bytes)
- throws ImageReadException, IOException {
+ throws ImageReadException {
super(length, chunkType, crc, bytes);
final int index = findNull(bytes);
if (index < 0) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java b/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
index d56122c..240e092 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
@@ -19,8 +19,8 @@ package org.apache.commons.imaging.formats.psd.dataparsers;
import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
-import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
public abstract class DataParser {
public final void parseData(final int[][][] data, final BufferedImage bi,
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
index f854a75..c0b3880 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
@@ -28,8 +28,8 @@ import org.apache.commons.imaging.common.BinaryFunctions;
import org.apache.commons.imaging.common.PackBits;
import org.apache.commons.imaging.common.mylzw.BitsToByteInputStream;
import org.apache.commons.imaging.common.mylzw.MyBitInputStream;
-import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
public class CompressedDataReader implements DataReader {
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
index 28f188c..6683d68 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
@@ -25,8 +25,8 @@ import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.BinaryFileParser;
import org.apache.commons.imaging.common.mylzw.BitsToByteInputStream;
import org.apache.commons.imaging.common.mylzw.MyBitInputStream;
-import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
+import org.apache.commons.imaging.formats.psd.PsdImageContents;
import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
public class UncompressedDataReader implements DataReader {
diff --git a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
index 4038165..1a3e17f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
@@ -26,8 +26,8 @@ import java.util.regex.Pattern;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.BinaryFunctions;
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.GenericImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
class RgbeInfo implements Closeable {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
index 5ecc21a..68acde5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
@@ -332,17 +332,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
return field.getByteArrayValue();
}
@@ -354,17 +352,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -395,17 +391,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -436,17 +430,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -459,24 +451,21 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
if (field.getFieldType() == FieldType.SHORT) {
return ByteConversions.toUInt16s(bytes, field.getByteOrder());
- } else {
- return ByteConversions.toInts(bytes, field.getByteOrder());
}
+ return ByteConversions.toInts(bytes, field.getByteOrder());
}
public RationalNumber getFieldValue(final TagInfoRational tag)
@@ -504,17 +493,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -544,17 +531,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
return field.getByteArrayValue();
}
@@ -584,17 +569,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -625,17 +608,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -665,17 +646,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -706,17 +685,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -747,17 +724,15 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
if (!tag.dataTypes.contains(field.getFieldType())) {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" has incorrect type " + field.getFieldType().getName());
- } else {
- return null;
}
+ return null;
}
final byte[] bytes = field.getByteArrayValue();
return tag.getValue(field.getByteOrder(), bytes);
@@ -770,9 +745,8 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
return tag.getValue(field);
}
@@ -784,9 +758,8 @@ public class TiffDirectory extends TiffElement {
if (mustExist) {
throw new ImageReadException("Required field \"" + tag.name
+ "\" is missing");
- } else {
- return null;
}
+ return null;
}
return tag.getValue(field);
}
@@ -860,9 +833,8 @@ public class TiffDirectory extends TiffElement {
final int byteCount = jpegInterchangeFormatLength.getIntArrayValue()[0];
return new ImageDataElement(offSet, byteCount);
- } else {
- throw new ImageReadException("Couldn't find image data.");
}
+ throw new ImageReadException("Couldn't find image data.");
}
public void setTiffImageData(final TiffImageData rawImageData) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
index 325b533..1f4c43e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
@@ -23,9 +23,9 @@ import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
-import org.apache.commons.imaging.formats.tiff.datareaders.ImageDataReader;
import org.apache.commons.imaging.formats.tiff.datareaders.DataReaderStrips;
import org.apache.commons.imaging.formats.tiff.datareaders.DataReaderTiled;
+import org.apache.commons.imaging.formats.tiff.datareaders.ImageDataReader;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
public abstract class TiffImageData {
@@ -188,7 +188,7 @@ public abstract class TiffImageData {
short[] sSampleFmt = directory.getFieldValue(
TiffTagConstants.TIFF_TAG_SAMPLE_FORMAT, false);
if (sSampleFmt != null && sSampleFmt.length > 0) {
- return (int) sSampleFmt[0];
+ return sSampleFmt[0];
}
return 0; // unspecified format
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
index 576b1a5..9be4c9c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
@@ -179,10 +179,9 @@ public class TiffReader extends BinaryFileParser {
+ "of length " + valueLength + " "
+ "which is outside the file's size of "
+ byteSource.getLength());
- } else {
- // corrupt field, ignore it
- continue;
}
+ // corrupt field, ignore it
+ continue;
}
value = byteSource.getBlock(offset, (int) valueLength);
} else {
@@ -463,21 +462,20 @@ public class TiffReader extends BinaryFileParser {
}
return new TiffImageData.Strips(data, rowsPerStrip);
- } else {
- final TiffField tileWidthField = directory.findField(TiffTagConstants.TIFF_TAG_TILE_WIDTH);
- if (null == tileWidthField) {
- throw new ImageReadException("Can't find tile width field.");
- }
- final int tileWidth = tileWidthField.getIntValue();
-
- final TiffField tileLengthField = directory.findField(TiffTagConstants.TIFF_TAG_TILE_LENGTH);
- if (null == tileLengthField) {
- throw new ImageReadException("Can't find tile length field.");
- }
- final int tileLength = tileLengthField.getIntValue();
+ }
+ final TiffField tileWidthField = directory.findField(TiffTagConstants.TIFF_TAG_TILE_WIDTH);
+ if (null == tileWidthField) {
+ throw new ImageReadException("Can't find tile width field.");
+ }
+ final int tileWidth = tileWidthField.getIntValue();
- return new TiffImageData.Tiles(data, tileWidth, tileLength);
+ final TiffField tileLengthField = directory.findField(TiffTagConstants.TIFF_TAG_TILE_LENGTH);
+ if (null == tileLengthField) {
+ throw new ImageReadException("Can't find tile length field.");
}
+ final int tileLength = tileLengthField.getIntValue();
+
+ return new TiffImageData.Tiles(data, tileWidth, tileLength);
}
private JpegImageData getJpegRawImageData(final ByteSource byteSource,
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
index 9967c6e..46024e9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
@@ -25,9 +25,9 @@ import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
-import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffImageData;
+import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
@@ -424,10 +424,10 @@ public final class DataReaderStrips extends ImageDataReader {
bytesPerStrip, width, rowsInThisStrip);
int[] blockData = unpackFloatingPointSamples(
- width, (int) rowsInThisStrip, width,
+ width, rowsInThisStrip, width,
decompressed,
predictor, bitsPerPixel, byteOrder);
- transferBlockToRaster(0, yStrip, width, (int) rowsInThisStrip, blockData,
+ transferBlockToRaster(0, yStrip, width, rowsInThisStrip, blockData,
xRaster, yRaster, rasterWidth, rasterHeight, rasterData);
}
return new TiffRasterData(rasterWidth, rasterHeight, rasterData);
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
index 35e514c..773f755 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
@@ -31,10 +31,10 @@ import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
-import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffElement.DataElement;
import org.apache.commons.imaging.formats.tiff.TiffImageData;
+import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
index e9ace7a..7c46cac 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
@@ -19,8 +19,8 @@ package org.apache.commons.imaging.formats.tiff.datareaders;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_PKZIP;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_PKZIP;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED;
@@ -40,12 +40,12 @@ import java.util.Arrays;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.PackBits;
+import org.apache.commons.imaging.common.ZlibDeflate;
import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor;
-import org.apache.commons.imaging.common.ZlibDeflate;
-import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffField;
+import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java
index 8a5f900..c2787fd 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloat.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDirectory.java
index f993a05..02327eb 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDirectory.java
@@ -19,6 +19,7 @@ package org.apache.commons.imaging.formats.tiff.taginfos;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index 9157283..6a6eea5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -23,10 +23,10 @@ import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.PA
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE;
import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_HEADER_SIZE;
@@ -48,9 +48,9 @@ import org.apache.commons.imaging.PixelDensity;
import org.apache.commons.imaging.common.BinaryOutputStream;
import org.apache.commons.imaging.common.PackBits;
import org.apache.commons.imaging.common.RationalNumber;
+import org.apache.commons.imaging.common.ZlibDeflate;
import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.common.mylzw.MyLzwCompressor;
-import org.apache.commons.imaging.common.ZlibDeflate;
import org.apache.commons.imaging.formats.tiff.TiffElement;
import org.apache.commons.imaging.formats.tiff.TiffImageData;
import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
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 944bbe9..0e17654 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
@@ -179,15 +179,12 @@ public class XbmImageParser extends ImageParser {
if (value.length() >= 2) {
if (value.charAt(1) == 'x' || value.charAt(1) == 'X') {
return Integer.parseInt(value.substring(2), 16);
- } else {
- return Integer.parseInt(value.substring(1), 8);
}
- } else {
- return 0;
+ return Integer.parseInt(value.substring(1), 8);
}
- } else {
- return Integer.parseInt(value);
+ return 0;
}
+ return Integer.parseInt(value);
}
private BufferedImage readXbmImage(final XbmHeader xbmHeader, final BasicCParser cParser)
diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java b/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
index 78e403d..c495da7 100644
--- a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
+++ b/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
@@ -129,7 +129,7 @@ class ColorGroup {
* @return a copy of the list of color counts
*/
List<ColorCount> getColorCounts() {
- return new ArrayList<ColorCount>(colorCounts);
+ return new ArrayList<>(colorCounts);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java b/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java
index ae540e9..fd4455c 100644
--- a/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java
+++ b/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java
@@ -54,7 +54,7 @@ public class MedianCutQuantizer {
if (color == null) {
color = new ColorCount(argb);
colorMap.put(argb, color);
- if (colorMap.keySet().size() > max) {
+ if (colorMap.size() > max) {
return null;
}
}
@@ -87,7 +87,7 @@ public class MedianCutQuantizer {
throws ImageWriteException {
final Map<Integer, ColorCount> colorMap = groupColors(image, maxColors);
- final int discreteColors = colorMap.keySet().size();
+ final int discreteColors = colorMap.size();
if (discreteColors <= maxColors) {
Debug.debug("lossless palette: " + discreteColors);
diff --git a/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java b/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
index 4cda3bb..0951f75 100644
--- a/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
+++ b/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
@@ -17,6 +17,7 @@
package org.apache.commons.imaging.palette;
import java.util.List;
+
import org.apache.commons.imaging.ImageWriteException;
public class QuantizedPalette implements Palette {
diff --git a/src/test/java/org/apache/commons/imaging/ImageDumpTest.java b/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
index 7a15e1e..6c44c85 100644
--- a/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImageDumpTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class ImageDumpTest {
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java
index 229938c..feeb4b8 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java
@@ -16,47 +16,47 @@
*/
package org.apache.commons.imaging.color;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class ColorCieLabTest {
private ColorCieLab color;
private ColorCieLab colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorCieLab(1.0, 2.0, 3.0);
colorCopy = new ColorCieLab(1.0, 2.0, 3.0);
}
@Test
- public void testLAssignement() throws Exception {
+ public void testLAssignement() {
assertEquals(1.0, color.L, 0.0);
}
@Test
- public void testAAssignement() throws Exception {
+ public void testAAssignement() {
assertEquals(2.0, color.a, 0.0);
}
@Test
- public void testBAssignement() throws Exception {
+ public void testBAssignement() {
assertEquals(3.0, color.b, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{L: 1.0, a: 2.0, b: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCieLchTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCieLchTest.java
index 8ef4b86..5ba007a 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCieLchTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCieLchTest.java
@@ -30,33 +30,33 @@ public class ColorCieLchTest {
private ColorCieLch colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorCieLch(1.0, 2.0, 3.0);
colorCopy = new ColorCieLch(1.0, 2.0, 3.0);
}
@Test
- public void testLAssignment() throws Exception {
+ public void testLAssignment() {
assertEquals(1.0, color.L, 0.0);
}
@Test
- public void testCAssignment() throws Exception {
+ public void testCAssignment() {
assertEquals(2.0, color.C, 0.0);
}
@Test
- public void testHAssignment() throws Exception {
+ public void testHAssignment() {
assertEquals(3.0, color.H, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{L: 1.0, C: 2.0, H: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCieLuvTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCieLuvTest.java
index eb02cad..5f2fd43 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCieLuvTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCieLuvTest.java
@@ -30,33 +30,33 @@ public class ColorCieLuvTest {
private ColorCieLuv colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorCieLuv(1.0, 2.0, 3.0);
colorCopy = new ColorCieLuv(1.0, 2.0, 3.0);
}
@Test
- public void testLAssignment() throws Exception {
+ public void testLAssignment() {
assertEquals(1.0, color.L, 0.0);
}
@Test
- public void testUAssignment() throws Exception {
+ public void testUAssignment() {
assertEquals(2.0, color.u, 0.0);
}
@Test
- public void testVAssignment() throws Exception {
+ public void testVAssignment() {
assertEquals(3.0, color.v, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{L: 1.0, u: 2.0, v: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java
index a044593..c5fb137 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java
@@ -31,28 +31,28 @@ public class ColorCmyTest {
private ColorCmy colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorCmy(1.0, 2.0, 3.0);
colorCopy = new ColorCmy(1.0, 2.0, 3.0);
}
@Test
- public void testCAssignment() throws Exception {
+ public void testCAssignment() {
assertEquals(1.0, color.C, 0.0);
}
@Test
- public void testMAssignment() throws Exception {
+ public void testMAssignment() {
assertEquals(2.0, color.M, 0.0);
}
@Test
- public void testYAssignment() throws Exception {
+ public void testYAssignment() {
assertEquals(3.0, color.Y, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{C: 1.0, M: 2.0, Y: 3.0}", color.toString());
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java
index 2a72b10..2005f6c 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java
@@ -30,38 +30,40 @@ public class ColorCmykTest {
private ColorCmyk colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorCmyk(1.0, 2.0, 3.0, 4.0);
colorCopy = new ColorCmyk(1.0, 2.0, 3.0, 4.0);
}
@Test
- public void testCAssignment() throws Exception {
+ public void testCAssignment() {
assertEquals(1.0, color.C, 0.0);
}
@Test
- public void testMAssignment() throws Exception {
+ public void testMAssignment() {
assertEquals(2.0, color.M, 0.0);
}
@Test
- public void testYAssignment() throws Exception {
+ public void testYAssignment() {
assertEquals(3.0, color.Y, 0.0);
}
+ /**
+ */
@Test
- public void testKAssignment() throws Exception {
+ public void testKAssignment() {
assertEquals(4.0, color.K, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{C: 1.0, M: 2.0, Y: 3.0, K: 4.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java b/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
index 9f1c229..882f5bc 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
@@ -27,7 +27,7 @@ public class ColorConversionsTest {
0xff00ffff, 0x00000000, 0xff7f7f7f, };
@Test
- public void testRGBtoCMYK() throws Exception {
+ public void testRGBtoCMYK() {
for (final int rgb : SAMPLE_RGBS) {
final ColorCmy cmy = ColorConversions.convertRGBtoCMY(rgb);
final ColorCmyk cmyk = ColorConversions.convertCMYtoCMYK(cmy);
@@ -44,7 +44,7 @@ public class ColorConversionsTest {
}
@Test
- public void testRGBtoHSL() throws Exception {
+ public void testRGBtoHSL() {
for (final int rgb : SAMPLE_RGBS) {
final ColorHsl hsl = ColorConversions.convertRGBtoHSL(rgb);
final int hsl_rgb = ColorConversions.convertHSLtoRGB(hsl);
@@ -57,7 +57,7 @@ public class ColorConversionsTest {
}
@Test
- public void testRGBtoHSV() throws Exception {
+ public void testRGBtoHSV() {
for (final int rgb : SAMPLE_RGBS) {
final ColorHsv hsv = ColorConversions.convertRGBtoHSV(rgb);
final int hsv_rgb = ColorConversions.convertHSVtoRGB(hsv);
@@ -70,7 +70,7 @@ public class ColorConversionsTest {
}
@Test
- public void testXYZ() throws Exception {
+ public void testXYZ() {
for (final int rgb : SAMPLE_RGBS) {
final ColorXyz xyz = ColorConversions.convertRGBtoXYZ(rgb);
final int xyz_rgb = ColorConversions.convertXYZtoRGB(xyz);
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java b/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java
index d93894f..77b135f 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java
@@ -31,33 +31,33 @@ public class ColorHslTest {
private ColorHsl colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorHsl(1.0, 2.0, 3.0);
colorCopy = new ColorHsl(1.0, 2.0, 3.0);
}
@Test
- public void testHAssignment() throws Exception {
+ public void testHAssignment() {
assertEquals(1.0, color.H, 0.0);
}
@Test
- public void testSAssignment() throws Exception {
+ public void testSAssignment() {
assertEquals(2.0, color.S, 0.0);
}
@Test
- public void testLAssignment() throws Exception {
+ public void testLAssignment() {
assertEquals(3.0, color.L, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{H: 1.0, S: 2.0, L: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java b/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java
index 7eddae1..46f5c73 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java
@@ -30,33 +30,33 @@ public class ColorHsvTest {
private ColorHsv colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorHsv(1.0, 2.0, 3.0);
colorCopy = new ColorHsv(1.0, 2.0, 3.0);
}
@Test
- public void testHAssignment() throws Exception {
+ public void testHAssignment() {
assertEquals(1.0, color.H, 0.0);
}
@Test
- public void testSAssignment() throws Exception {
+ public void testSAssignment() {
assertEquals(2.0, color.S, 0.0);
}
@Test
- public void testVAssignment() throws Exception {
+ public void testVAssignment() {
assertEquals(3.0, color.V, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{H: 1.0, S: 2.0, V: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorHunterLabTest.java b/src/test/java/org/apache/commons/imaging/color/ColorHunterLabTest.java
index 42315b4..5bcc278 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorHunterLabTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorHunterLabTest.java
@@ -30,33 +30,33 @@ public class ColorHunterLabTest {
private ColorHunterLab colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorHunterLab(1.0, 2.0, 3.0);
colorCopy = new ColorHunterLab(1.0, 2.0, 3.0);
}
@Test
- public void testLAssignment() throws Exception {
+ public void testLAssignment() {
assertEquals(1.0, color.L, 0.0);
}
@Test
- public void testAAssignment() throws Exception {
+ public void testAAssignment() {
assertEquals(2.0, color.a, 0.0);
}
@Test
- public void testBAssignment() throws Exception {
+ public void testBAssignment() {
assertEquals(3.0, color.b, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{L: 1.0, a: 2.0, b: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java b/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java
index d871230..5ee6174 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java
@@ -30,33 +30,33 @@ public class ColorXyzTest {
private ColorXyz colorCopy;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
color = new ColorXyz(1.0, 2.0, 3.0);
colorCopy = new ColorXyz(1.0, 2.0, 3.0);
}
@Test
- public void testXAssignment() throws Exception {
+ public void testXAssignment() {
assertEquals(1.0, color.X, 0.0);
}
@Test
- public void testYAssignment() throws Exception {
+ public void testYAssignment() {
assertEquals(2.0, color.Y, 0.0);
}
@Test
- public void testZAssignment() throws Exception {
+ public void testZAssignment() {
assertEquals(3.0, color.Z, 0.0);
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
assertEquals("{X: 1.0, Y: 2.0, Z: 3.0}", color.toString());
}
@Test
- public void testHashCodeAndEquals() throws Exception {
+ public void testHashCodeAndEquals() {
assertTrue(color.equals(colorCopy) && colorCopy.equals(color));
assertThat(color.hashCode(), is(colorCopy.hashCode()));
}
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 732d7bf..c1347f3 100644
--- a/src/test/java/org/apache/commons/imaging/common/RgbBufferedImageFactoryTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/RgbBufferedImageFactoryTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.common;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.awt.image.DirectColorModel;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class RgbBufferedImageFactoryTest{
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 5804364..35f3e20 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
@@ -16,14 +16,19 @@
*/
package org.apache.commons.imaging.common.bytesource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
import org.apache.commons.imaging.ImagingTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.io.*;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public abstract class ByteSourceTest extends ImagingTest {
protected File createTempFile(final byte src[]) throws IOException {
final File file = File.createTempFile("raw_", ".bin");
@@ -66,7 +71,7 @@ public abstract class ByteSourceTest extends ImagingTest {
}
@Test
- public void testGetInputStreamThrowsNullPointerException() throws IOException {
+ public void testGetInputStreamThrowsNullPointerException() {
final ByteSourceArray byteSourceArray = new ByteSourceArray(null);
Assertions.assertThrows(NullPointerException.class, () -> {
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 021be62..5c8722a 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.common.itu_t4;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Test;
+
public class HuffmanTreeExceptionTest{
@Test
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 b2bf47e..54869f4 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.common.itu_t4;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class T4_T6_TablesTest{
diff --git a/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java b/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
index 8a1eeb7..1d95914 100644
--- a/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
+++ b/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
@@ -158,6 +158,7 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.util.HashMap;
+
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.tiff.TiffImageParser;
diff --git a/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java b/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
index 9ae9b49..d94d0cf 100644
--- a/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
+++ b/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
@@ -16,7 +16,10 @@
*/
package org.apache.commons.imaging.examples;
-import java.awt.*;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
diff --git a/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java b/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
index 775746d..5b40d00 100644
--- a/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
+++ b/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.imaging.examples;
-import java.awt.*;
+import java.awt.Dimension;
import java.awt.color.ICC_Profile;
import java.awt.image.BufferedImage;
import java.io.File;
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 0f5a0d8..7c15d76 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
@@ -23,7 +23,9 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+
import javax.imageio.ImageIO;
+
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
@@ -33,10 +35,10 @@ import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.TiffRasterStatistics;
import org.apache.commons.imaging.formats.tiff.TiffReader;
+import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntry;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntryForRange;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntryForValue;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PhotometricInterpreterFloat;
-import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntry;
/**
* A simple example application that reads the content of a TIFF file containing
diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
index 56d273a..56523fd 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
@@ -19,9 +19,10 @@ package org.apache.commons.imaging.examples.tiff;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
-import java.nio.ByteOrder;
import java.util.HashMap;
+
import javax.imageio.ImageIO;
+
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
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 7f33757..9b9f680 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
@@ -20,10 +20,11 @@ package org.apache.commons.imaging.examples.tiff;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
-import java.nio.ByteOrder;
import java.util.HashMap;
import java.util.List;
+
import javax.imageio.ImageIO;
+
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
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 d3a1669..42ee847 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
@@ -16,10 +16,21 @@
*/
package org.apache.commons.imaging.examples.tiff;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_PKZIP;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED_1;
+
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Formatter;
+
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -27,15 +38,6 @@ import org.apache.commons.imaging.formats.tiff.TiffContents;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.TiffReader;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_PKZIP;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED_1;
import org.apache.commons.imaging.formats.tiff.constants.TiffEpTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
@@ -323,9 +325,8 @@ public class SurveyTiffFile {
if (planarConfiguration == TiffPlanarConfiguration.CHUNKY) {
return "Chunky";
- } else {
- return "Planar";
}
+ return "Planar";
}
/**
@@ -356,9 +357,8 @@ public class SurveyTiffFile {
+ "Predict Data_Fmt B/P B/S Photo ICC_Pro");
if (csv) {
return reformatHeaderForCsv(header);
- } else {
- return header;
}
+ return header;
}
/**
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 2389536..5c5e287 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
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
+
import org.apache.commons.imaging.ImageReadException;
/**
@@ -147,9 +148,8 @@ public class SurveyTiffFolder {
// so order the entries so that the shortest array goes first
if (a.length < b.length) {
return -1;
- } else {
- return 1;
}
+ return 1;
}
private boolean isNumeric(String a) {
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
index 3fc9dde..fcb28de 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
@@ -34,7 +34,7 @@ public abstract class BmpBaseTest extends ImagingTest {
return format == ImageFormats.BMP;
}
- private static final ImageFilter IMAGE_FILTER = file -> isBmp(file);
+ private static final ImageFilter IMAGE_FILTER = BmpBaseTest::isBmp;
protected static List<File> getBmpImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpImageParserTest.java
index c5ba974..8669337 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpImageParserTest.java
@@ -34,8 +34,8 @@ public class BmpImageParserTest {
/**
* For https://issues.apache.org/jira/browse/IMAGING-264.
- * @throws IOException
- * @throws ImageReadException
+ * @throws IOException
+ * @throws ImageReadException
*/
@Test
public void testImageWidthRounding() throws ImageReadException, IOException {
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
index 96d3d10..ccaa4fc 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
@@ -54,9 +54,9 @@ public class BmpReadTest extends BmpBaseTest {
@Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
- public void testMetaData(File imageFile) throws ImageReadException, IOException {
+ public void testMetaData(File imageFile) {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
- Imaging.getMetadata(imageFile);
+ Imaging.getMetadata(imageFile);
});
}
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 05262ad..95400c9 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.bmp;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.awt.image.BufferedImage;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class BmpWriterRgbTest{
diff --git a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
index 63cd502..545c979 100644
--- a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
@@ -35,7 +35,7 @@ public abstract class DcxBaseTest extends ImagingTest {
return format == ImageFormats.DCX;
}
- private static final ImageFilter IMAGE_FILTER = file -> isDcx(file);
+ private static final ImageFilter IMAGE_FILTER = DcxBaseTest::isDcx;
protected static List<File> getDcxImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
index 77fba59..f3c47f0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
@@ -39,7 +39,7 @@ public class DcxReadTest extends DcxBaseTest {
@Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
- public void testImageMetadata(File imageFile) throws Exception {
+ public void testImageMetadata(File imageFile) {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
Imaging.getMetadata(imageFile);
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
index ae0a873..d11ee11 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
@@ -51,7 +51,7 @@ public abstract class GifBaseTest extends ImagingTest {
return type.getName().equals(SINGLE_IMAGE_FOLDER_NAME);
}
- private static final ImageFilter IMAGE_FILTER = file -> isGif(file);
+ private static final ImageFilter IMAGE_FILTER = GifBaseTest::isGif;
private static final ImageFilter ANIMATED_IMAGE_FILTER = file -> isGif(file) && isAnimated(file);
diff --git a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
index 19aa54c..81ebbb0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
@@ -52,7 +52,7 @@ public class GifReadTest extends GifBaseTest {
@Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
- public void testMetadata(File imageFile) throws Exception {
+ public void testMetadata(File imageFile) {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
Imaging.getMetadata(imageFile);
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
index 9c961e2..1453a1e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
@@ -35,7 +35,7 @@ public abstract class IcnsBaseTest extends ImagingTest {
return format == ImageFormats.ICNS;
}
- private static final ImageFilter IMAGE_FILTER = file -> isIcns(file);
+ private static final ImageFilter IMAGE_FILTER = IcnsBaseTest::isIcns;
protected static List<File> getIcnsImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
index 1c91257..afe4bd7 100644
--- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
@@ -63,7 +63,7 @@ public class IcnsReadTest extends IcnsBaseTest {
@Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
- public void testImageMetadata(File imageFile) throws Exception {
+ public void testImageMetadata(File imageFile) {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
Imaging.getMetadata(imageFile);
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
index 8c17298..bc83e2e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
@@ -31,7 +31,7 @@ public abstract class IcoBaseTest extends ImagingTest {
|| file.getName().toLowerCase().endsWith(".cur");
}
- private static final ImageFilter IMAGE_FILTER = file -> isIco(file);
+ private static final ImageFilter IMAGE_FILTER = IcoBaseTest::isIco;
protected static List<File> getIcoImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
index 3690f13..24bd4f0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
@@ -39,7 +39,7 @@ public class IcoReadTest extends IcoBaseTest {
@Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
- public void testMetadata(File imageFile) throws Exception {
+ public void testMetadata(File imageFile) {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
Imaging.getMetadata(imageFile);
});
@@ -48,7 +48,7 @@ public class IcoReadTest extends IcoBaseTest {
@Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
- public void testImageInfo(File imageFile) throws Exception {
+ public void testImageInfo(File imageFile) {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
Imaging.getImageInfo(imageFile, Collections.emptyMap());
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
index a869555..17977d4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
@@ -35,7 +35,7 @@ public abstract class JpegBaseTest extends ImagingTest {
return format == ImageFormats.JPEG;
}
- public static final ImageFilter imageFilter = file -> isJpeg(file);
+ public static final ImageFilter imageFilter = JpegBaseTest::isJpeg;
protected static List<File> getJpegImages() throws IOException, ImageReadException {
return getTestImages(imageFilter);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java
index f1da93d..ac255c6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
public class JpegWithInvalidDhtSegmentTest {
@Test
- public void testSingleImage() throws Exception {
+ public void testSingleImage() {
// we cannot use ImagingTest and getImageByFileName, as it would cause others
// tests to fail
final File imageFile = new File(JpegWithInvalidDhtSegmentTest.class
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
index 81b62de..9246cc4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class DctTest {
@Test
- public void testVectors() throws Exception {
+ public void testVectors() {
final float[] originalData = new float[8];
for (int i = 0; i < 8; i++) {
originalData[i] = i;
@@ -51,7 +51,7 @@ public class DctTest {
}
@Test
- public void testMatrices() throws Exception {
+ public void testMatrices() {
final float[] originalData = new float[8 * 8];
final float[][] originalData8x8 = new float[8][8];
for (int y = 0; y < 8; y++) {
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 4902e67..7d6795d 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
@@ -18,7 +18,6 @@
package org.apache.commons.imaging.formats.jpeg.decoder;
import java.io.File;
-import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -32,12 +31,9 @@ public class JpegDecoderTest {
/**
* Test that a bad file does not hang or take too long to be processed.
- *
- * @throws IOException
- * @throws ImageReadException
*/
@Test
- public void testDecodeBadFile() throws ImageReadException, IOException {
+ public void testDecodeBadFile() {
// From IMAGING-220
final File inputFile = new File(
JpegDecoderTest.class.getResource("/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78.jpeg")
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStreamTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStreamTest.java
index f6ae4b6..6a408a7 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStreamTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStreamTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.imaging.formats.jpeg.decoder;
-import java.io.IOException;
-
import org.apache.commons.imaging.ImageReadException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -29,7 +27,7 @@ import org.junit.jupiter.api.Test;
public class JpegInputStreamTest {
@Test
- public void testNextBitThrowsImageReadExceptionOne() throws IOException, ImageReadException {
+ public void testNextBitThrowsImageReadExceptionOne() {
int[] byteArray = new int[6];
byteArray[0] = (byte) (-1);
byteArray[1] = (byte) 74;
@@ -42,7 +40,7 @@ public class JpegInputStreamTest {
}
@Test
- public void testNextBitThrowsImageReadExceptionTwo() throws IOException, ImageReadException {
+ public void testNextBitThrowsImageReadExceptionTwo() {
int[] byteArray = new int[0];
JpegInputStream jpegInputStream = new JpegInputStream(byteArray);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
index 6ab8562..f4c9a05 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
@@ -42,7 +42,7 @@ public abstract class ExifBaseTest extends ImagingTest {
}
}
- private static final ImageFilter HAS_EXIF_IMAGE_FILTER = file -> hasExifData(file);
+ private static final ImageFilter HAS_EXIF_IMAGE_FILTER = ExifBaseTest::hasExifData;
private static final ImageFilter JPEG_IMAGE_FILTER = file -> file.getName().toLowerCase().endsWith(".jpg");
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 cc552f9..5581d25 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
@@ -296,7 +296,7 @@ public class ExifRewriteTest extends ExifBaseTest {
final Map<Integer,TiffImageMetadata.Directory> oldDirectoryMap = makeDirectoryMap(oldDirectories);
final Map<Integer,TiffImageMetadata.Directory> newDirectoryMap = makeDirectoryMap(newDirectories);
- assertEquals(oldDirectories.size(), oldDirectoryMap.keySet().size());
+ assertEquals(oldDirectories.size(), oldDirectoryMap.size());
final List<Integer> oldDirectoryTypes = new ArrayList<>(oldDirectoryMap.keySet());
Collections.sort(oldDirectoryTypes);
final List<Integer> newDirectoryTypes = new ArrayList<>(newDirectoryMap.keySet());
@@ -328,7 +328,7 @@ public class ExifRewriteTest extends ExifBaseTest {
assertTrue(missingInNew.size() == 0);
assertTrue(missingInOld.size() == 0);
- assertEquals(oldItems.size(), oldFieldMap.keySet().size());
+ assertEquals(oldItems.size(), oldFieldMap.size());
assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
index a5e2b1d..0dba541 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
@@ -49,7 +49,7 @@ public abstract class IptcBaseTest extends ImagingTest {
}
}
- private static final ImageFilter HAS_IPTC_IMAGE_FILTER = file -> hasIptcData(file);
+ private static final ImageFilter HAS_IPTC_IMAGE_FILTER = IptcBaseTest::hasIptcData;
private static final ImageFilter JPEG_IMAGE_FILTER = file -> file.getName().toLowerCase().endsWith(".jpg");
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 9d83c0d..55ce17b 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
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.List;
@@ -54,12 +53,10 @@ public class IptcParserTest {
*
* @throws IOException when reading input
* @throws ImageReadException when parsing file
- * @throws NoSuchAlgorithmException
- *
* @see https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/
*/
@Test
- public void testSkipBlockTypes() throws ImageReadException, IOException, NoSuchAlgorithmException {
+ public void testSkipBlockTypes() throws ImageReadException, IOException {
final String location = IptcParserTest.class
.getResource("/images/jpeg/photoshop/IMAGING-246/FallHarvestKitKat_07610.jpg")
.getFile();
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 73ce746..3de5479 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.jpeg.iptc;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class IptcTypeLookupTest{
@Test
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 c3b708a..b144e2d 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
@@ -16,13 +16,13 @@
*/
package org.apache.commons.imaging.formats.jpeg.segments;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class AppnSegmentTest{
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 9a6e407..e16f7ff 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
@@ -16,13 +16,13 @@
*/
package org.apache.commons.imaging.formats.jpeg.segments;
-import org.apache.commons.imaging.ImageReadException;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.commons.imaging.ImageReadException;
+import org.junit.jupiter.api.Test;
public class JfifSegmentTest{
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 d9c4643..16c7132 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
@@ -16,20 +16,20 @@
*/
package org.apache.commons.imaging.formats.jpeg.segments;
-import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-import org.apache.commons.imaging.formats.jpeg.JpegUtils;
-import org.apache.commons.imaging.common.bytesource.ByteSource;
-import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
+import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
+import org.apache.commons.imaging.formats.jpeg.JpegUtils;
+import org.junit.jupiter.api.Test;
public class NegSizeSegmentTest {
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 e37d076..f96b485 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.jpeg.segments;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class SosSegmentTest{
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
index d4bc9fe..b2c8c0f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
@@ -50,7 +50,7 @@ public abstract class JpegXmpBaseTest extends ImagingTest {
}
}
- private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = file -> hasJpegXmpData(file);
+ private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = JpegXmpBaseTest::hasJpegXmpData;
// private static final ImageFilter JPEG_IMAGE_FILTER = new ImageFilter()
// {
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 8881481..7c272f1 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.jpeg.xmp;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class JpegXmpParserTest{
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
index 879fdf9..816a58e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
@@ -35,7 +35,7 @@ public abstract class PamBaseTest extends ImagingTest {
return format == ImageFormats.PAM;
}
- private static final ImageFilter IMAGE_FILTER = file -> isPam(file);
+ private static final ImageFilter IMAGE_FILTER = PamBaseTest::isPam;
protected List<File> getPamImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
index 16727cd..e20d7ee 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
@@ -30,7 +30,7 @@ public abstract class PcxBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".pcx");
}
- private static final ImageFilter IMAGE_FILTER = file -> isPcx(file);
+ private static final ImageFilter IMAGE_FILTER = PcxBaseTest::isPcx;
protected List<File> getPcxImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
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 0c84c2d..651a8ee 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.pcx;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class RleReaderTest{
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PhysicalScaleTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PhysicalScaleTest.java
index 1aaa1c0..69afbc3 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PhysicalScaleTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PhysicalScaleTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.png;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class PhysicalScaleTest {
private static final double delta = 0.01;
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
index 978e686..07b84e1 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
@@ -35,7 +35,7 @@ public abstract class PngBaseTest extends ImagingTest {
return format == ImageFormats.PNG;
}
- private static final ImageFilter IMAGE_FILTER = file -> isPng(file);
+ private static final ImageFilter IMAGE_FILTER = PngBaseTest::isPng;
protected List<File> getPngImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
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 8f356a4..5c83809 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.png;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for class {@link PngCrc}.
*
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
index edf904d..9462f70 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
@@ -17,6 +17,9 @@
package org.apache.commons.imaging.formats.png;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.List;
@@ -28,9 +31,6 @@ import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class PngReadTest extends PngBaseTest {
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
index 2d6d8aa..bc4957d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
-import java.awt.*;
+import java.awt.Color;
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.ArrayList;
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java
index f8b7d23..0139313 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java
@@ -18,7 +18,6 @@
package org.apache.commons.imaging.formats.png;
import java.io.File;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -38,12 +37,9 @@ public class PngWithInvalidPngChunkSizeTest {
/**
* Test that an image with an invalid PNG chunk size causes an
* ImageReadException instead of other exception types.
- *
- * @throws IOException if it fails to read from the input source
- * @throws ImageReadException if it fails to read the image
*/
@Test
- public void testPngWithInvalidPngChunkSize() throws IOException, ImageReadException {
+ public void testPngWithInvalidPngChunkSize() {
final File imageFile = new File(
JpegWithInvalidDhtSegmentTest.class.getResource("/IMAGING-211/testfile_2.png").getFile());
final Map<String, Object> params = new HashMap<>();
@@ -56,12 +52,9 @@ public class PngWithInvalidPngChunkSizeTest {
/**
* Test that an image with an invalid negative PNG chunk size causes an
* ImageReadException instead of other exception types.
- *
- * @throws IOException if it fails to read from the input source
- * @throws ImageReadException if it fails to read the image
*/
@Test
- public void testPngWithInvalidNegativePngChunkSize() throws IOException, ImageReadException {
+ public void testPngWithInvalidNegativePngChunkSize() {
final File imageFile = new File(
JpegWithInvalidDhtSegmentTest.class.getResource("/IMAGING-210/testfile.png").getFile());
final Map<String, Object> params = new HashMap<>();
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java
index 447c8d9..d83da7f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java
@@ -39,7 +39,7 @@ public class PngChunkIccpTest {
private static final int chunkType = 1766015824;
@Test
- public void testErrorOnNoProfileName() throws ImageReadException, IOException {
+ public void testErrorOnNoProfileName() {
final byte[] data = new byte[0];
Assertions.assertThrows(ImageReadException.class, () -> {
new PngChunkIccp(0, chunkType, 0, data);
@@ -55,10 +55,10 @@ public class PngChunkIccpTest {
}
bytes.add((byte) 0); // null
bytes.add((byte) 0); // 0=deflate compression method
-
+
// generate some 100 bytes of dummy data
byte[] uncompressedData = new byte[100];
- IntStream.range(0, 100).forEach((i) -> {
+ IntStream.range(0, 100).forEach(i -> {
uncompressedData[i] = (byte) (i + 1); // dummy data
});
try (ByteArrayOutputStream baos = new ByteArrayOutputStream(100)) {
@@ -75,7 +75,7 @@ public class PngChunkIccpTest {
data[i] = bytes.get(i).byteValue();
}
// gather the compressed data
- IntStream.range(0, compressedData.length).forEach((i) -> {
+ IntStream.range(0, compressedData.length).forEach(i -> {
data[bytes.size() + i] = compressedData[i];
});
// create the chunk
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScalTest.java b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScalTest.java
index e532dc7..f67242d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScalTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScalTest.java
@@ -16,20 +16,18 @@
*/
package org.apache.commons.imaging.formats.png.chunks;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.imaging.ImageReadException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class PngChunkScalTest {
private static final double delta = 0.001;
private static final int chunkType = 1933787468;
@Test
- public void testConstructMeters() throws IOException, ImageReadException {
+ public void testConstructMeters() throws ImageReadException {
final PngChunkScal pngChunkScal = new PngChunkScal(10, chunkType, 0,
new byte[]{1, 48, 46, 48, 49, 0, 48, 46, 48, 50});
@@ -39,7 +37,7 @@ public class PngChunkScalTest {
}
@Test
- public void testConstructRadians() throws IOException, ImageReadException {
+ public void testConstructRadians() throws ImageReadException {
final PngChunkScal pngChunkScal = new PngChunkScal(10, chunkType, 0,
new byte[]{2, 48, 46, 48, 49, 0, 48, 46, 48, 50});
@@ -49,35 +47,35 @@ public class PngChunkScalTest {
}
@Test
- public void testConstruct_InvalidUnitSpecifier() throws IOException, ImageReadException {
+ public void testConstruct_InvalidUnitSpecifier() {
Assertions.assertThrows(ImageReadException.class,() -> {
new PngChunkScal(10, chunkType, 0, new byte[]{3, 48, 46, 48, 49, 0, 48, 46, 48, 50});
});
}
@Test
- public void testConstruct_MissingSeparator() throws IOException, ImageReadException {
+ public void testConstruct_MissingSeparator() {
Assertions.assertThrows(ImageReadException.class,() -> {
new PngChunkScal(9, chunkType, 0, new byte[]{1, 48, 46, 48, 49, 48, 46, 48, 50});
});
}
@Test
- public void testConstruct_InvalidDblValue() throws IOException, ImageReadException {
+ public void testConstruct_InvalidDblValue() {
Assertions.assertThrows(ImageReadException.class,() -> {
new PngChunkScal(10, chunkType, 0, new byte[]{2, 65, 46, 48, 49, 0, 48, 46, 48, 50});
});
}
@Test
- public void testConstruct_MissingXValue() throws IOException, ImageReadException {
+ public void testConstruct_MissingXValue() {
Assertions.assertThrows(ImageReadException.class,() -> {
new PngChunkScal(2, chunkType, 0, new byte[]{2, 0});
});
}
@Test
- public void testConstruct_MissingYValue() throws IOException, ImageReadException {
+ public void testConstruct_MissingYValue() {
Assertions.assertThrows(ImageReadException.class,() -> {
new PngChunkScal(6, chunkType, 0, new byte[]{2, 48, 46, 48, 49, 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 2146b63..fc6e089 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.png.chunks;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class PngChunkTextTest{
@Test
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 4028448..e521468 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.png.scanlinefilters;
-import org.apache.commons.imaging.ImageReadException;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.io.IOException;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.ImageReadException;
+import org.junit.jupiter.api.Test;
public class ScanlineFilterAverageTest{
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 06a0579..e2f6893 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.png.scanlinefilters;
-import org.apache.commons.imaging.ImageReadException;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.io.IOException;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.ImageReadException;
+import org.junit.jupiter.api.Test;
public class ScanlineFilterPaethTest{
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 6be218c..6f9c02f 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.png.scanlinefilters;
-import org.apache.commons.imaging.ImageReadException;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.io.IOException;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.ImageReadException;
+import org.junit.jupiter.api.Test;
public class ScanlineFilterUpTest {
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 efddc11..722697c 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.png.transparencyfilters;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class TransparencyFilterIndexedColorTest{
@Test
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 9fd43cd..14c87ad 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
@@ -16,14 +16,14 @@
*/
package org.apache.commons.imaging.formats.pnm;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class PbmFileInfoTest{
diff --git a/src/test/java/org/apache/commons/imaging/formats/pnm/PgmFileInfoTest.java b/src/test/java/org/apache/commons/imaging/formats/pnm/PgmFileInfoTest.java
index 868a4a2..1c9e4dc 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pnm/PgmFileInfoTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pnm/PgmFileInfoTest.java
@@ -25,14 +25,14 @@ import org.junit.jupiter.api.Test;
public class PgmFileInfoTest {
@Test
- public void testCreateThrowsImageReadExceptionOne() throws ImageReadException {
+ public void testCreateThrowsImageReadExceptionOne() {
Assertions.assertThrows(ImageReadException.class, () -> {
new PgmFileInfo(16711680, 16711680, false, 16711680);
});
}
@Test
- public void testCreateThrowsImageReadExceptionTwo() throws ImageReadException {
+ public void testCreateThrowsImageReadExceptionTwo() {
Assertions.assertThrows(ImageReadException.class, () -> {
new PgmFileInfo(0, 0, true, 0);
});
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 2c01b7a..7f7af48 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
@@ -16,6 +16,10 @@
*/
package org.apache.commons.imaging.formats.pnm;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
import java.io.IOException;
@@ -33,10 +37,6 @@ import org.apache.commons.imaging.Imaging;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class PnmImageParserTest {
private static final Charset US_ASCII = StandardCharsets.US_ASCII;
@@ -82,7 +82,7 @@ public class PnmImageParserTest {
* {@link NumberFormatException}.
*/
@Test
- public void testGetImageInfo_invalidWidth() throws ImageReadException, IOException {
+ public void testGetImageInfo_invalidWidth() {
final byte[] bytes = "P1\na 2\n0 0 0 0 0 0 0 0 0 0 0\n1 1 1 1 1 1 1 1 1 1 1\n".getBytes(US_ASCII);
final Map<String, Object> params = Collections.emptyMap();
final PnmImageParser underTest = new PnmImageParser();
@@ -92,7 +92,7 @@ public class PnmImageParserTest {
}
@Test
- public void testGetImageInfo_invalidHeight() throws ImageReadException, IOException {
+ public void testGetImageInfo_invalidHeight() {
final byte[] bytes = "P1\n2 a\n0 0\n0 0\n0 0\n0 0\n0 0\n0 1\n1 1\n1 1\n1 1\n1 1\n1 1\n".getBytes(US_ASCII);
final Map<String, Object> params = Collections.emptyMap();
final PnmImageParser underTest = new PnmImageParser();
@@ -102,7 +102,7 @@ public class PnmImageParserTest {
}
@Test
- public void testGetImageInfo_missingWidthValue() throws ImageReadException, IOException {
+ public void testGetImageInfo_missingWidthValue() {
final byte[] bytes = "P7\nWIDTH \n".getBytes(US_ASCII);
final Map<String, Object> params = Collections.emptyMap();
final PnmImageParser underTest = new PnmImageParser();
diff --git a/src/test/java/org/apache/commons/imaging/formats/pnm/PpmFileInfoTest.java b/src/test/java/org/apache/commons/imaging/formats/pnm/PpmFileInfoTest.java
index fd82923..73d0301 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pnm/PpmFileInfoTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pnm/PpmFileInfoTest.java
@@ -28,14 +28,14 @@ import org.junit.jupiter.api.Test;
public class PpmFileInfoTest {
@Test
- public void testCreatesPpmFileInfoOne() throws ImageReadException {
+ public void testCreatesPpmFileInfoOne() {
Assertions.assertThrows(ImageReadException.class, () -> {
new PpmFileInfo(0, 0, false, 16711680);
});
}
@Test
- public void testCreatesPpmFileInfoThree() throws ImageReadException {
+ public void testCreatesPpmFileInfoThree() {
Assertions.assertThrows(ImageReadException.class, () -> {
new PpmFileInfo(0, 0, true, 0);
});
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 7d52787..a8e78e1 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
@@ -16,13 +16,13 @@
*/
package org.apache.commons.imaging.formats.pnm;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Arrays;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class WhiteSpaceReaderTest{
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 fda5bca..081c721 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
@@ -16,17 +16,16 @@
*/
package org.apache.commons.imaging.formats.psd;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class ImageResourceBlockTest{
@Test
- public void testCreatesImageResourceBlockAndCallsGetName() throws UnsupportedEncodingException {
+ public void testCreatesImageResourceBlockAndCallsGetName() {
final byte[] byteArray = new byte[3];
final ImageResourceBlock imageResourceBlock = new ImageResourceBlock(0, byteArray, byteArray);
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 7085276..3664927 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.psd;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class ImageResourceTypeTest{
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
index 4f60d1a..4e62357 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
@@ -33,7 +33,7 @@ public abstract class PsdBaseTest extends ImagingTest {
return format == ImageFormats.PSD;
}
- private static final ImageFilter IMAGE_FILTER = file -> isPsd(file);
+ private static final ImageFilter IMAGE_FILTER = PsdBaseTest::isPsd;
protected List<File> getPsdImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
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 01f260a..a16b424 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class DataParserCmykTest {
@Test
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 0eeed8f..9ff612c 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class DataParserGrayscaleTest{
@Test
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 3f235db..58436ba 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class DataParserIndexedTest{
@Test
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 b21b66e..60b93e0 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.psd.dataparsers;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class DataParserLabTest{
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
index d003a8f..1335a8d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
@@ -33,7 +33,7 @@ public abstract class RgbeBaseTest extends ImagingTest {
return format == ImageFormats.RGBE;
}
- private static final ImageFilter IMAGE_FILTER = file -> isRgbe(file);
+ private static final ImageFilter IMAGE_FILTER = RgbeBaseTest::isRgbe;
protected List<File> getRgbeImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
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 4d78106..7495a75 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
@@ -59,12 +59,9 @@ public class RgbeReadTest extends RgbeBaseTest {
/**
* Test that a bad file does not gets the RgbeImageParser stuck reading it.
- *
- * @throws ImageReadException
- * @throws IOException
*/
@Test
- public void testErrorDecompressingInvalidFile() throws ImageReadException, IOException {
+ public void testErrorDecompressingInvalidFile() {
// From IMAGING-219
final File inputFile = new File(
RgbeReadTest.class.getResource("/IMAGING-219/timeout-9713502c9c371f1654b493650c16ab17c0444369")
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 e0902f5..ec0a8db 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
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.formats.tiff;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class JpegImageDataTest{
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
index 4d01d7e..080003d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
@@ -35,7 +35,7 @@ public abstract class TiffBaseTest extends ImagingTest {
return format == ImageFormats.TIFF;
}
- private static final ImageFilter IMAGE_FILTER = file -> isTiff(file);
+ private static final ImageFilter IMAGE_FILTER = TiffBaseTest::isTiff;
protected List<File> getTiffImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java
index 0791fb8..1806ad5 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.imaging.formats.tiff;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.awt.Color;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -25,18 +29,17 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImagingTestConstants;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
+import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntry;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntryForRange;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntryForValue;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PhotometricInterpreterFloat;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PaletteEntry;
/**
* Performs tests that access the content of TIFF files containing floating
@@ -212,7 +215,7 @@ public class TiffFloatingPointReadTest {
for(int i=0; i<height-8; i++){
checkSubImage(target, fullRaster, i, i, 8, 8);
}
-
+
// now read the entire image
checkSubImage(target, fullRaster, 0, 0, width, height);
} catch (ImageReadException | IOException ex) {
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 a870eee..e1b34ad 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
@@ -16,6 +16,10 @@
*/
package org.apache.commons.imaging.formats.tiff;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.awt.image.BufferedImage;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -24,7 +28,6 @@ import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.file.Path;
import java.util.HashMap;
-import javax.imageio.ImageIO;
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
@@ -37,10 +40,6 @@ import org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingp
import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -330,7 +329,7 @@ public class TiffFloatingPointRoundTripTest extends TiffBaseTest {
int rowInBlock = i - blockRow * nRowsInBlock;
int blockOffset = rowInBlock * nColsInBlock;
for (int j = 0; j < width; j++) {
- long sample = Double.doubleToRawLongBits((double) f[i * width + j]);
+ long sample = Double.doubleToRawLongBits(f[i * width + j]);
int blockCol = j / nColsInBlock;
int colInBlock = j - blockCol * nColsInBlock;
int index = blockOffset + colInBlock;
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
index 4fde1a5..1e7ce73 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.commons.imaging.formats.tiff;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
/**
* Provides unit test for the raster-data class.
@@ -54,7 +57,7 @@ public class TiffRasterDataTest {
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
int index = y * width + height;
- instance.setValue(x, y, (float) index);
+ instance.setValue(x, y, index);
int test = (int) instance.getValue(x, y);
assertEquals(index, test, "Set/get value test failed");
}
@@ -122,8 +125,8 @@ public class TiffRasterDataTest {
float[] result = raster.getData();
assertArrayEquals(data, result);
}
-
-
+
+
/**
* Test of constructors with bad arguments, of class TiffRasterData.
*/
@@ -163,13 +166,13 @@ public class TiffRasterDataTest {
// success!
}
}
-
+
/**
* Test of access with bad coordinates, of class TiffRasterData.
*/
@Test
public void testBadCoordinates() {
-
+
try{
float []f = new float[100];
TiffRasterData raster = new TiffRasterData(10, 10, f);
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatisticsTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatisticsTest.java
index 660dfe5..afbc164 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatisticsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatisticsTest.java
@@ -16,8 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
/**
* Provides unit tests for the TIFF simple-statistics class
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
index 3173734..6a2a595 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
@@ -24,18 +24,12 @@ import java.io.File;
import java.util.HashMap;
import java.util.List;
-
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.internal.Debug;
-
-import org.apache.commons.imaging.formats.tiff.TiffContents;
-import org.apache.commons.imaging.formats.tiff.TiffDirectory;
-import org.apache.commons.imaging.formats.tiff.TiffReader;
-
import org.junit.jupiter.api.Test;
public class TiffReadTest extends TiffBaseTest {
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 2d4a06a..ae95632 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
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
public class TiffSubImageTest extends TiffBaseTest {
final List<File> imageFileList;
-
+
TiffSubImageTest() throws IOException, ImageReadException{
imageFileList = getTiffImages();
}
@@ -55,24 +55,24 @@ public class TiffSubImageTest extends TiffBaseTest {
assertEquals(image.getWidth(), 2);
assertEquals(image.getHeight(), 3);
}
-
+
@Test
public void testBadSubImage() throws ImageReadException, IOException{
File target = imageFileList.get(0);
final BufferedImage referenceImage = Imaging.getBufferedImage(target);
int width = referenceImage.getWidth();
int height = referenceImage.getHeight();
-
+
final Map<String, Object> params = new HashMap<>();
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 0);
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 0);
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width);
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height);
-
+
BufferedImage image = Imaging.getBufferedImage(target, params);
assertEquals(image.getWidth(), width, "Improper width when sub-imaging entire image");
assertEquals(image.getHeight(), height, "Improper height when sub-imaging entire image");
-
+
processBadParams(target, -1, 0, width, height, "negative x position");
processBadParams(target, 0, -1, width, height, "negative y position");
processBadParams(target, 0, 0, 0, height, "zero width");
@@ -80,7 +80,7 @@ public class TiffSubImageTest extends TiffBaseTest {
processBadParams(target, 1, 0, width, height, "sub-image width extends beyond bounds");
processBadParams(target, 0, 1, width, height, "sub-image height extends beyond bounds");
}
-
+
private void processBadParams(File target, int x, int y, int width, int height, String comment) throws IOException{
try{
final Map<String, Object> params = new HashMap<>();
@@ -94,7 +94,7 @@ public class TiffSubImageTest extends TiffBaseTest {
// the test passed
}
}
-
+
@Test
public void testSubImageCorrectness() throws ImageReadException, IOException {
for(File target: imageFileList){
@@ -127,6 +127,6 @@ 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 3582c09..79c236a 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.tiff;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class TiffTagsTest{
@Test
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 1ff8440..e927d34 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
@@ -16,18 +16,17 @@
*/
package org.apache.commons.imaging.formats.tiff.datareaders;
-import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-
public class DataReaderStripsTest {
@Test
- public void testApplyPredictor() throws Exception {
+ public void testApplyPredictor() {
final int[] bitsPerPixel = {1,2,3};
final DataReaderStrips strips = new DataReaderStrips(
- null, null, 3, bitsPerPixel, 2, 4, 0, 3, 1, 1,
+ null, null, 3, bitsPerPixel, 2, 4, 0, 3, 1, 1,
TiffPlanarConfiguration.CHUNKY, null, 2, null);
strips.resetPredictor();
final int[] samples = {10, 355, 355, 255};
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAsciiTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAsciiTest.java
index a3e65ff..1507337 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAsciiTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAsciiTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
public class FieldTypeAsciiTest {
@Test
- public void testCreatesFieldTypeAsciiAndCallsWriteData() throws ImageWriteException {
+ public void testCreatesFieldTypeAsciiAndCallsWriteData() {
FieldTypeAscii fieldTypeAscii = new FieldTypeAscii(0, "1");
byte[] byteArray = new byte[1];
ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
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 07c151e..cf220af 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
@@ -16,21 +16,21 @@
*/
package org.apache.commons.imaging.formats.tiff.fieldtypes;
+import java.nio.ByteOrder;
+
import org.apache.commons.imaging.ImageWriteException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.nio.ByteOrder;
-
public class FieldTypeByteTest{
@Test
- public void testWriteDataWithNull() throws ImageWriteException {
+ public void testWriteDataWithNull() {
final FieldTypeByte fieldTypeByte = FieldType.UNDEFINED;
final ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
Assertions.assertThrows(ImageWriteException.class, () -> {
- fieldTypeByte.writeData( null, byteOrder);
+ 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 26b3f9b..1bb9c7a 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.fieldtypes;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class FieldTypeLongTest {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRationalTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRationalTest.java
index c07d676..701f413 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRationalTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRationalTest.java
@@ -41,7 +41,7 @@ public class FieldTypeRationalTest {
}
@Test
- public void testWriteDataWithNonNull() throws ImageWriteException {
+ public void testWriteDataWithNonNull() {
FieldTypeRational fieldTypeRational = new FieldTypeRational((-922), "z_AX");
ByteOrder byteOrder = ByteOrder.nativeOrder();
Assertions.assertThrows(ImageWriteException.class, () -> {
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 5d1ac6b..e936c43 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.fieldtypes;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class FieldTypeShortTest {
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 c99ac95..f094e26 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.tiff.fieldtypes;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class FieldTypeTest{
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuvTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuvTest.java
index 0df1edb..4024086 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuvTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuvTest.java
@@ -89,14 +89,14 @@ public class PhotometricInterpreterLogLuvTest {
}
@Test
- public void testInterpretPixelNullSamples() throws ImageReadException, IOException {
+ public void testInterpretPixelNullSamples() {
Assertions.assertThrows(ImageReadException.class, () -> {
p.interpretPixel(null, null, 0, 0);
});
}
@Test
- public void testInterpretPixelEmptySamples() throws ImageReadException, IOException {
+ public void testInterpretPixelEmptySamples() {
Assertions.assertThrows(ImageReadException.class, () -> {
p.interpretPixel(null, new int[] {}, 0, 0);
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgbTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgbTest.java
index c71d0db..150fd02 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgbTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgbTest.java
@@ -22,8 +22,6 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
-import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterRgb;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForRangeTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForRangeTest.java
index 501906a..1b8b4b5 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForRangeTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForRangeTest.java
@@ -16,9 +16,14 @@
*/
package org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.awt.Color;
+
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
/**
* Performs unit tests for palette entries based on range of values.
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java
index 5797d4f..1cd9bf2 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java
@@ -16,9 +16,14 @@
*/
package org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.awt.Color;
+
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
/**
* Performs unit tests for palette entries based on single-value targets.
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloatTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloatTest.java
index 93d87a7..e273193 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloatTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PhotometricInterpreterFloatTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.awt.Color;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.ImageBuilder;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
/**
* Provides a unit test for the TIFF photometric interpreter used for mapping
@@ -45,7 +48,7 @@ public class PhotometricInterpreterFloatTest {
}
@BeforeAll
- public static void setUpClass() throws ImageWriteException, ImageReadException, IOException {
+ public static void setUpClass() throws ImageReadException, IOException {
// the setup is to assign color (grayscale) values to the
// pixels along the main diagonal at coordinates
// (0, 0), (1, 1), ... (256, 256).
@@ -56,8 +59,8 @@ public class PhotometricInterpreterFloatTest {
List<PaletteEntry> reverseList = new ArrayList<>();
for (int i = 0; i < 256; i += 32) {
int i1 = i + 31;
- float f0 = (float) i / 256f;
- float f1 = (float) (i + 32) / 256f;
+ float f0 = i / 256f;
+ float f1 = (i + 32) / 256f;
int argb0 = 0xff000000 | (i << 8) | i;
int argb1 = 0xff000000 | (i1 << 8) | i;
Color c0 = new Color(argb0);
@@ -79,7 +82,7 @@ public class PhotometricInterpreterFloatTest {
imageBuilder = new ImageBuilder(257, 257, false);
int[] samples = new int[1];
for (int i = 0; i <= 256; i++) {
- float f = (float) i / 256f;
+ float f = i / 256f;
samples[0] = Float.floatToRawIntBits(f);
pInterp.interpretPixel(imageBuilder, samples, i, i);
}
@@ -94,7 +97,7 @@ public class PhotometricInterpreterFloatTest {
bandedInterp = new PhotometricInterpreterFloat(bandedPaletteList);
bandedImageBuilder = new ImageBuilder(300, 200, false);
for (int j = 0; j < 300; j++) {
- float f = (float) j / 299.0f;
+ float f = j / 299.0f;
samples[0] = Float.floatToRawIntBits(f);
for (int i = 0; i < 200; i++) {
bandedInterp.interpretPixel(bandedImageBuilder, samples, j, i);
@@ -237,18 +240,18 @@ public class PhotometricInterpreterFloatTest {
}
}
-
+
/**
- * Test of overlapping entries
+ * Test of overlapping entries
*/
@Test
- public void testOverlappingEntriesEntry() throws ImageWriteException, ImageReadException, IOException {
+ public void testOverlappingEntriesEntry() throws ImageReadException, IOException {
Color c0 = new Color(0xff0000ff);
Color c1 = new Color(0xff00ff00);
List<PaletteEntry> overlapList = new ArrayList<>();
overlapList.add(new PaletteEntryForRange(0.0f, 1.0f, c0));
overlapList.add(new PaletteEntryForRange(0.0f, 1.5f, c1));
-
+
PhotometricInterpreterFloat interpreter = new PhotometricInterpreterFloat(overlapList);
imageBuilder = new ImageBuilder(257, 257, false);
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 e54a0b0..d16f2ec 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-
public class TagInfoByteTest {
@Test
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 e24204c..4397e73 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
-import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
+import org.junit.jupiter.api.Test;
public class TagInfoSByteTest{
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 eab1aef..9f967f4 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
-import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertSame;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
+import org.junit.jupiter.api.Test;
public class TagInfoSBytesTest{
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 63c564d..5471e35 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
-import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
+import org.junit.jupiter.api.Test;
public class TagInfoSLongTest{
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 feb3efc..646f6e7 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
-import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
+import org.junit.jupiter.api.Test;
public class TagInfoSShortTest{
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 6e13390..7715002 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
-import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.nio.ByteOrder;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
+import org.junit.jupiter.api.Test;
public class TagInfoSShortsTest{
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 ad26c0c..55565c0 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
@@ -16,11 +16,11 @@
*/
package org.apache.commons.imaging.formats.tiff.taginfos;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class TagInfoUnknownTest{
@Test
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 c0ac8e3..1dbd21b 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
@@ -31,7 +31,7 @@ public class TiffOutputDirectoryTest {
private TiffOutputDirectory directory;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
directory = new TiffOutputDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_ROOT, TiffConstants.DEFAULT_TIFF_BYTE_ORDER);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSetTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSetTest.java
index 05e8a2d..9074a11 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSetTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSetTest.java
@@ -28,7 +28,7 @@ public class TiffOutputSetTest {
private TiffOutputSet tiffOutputSet;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
tiffOutputSet = new TiffOutputSet();
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
index 6aa6a20..350e4ce 100644
--- a/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
@@ -26,7 +26,7 @@ public abstract class WbmpBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".wbmp");
}
- private static final ImageFilter IMAGE_FILTER = file -> isWbmp(file);
+ private static final ImageFilter IMAGE_FILTER = WbmpBaseTest::isWbmp;
protected List<File> getWbmpImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
index 11c7aa4..5c2cef3 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
@@ -27,7 +27,7 @@ public abstract class XbmBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".xbm");
}
- private static final ImageFilter IMAGE_FILTER = file -> isXbm(file);
+ private static final ImageFilter IMAGE_FILTER = XbmBaseTest::isXbm;
protected List<File> getXbmImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
index 970dce7..719ff4b 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
@@ -27,7 +27,7 @@ public abstract class XpmBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".xpm");
}
- private static final ImageFilter IMAGE_FILTER = file -> isXpm(file);
+ private static final ImageFilter IMAGE_FILTER = XpmBaseTest::isXpm;
protected List<File> getXpmImages() throws IOException, ImageReadException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/palette/DitheringTest.java b/src/test/java/org/apache/commons/imaging/palette/DitheringTest.java
index d943ca9..4ebd266 100644
--- a/src/test/java/org/apache/commons/imaging/palette/DitheringTest.java
+++ b/src/test/java/org/apache/commons/imaging/palette/DitheringTest.java
@@ -34,7 +34,7 @@ public class DitheringTest {
public void testApplyFloydSteinbergDitheringWithNonNullOne() throws ImageWriteException {
BufferedImage bufferedImage = new BufferedImage(8, 8, 8);
bufferedImage.setRGB(2, 2, 2);
- List<ColorSpaceSubset> linkedList = new LinkedList<ColorSpaceSubset>();
+ List<ColorSpaceSubset> linkedList = new LinkedList<>();
ColorSpaceSubset colorSpaceSubset = new ColorSpaceSubset((-234), (-352));
colorSpaceSubset.rgb = 8;
linkedList.add(colorSpaceSubset);
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 8decde6..51d46ba 100644
--- a/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
+++ b/src/test/java/org/apache/commons/imaging/palette/SimplePaletteTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.imaging.palette;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class SimplePaletteTest{
diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java b/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java
index feb5a6a..38f4bc9 100644
--- a/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java
+++ b/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java
@@ -17,6 +17,8 @@
package org.apache.commons.imaging.roundtrip;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.Arrays;
@@ -31,8 +33,6 @@ import org.apache.commons.imaging.PixelDensity;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class PixelDensityRoundtrip extends RoundtripBase {
public static Stream<FormatInfo> testPixelDensityRoundtrip() {