Merge pull request #74 from kinow/small-improvements
[IMAGING-254] Small code improvements
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f578db..aaae25e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,6 +45,9 @@
</properties>
<body>
<release version="1.0-alpha2" date="2020-??-??" description="Second 1.0 alpha release">
+ <action issue="IMAGING-254" dev="kinow" type="update">
+ Small code improvements
+ </action>
<action issue="IMAGING-253" dev="kinow" type="update" due-to="David Hrbacek">
ByteSourceInputStream has initialized its length when reading starts
</action>
diff --git a/src/main/java/org/apache/commons/imaging/FormatCompliance.java b/src/main/java/org/apache/commons/imaging/FormatCompliance.java
index 9f10c14..bd39b37 100644
--- a/src/main/java/org/apache/commons/imaging/FormatCompliance.java
+++ b/src/main/java/org/apache/commons/imaging/FormatCompliance.java
@@ -161,7 +161,7 @@
if (valid.length > 1) {
result.append('}');
}
- result.append(", actual: " + getValueDescription(actual) + ")");
+ result.append(", actual: ").append(getValueDescription(actual)).append(")");
addComment(result.toString());
return false;
}
diff --git a/src/main/java/org/apache/commons/imaging/ImageParser.java b/src/main/java/org/apache/commons/imaging/ImageParser.java
index 09bad76..812196b 100644
--- a/src/main/java/org/apache/commons/imaging/ImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/ImageParser.java
@@ -749,7 +749,7 @@
/**
* Get an array of bytes describing the International Color Consortium (ICC)
* specification for the color space of the image contained in the
- * input byteSoruce. Not all formats support ICC profiles.
+ * input byteSource. Not all formats support ICC profiles.
*
* @param byteSource A valid ByteSource.
* @param params Optional instructions for special-handling or
diff --git a/src/main/java/org/apache/commons/imaging/common/BasicCParser.java b/src/main/java/org/apache/commons/imaging/common/BasicCParser.java
index 4ab7e5a..29c8349 100644
--- a/src/main/java/org/apache/commons/imaging/common/BasicCParser.java
+++ b/src/main/java/org/apache/commons/imaging/common/BasicCParser.java
@@ -319,7 +319,7 @@
i += 2;
int constant;
try {
- constant = Integer.parseInt(Character.toString(hex1) + Character.toString(hex2), 16);
+ constant = Integer.parseInt(hex1 + Character.toString(hex2), 16);
} catch (final NumberFormatException nfe) {
throw new ImageReadException(
"Parsing XPM file failed, "
diff --git a/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java b/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java
index f31c254..c854c99 100644
--- a/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java
+++ b/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java
@@ -137,14 +137,14 @@
* contained within the bounds defined by the ImageBuilder, this method will
* throw a RasterFormatException. This runtime-exception behavior
* is consistent with the behavior of the getSubimage method
- * provided by BufferdImage.
+ * provided by BufferedImage.
* @param x the X coordinate of the upper-left corner of the
* specified rectangular region
* @param y the Y coordinate of the upper-left corner of the
* specified rectangular region
* @param w the width of the specified rectangular region
* @param h the height of the specified rectangular region
- * @return a BufferedImage that constructed from the deta within the
+ * @return a BufferedImage that constructed from the data within the
* specified rectangular region
* @throws RasterFormatException f the specified area is not contained
* within this ImageBuilder
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 ea2fc85..b7ad844 100644
--- a/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
+++ b/src/main/java/org/apache/commons/imaging/common/RationalNumber.java
@@ -45,7 +45,7 @@
while ((n > Integer.MAX_VALUE || n < Integer.MIN_VALUE
|| d > Integer.MAX_VALUE || d < Integer.MIN_VALUE)
&& (Math.abs(n) > 1) && (Math.abs(d) > 1)) {
- // brutal, inprecise truncation =(
+ // brutal, imprecise truncation =(
// use the sign-preserving right shift operator.
n >>= 1;
d >>= 1;
diff --git a/src/main/java/org/apache/commons/imaging/common/XmpEmbeddable.java b/src/main/java/org/apache/commons/imaging/common/XmpEmbeddable.java
index 701b8b5..66f52cc 100644
--- a/src/main/java/org/apache/commons/imaging/common/XmpEmbeddable.java
+++ b/src/main/java/org/apache/commons/imaging/common/XmpEmbeddable.java
@@ -34,7 +34,7 @@
/**
* Get a string containing XML-formatted text conforming to the Extensible
* Metadata Platform (EXP) standard for representing information about
- * image content. Not all image formats support EXP infomation and
+ * image content. Not all image formats support EXP information and
* even for those that do, there is no guarantee that such information
* will be present in an image.
*
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java b/src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java
index a3f8e01..6daf5ba 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java
+++ b/src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java
@@ -26,7 +26,7 @@
*/
class BitInputStreamFlexible extends InputStream {
// TODO should be byte order conscious, ie TIFF for reading
- // samples size<8 - shuoldn't that effect their order within byte?
+ // samples size<8 - shouldn't that effect their order within byte?
private final InputStream is;
private int cache;
private int cacheBitsRemaining;
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 c1e0f2f..e6bd9c7 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
@@ -698,7 +698,7 @@
// noop
}
- return position < line.length ? position : line.length;
+ return Math.min(position, line.length);
}
private static void fillRange(final BitArrayOutputStream outputStream,
diff --git a/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java b/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java
index d448088..02e3e57 100644
--- a/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java
+++ b/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java
@@ -67,8 +67,8 @@
bitCache >>= 8;
bitsInCache -= 8;
}
- final int remainderMask = (1 << bitsInCache) - 1; // unneccesary
- bitCache &= remainderMask; // unneccesary
+ final int remainderMask = (1 << bitsInCache) - 1; // unnecessary
+ bitCache &= remainderMask; // unnecessary
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
index d3e1ed4..97827f5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
@@ -196,7 +196,7 @@
final byte reserved = readByte("Reserved", is, "Not a Valid ICO File");
// Planes (2 bytes), always 1
final int planes = read2Bytes("Planes", is, "Not a Valid ICO File", getByteOrder());
- // BitCount (2 bytes), number of bits per pixel (1 for monchrome,
+ // BitCount (2 bytes), number of bits per pixel (1 for monochrome,
// 4 for 16 colors, 8 for 256 colors, 24 for true colors,
// 32 for true colors + alpha channel)
final int bitCount = read2Bytes("BitCount", is, "Not a Valid ICO File", getByteOrder());
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
index 0621a1c..078ad1d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
@@ -93,7 +93,7 @@
}
}
- Debug.debug(Integer.toString(markerCount) + " markers");
+ Debug.debug(markerCount + " markers");
}
}
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 d81b859..684e66a 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
@@ -436,7 +436,7 @@
*/
static JpegInputStream[] splitByRstMarkers(final int[] scanPayload) {
final List<Integer> intervalStarts = getIntervalStartPositions(scanPayload);
- // get number of intervals in payload to init an array of approbiate length
+ // get number of intervals in payload to init an array of appropriate length
final int intervalCount = intervalStarts.size();
JpegInputStream[] streams = new JpegInputStream[intervalCount];
for (int i = 0; i < intervalCount; i++) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
index b433e2c..7128927 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
@@ -57,7 +57,7 @@
// (among other places) but it's pretty thin. The fileformat.fine document
// at http://www.fileformat.fine/format/pcx/egff.htm is a little better
// but their gray sample image seems corrupt. PCX files themselves are
- // the ultimate test but pretty hard to find nowdays, so the best
+ // the ultimate test but pretty hard to find nowadays, so the best
// test is against other image viewers (Irfanview is pretty good).
//
// Open source projects are generally poor at parsing PCX,
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index 0e41591..77037e9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -569,9 +569,9 @@
}
if (sRGBs.size() == 1) {
- // no color management neccesary.
+ // no color management necessary.
if (LOGGER.isLoggable(Level.FINEST)) {
- LOGGER.finest("sRGB, no color management neccesary.");
+ LOGGER.finest("sRGB, no color management necessary.");
}
} else if (iCCPs.size() == 1) {
if (LOGGER.isLoggable(Level.FINEST)) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
index 97fb6b0..e0a0685 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
@@ -97,7 +97,7 @@
uncompressedProfile = getStreamBytes(new InflaterInputStream(new ByteArrayInputStream(compressedProfile)));
if (LOGGER.isLoggable(Level.FINEST)) {
- LOGGER.finest("UncompressedProfile: " + Integer.toString(bytes.length));
+ LOGGER.finest("UncompressedProfile: " + bytes.length);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
index c7ba5a7..18ca287 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
@@ -192,7 +192,7 @@
final Object object = objects[i];
if (i > 50) {
- result.append("... (" + objects.length + ")");
+ result.append("... (").append(objects.length).append(")");
break;
}
if (i > 0) {
@@ -224,13 +224,13 @@
final short sval = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Short.toString(sval));
+ result.append(sval);
}
return result.toString();
} else if (o instanceof int[]) {
@@ -241,13 +241,13 @@
final int iVal = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Integer.toString(iVal));
+ result.append(iVal);
}
return result.toString();
} else if (o instanceof long[]) {
@@ -258,13 +258,13 @@
final long lVal = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Long.toString(lVal));
+ result.append(lVal);
}
return result.toString();
} else if (o instanceof double[]) {
@@ -275,13 +275,13 @@
final double dVal = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Double.toString(dVal));
+ result.append(dVal);
}
return result.toString();
} else if (o instanceof byte[]) {
@@ -292,13 +292,13 @@
final byte bVal = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Byte.toString(bVal));
+ result.append(bVal);
}
return result.toString();
} else if (o instanceof char[]) {
@@ -309,13 +309,13 @@
final char cVal = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Character.toString(cVal));
+ result.append(cVal);
}
return result.toString();
} else if (o instanceof float[]) {
@@ -326,13 +326,13 @@
final float fVal = values[i];
if (i > 50) {
- result.append("... (" + values.length + ")");
+ result.append("... (").append(values.length).append(")");
break;
}
if (i > 0) {
result.append(", ");
}
- result.append(Float.toString(fVal));
+ result.append(fVal);
}
return result.toString();
}
@@ -386,14 +386,18 @@
@Override
public String toString() {
- final StringBuilder result = new StringBuilder();
-
- result.append(getTag() + " (0x" + Integer.toHexString(getTag()) + ": "
- + getTagInfo().name + "): ");
- result.append(getValueDescription() + " (" + getCount() + " "
- + getFieldType().getName() + ")");
-
- return result.toString();
+ return getTag() +
+ " (0x" +
+ Integer.toHexString(getTag()) +
+ ": " +
+ getTagInfo().name +
+ "): " +
+ getValueDescription() +
+ " (" +
+ getCount() +
+ " " +
+ getFieldType().getName() +
+ ")";
}
public String getTagName() {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
index e6fec64..ef7e8b4 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
@@ -520,18 +520,23 @@
// latitude: 8 degrees, 40 minutes, 42.2 seconds S
// longitude: 115 degrees, 26 minutes, 21.8 seconds E
- final StringBuilder result = new StringBuilder(88);
- result.append("[GPS. Latitude: " + latitudeDegrees.toDisplayString()
- + " degrees, " + latitudeMinutes.toDisplayString()
- + " minutes, " + latitudeSeconds.toDisplayString()
- + " seconds " + latitudeRef);
- result.append(", Longitude: " + longitudeDegrees.toDisplayString()
- + " degrees, " + longitudeMinutes.toDisplayString()
- + " minutes, " + longitudeSeconds.toDisplayString()
- + " seconds " + longitudeRef);
- result.append(']');
-
- return result.toString();
+ return "[GPS. Latitude: " +
+ latitudeDegrees.toDisplayString() +
+ " degrees, " +
+ latitudeMinutes.toDisplayString() +
+ " minutes, " +
+ latitudeSeconds.toDisplayString() +
+ " seconds " +
+ latitudeRef +
+ ", Longitude: " +
+ longitudeDegrees.toDisplayString() +
+ " degrees, " +
+ longitudeMinutes.toDisplayString() +
+ " minutes, " +
+ longitudeSeconds.toDisplayString() +
+ " seconds " +
+ longitudeRef +
+ ']';
}
public double getLongitudeAsDegreesEast() throws ImageReadException {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
index 771a684..bfa9fae 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
@@ -53,7 +53,7 @@
if (isLocalValue()) {
separateValueItem = null;
} else {
- final String name = "Field Seperate value (" + tagInfo.getDescription()
+ final String name = "Field Separate value (" + tagInfo.getDescription()
+ ")";
separateValueItem = new TiffOutputItem.Value(name, bytes);
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
index 23fce2a..28e29d3 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
@@ -274,7 +274,7 @@
final List<TiffOutputField> fields = directory.getFields();
for (final TiffOutputField field : fields) {
result.append(prefix);
- result.append("\t\tfield " + i + ": " + field.tagInfo);
+ result.append("\t\tfield ").append(i).append(": ").append(field.tagInfo);
result.append(NEWLINE);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/TestImageWriteException.java b/src/test/java/org/apache/commons/imaging/TestImageWriteException.java
index 5bae5dd..dfb229f 100644
--- a/src/test/java/org/apache/commons/imaging/TestImageWriteException.java
+++ b/src/test/java/org/apache/commons/imaging/TestImageWriteException.java
@@ -33,7 +33,7 @@
public static Stream<Object[]> data() {
final ImageWriteException exception = new ImageWriteException(null);
- return Stream.<Object[]>of(
+ return Stream.of(
new Object[] {null, "null"},
new Object[] {new Object[] {Integer.valueOf(1)}, "[Object[]: 1]"},
new Object[] {new char[] {'a', 'b', 'c'}, "[char[]: 3]"},
diff --git a/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java b/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
index 3c1771a..2b07bd3 100644
--- a/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
@@ -29,7 +29,7 @@
public class RationalNumberTest extends ImagingTest {
public static Stream<Double> data() {
- return Arrays.<Double> asList(
+ return Arrays.asList(
0d, //
0.1d, //
0.01d, //
diff --git a/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java b/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
index f0dd4f5..c997820 100644
--- a/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
+++ b/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
@@ -59,7 +59,7 @@
throws IOException, ImageReadException, ImageWriteException {
try (FileOutputStream fos = new FileOutputStream(dst);
- OutputStream os = new BufferedOutputStream(fos);) {
+ OutputStream os = new BufferedOutputStream(fos)) {
TiffOutputSet outputSet = null;
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 1a09d76..96d3d10 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
@@ -51,7 +51,7 @@
// TODO assert more
}
- @Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
+ @Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
public void testMetaData(File imageFile) throws ImageReadException, IOException {
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 b1d1551..77fba59 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
@@ -36,7 +36,7 @@
return getDcxImages().stream();
}
- @Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
+ @Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
public void testImageMetadata(File imageFile) throws Exception {
@@ -45,11 +45,11 @@
});
}
- @Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
+ @Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
public void testImageInfo(File imageFile) throws Exception {
- Imaging.getImageInfo(imageFile, Collections.<String, Object> emptyMap());
+ Imaging.getImageInfo(imageFile, Collections.emptyMap());
}
@ParameterizedTest
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 e9ba885..19aa54c 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
@@ -49,7 +49,7 @@
return getAnimatedGifImages().stream();
}
- @Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
+ @Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
public void testMetadata(File imageFile) throws Exception {
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 0c74ebb..1c91257 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
@@ -72,7 +72,7 @@
@ParameterizedTest
@MethodSource("data")
public void testImageInfo(File imageFile) throws Exception {
- final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, Collections.<String, Object> emptyMap());
+ final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, Collections.emptyMap());
assertNotNull(imageInfo);
}
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 68592bb..3690f13 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
@@ -36,7 +36,7 @@
return getIcoImages().stream();
}
- @Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
+ @Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
public void testMetadata(File imageFile) throws Exception {
@@ -45,12 +45,12 @@
});
}
- @Disabled(value = "RoundtripTest has to be fixed befor implementation can throw UnsupportedOperationException")
+ @Disabled(value = "RoundtripTest has to be fixed before implementation can throw UnsupportedOperationException")
@ParameterizedTest
@MethodSource("data")
public void testImageInfo(File imageFile) throws Exception {
Assertions.assertThrows(UnsupportedOperationException.class, () -> {
- Imaging.getImageInfo(imageFile, Collections.<String, Object> emptyMap());
+ Imaging.getImageInfo(imageFile, Collections.emptyMap());
});
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
index 5ad7180..257706e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
@@ -525,7 +525,7 @@
writeBITMAPINFOHEADER(bos, 16, 2 * 16, 1, 32, 0, 0, 0);
bos.write(bitmap);
bos.flush();
- // Because every pixel is fully trasparent, ***ALPHA GETS IGNORED***:
+ // Because every pixel is fully transparent, ***ALPHA GETS IGNORED***:
writeAndReadImageData("16x16x32-fully-transparent", baos.toByteArray(),
0xFF000000, 0xFFFFFFFF);
}
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 9147f84..f1da93d 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
@@ -39,7 +39,7 @@
.getResource("/IMAGING-215/ArrayIndexOutOfBoundsException_DhtSegment_79.jpeg")
.getFile());
Assertions.assertThrows(ImageReadException.class, () -> {
- Imaging.getMetadata(imageFile, Collections.<String, Object>emptyMap());
+ Imaging.getMetadata(imageFile, Collections.emptyMap());
});
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
index 74d0934..e9eadb1 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
@@ -46,7 +46,7 @@
final ByteSource byteSource = new ByteSourceFile(imageFile);
Debug.debug("Segments:");
new JpegUtils().dumpJFIF(byteSource);
- // TODO assert someting
+ // TODO assert something
}
@ParameterizedTest
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
index 285fdac..0b3aab9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
@@ -60,7 +60,7 @@
final TiffImageMetadata tiff = parser.getExifMetadata(byteSource, null);
for (final TiffField tiffField : tiff.getAllFields()) {
if (!tiffField.isLocalValue()) {
- final boolean isOdd = (tiffField.getOffset() & 1l) == 0;
+ final boolean isOdd = (tiffField.getOffset() & 1L) == 0;
assertTrue(isOdd);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
index 3dd0387..6c1c2f3 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
@@ -63,8 +63,7 @@
return;
}
- final List<IptcBlock> newBlocks = new ArrayList<>();
- newBlocks.addAll(metadata.photoshopApp13Data.getNonIptcBlocks());
+ final List<IptcBlock> newBlocks = new ArrayList<>(metadata.photoshopApp13Data.getNonIptcBlocks());
final List<IptcRecord> oldRecords = metadata.photoshopApp13Data.getRecords();
final List<IptcRecord> newRecords = new ArrayList<>();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java
index 945264e..ddc8272 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java
@@ -31,7 +31,7 @@
private byte[] addMetaData(final byte[] bytes) throws Exception {
final IptcRecord record = new IptcRecord(IptcTypes.KEYWORDS, "meta; data");
- final PhotoshopApp13Data data = new PhotoshopApp13Data(Collections.singletonList(record), Collections.<IptcBlock> emptyList());
+ final PhotoshopApp13Data data = new PhotoshopApp13Data(Collections.singletonList(record), Collections.emptyList());
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
new JpegIptcRewriter().writeIPTC(bytes, byteArrayOutputStream, data);
return byteArrayOutputStream.toByteArray();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java
index 9aa1dac..9d83c0d 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
@@ -50,7 +50,7 @@
*
* When such a case happens, the IptcParser fails with an exception, to avoid a memory
* error. To prevent that, the parser must be able to skip these blocks that the specification
- * says "It is recommened that you do not interpret or use this data".
+ * says "It is recommended that you do not interpret or use this data".
*
* @throws IOException when reading input
* @throws ImageReadException when parsing file
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 d862523..edf904d 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,9 +17,6 @@
package org.apache.commons.imaging.formats.png;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.List;
@@ -31,6 +28,9 @@
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
@@ -43,23 +43,23 @@
final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
if (isInvalidPNGTestFile(imageFile)) {
- try {
- Imaging.getMetadata(imageFile);
- fail("Image read should have failed.");
- } catch (final Exception e) {
- }
+ assertThrows(
+ Exception.class,
+ () -> Imaging.getMetadata(imageFile),
+ "Image read should have failed."
+ );
- try {
- Imaging.getImageInfo(imageFile);
- fail("Image read should have failed.");
- } catch (final Exception e) {
- }
+ assertThrows(
+ Exception.class,
+ () -> Imaging.getImageInfo(imageFile),
+ "Image read should have failed."
+ );
- try {
- Imaging.getBufferedImage(imageFile);
- fail("Image read should have failed.");
- } catch (final Exception e) {
- }
+ assertThrows(
+ Exception.class,
+ () -> Imaging.getBufferedImage(imageFile),
+ "Image read should have failed."
+ );
} else {
final ImageMetadata metadata = Imaging.getMetadata(imageFile);
Assertions.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null)
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 9ef618b..4028448 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
@@ -29,7 +29,7 @@
public void testUnfilterWithNull() throws IOException, ImageReadException {
final ScanlineFilterAverage scanlineFilterAverage = new ScanlineFilterAverage(2);
final byte[] byteArray = new byte[9];
- scanlineFilterAverage.unfilter(byteArray, byteArray, (byte[]) null);
+ scanlineFilterAverage.unfilter(byteArray, byteArray, null);
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0}, byteArray);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaethTest.java b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaethTest.java
index 9ead6b0..06a0579 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
@@ -29,7 +29,7 @@
public void testUnfilter() throws IOException, ImageReadException {
final ScanlineFilterPaeth scanlineFilterPaeth = new ScanlineFilterPaeth(0);
final byte[] byteArray = new byte[5];
- scanlineFilterPaeth.unfilter(byteArray, byteArray, (byte[]) null);
+ scanlineFilterPaeth.unfilter(byteArray, byteArray, null);
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0, (byte)0}, byteArray);
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUpTest.java b/src/test/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUpTest.java
index b9775f9..6be218c 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
@@ -29,7 +29,7 @@
public void testUnfilterWithNull() throws IOException, ImageReadException {
final ScanlineFilterUp scanlineFilterUp = new ScanlineFilterUp();
final byte[] byteArray = new byte[4];
- scanlineFilterUp.unfilter(byteArray, byteArray, (byte[]) null);
+ scanlineFilterUp.unfilter(byteArray, byteArray, null);
assertArrayEquals(new byte[] {(byte)0, (byte)0, (byte)0, (byte)0}, byteArray);
}
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 636d92d..fda5bca 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
@@ -19,6 +19,7 @@
import org.junit.jupiter.api.Test;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,7 +30,7 @@
final byte[] byteArray = new byte[3];
final ImageResourceBlock imageResourceBlock = new ImageResourceBlock(0, byteArray, byteArray);
- assertEquals( new String(byteArray, "ISO-8859-1"), imageResourceBlock.getName());
+ assertEquals( new String(byteArray, StandardCharsets.ISO_8859_1), imageResourceBlock.getName());
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
index 96cac8d..4d78106 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
@@ -70,7 +70,7 @@
RgbeReadTest.class.getResource("/IMAGING-219/timeout-9713502c9c371f1654b493650c16ab17c0444369")
.getFile());
final ByteSourceFile byteSourceFile = new ByteSourceFile(inputFile);
- final Map<String, Object> params = Collections.<String, Object>emptyMap();
+ final Map<String, Object> params = Collections.emptyMap();
Assertions.assertThrows(ImageReadException.class, () -> {
new RgbeImageParser().getBufferedImage(byteSourceFile, params);
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
index d4604f6..839f26c 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
@@ -68,7 +68,7 @@
final ByteSource byteSource = new ByteSourceFile(image);
final List<byte[]> data = new TiffImageParser().collectRawImageData(byteSource,
- Collections.<String, Object>emptyMap());
+ Collections.emptyMap());
for (final byte[] bytes : data) {
decompressRoundtripAndValidate(bytes);
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 4e68b10..0df1edb 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
@@ -57,17 +57,17 @@
@Test
public void testGetTristimulusValues() {
// any value equals 0 will have its pow(N, 3) equal to 0
- assertEquals(0.0d, (double) p.getTristimulusValues(0, 0, 0).x, 0.001d);
- assertEquals(0.0d, (double) p.getTristimulusValues(0, 0, 0).y, 0.001d);
- assertEquals(0.0d, (double) p.getTristimulusValues(0, 0, 0).z, 0.001d);
+ assertEquals(0.0d, p.getTristimulusValues(0, 0, 0).x, 0.001d);
+ assertEquals(0.0d, p.getTristimulusValues(0, 0, 0).y, 0.001d);
+ assertEquals(0.0d, p.getTristimulusValues(0, 0, 0).z, 0.001d);
// values under the threshold used in the if statements
- assertEquals(0.04126d, (double) p.getTristimulusValues(1, 0, 0).x, 0.001d);
- assertEquals(0.04341d, (double) p.getTristimulusValues(1, 0, 0).y, 0.001d);
- assertEquals(0.04727d, (double) p.getTristimulusValues(1, 0, 0).z, 0.001d);
+ assertEquals(0.04126d, p.getTristimulusValues(1, 0, 0).x, 0.001d);
+ assertEquals(0.04341d, p.getTristimulusValues(1, 0, 0).y, 0.001d);
+ assertEquals(0.04727d, p.getTristimulusValues(1, 0, 0).z, 0.001d);
// values under the threshold used in the if statements
- assertEquals(29.36116d, (double) p.getTristimulusValues(100, 100, 50).x, 0.001d);
- assertEquals(10.78483d, (double) p.getTristimulusValues(100, 100, 50).y, 0.001d);
- assertEquals(1.25681d, (double) p.getTristimulusValues(100, 100, 50).z, 0.001d);
+ assertEquals(29.36116d, p.getTristimulusValues(100, 100, 50).x, 0.001d);
+ assertEquals(10.78483d, p.getTristimulusValues(100, 100, 50).y, 0.001d);
+ assertEquals(1.25681d, p.getTristimulusValues(100, 100, 50).z, 0.001d);
}
@Test
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 3c0f564..aec12a5 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
@@ -30,7 +30,7 @@
final TiffDirectoryType tiffDirectoryType = TiffDirectoryType.TIFF_DIRECTORY_IFD0;
final TagInfoByte tagInfoByte = new TagInfoByte("", 347, tiffDirectoryType);
- assertArrayEquals(new byte[]{(byte) 0}, tagInfoByte.encodeValue((ByteOrder) null, (byte) 0));
+ assertArrayEquals(new byte[]{(byte) 0}, tagInfoByte.encodeValue(null, (byte) 0));
}
}
\ No newline at end of file
