This is an automated email from the ASF dual-hosted git repository.
garydgregory 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 f748f379 Flip null test
f748f379 is described below
commit f748f37935f52f1d8cd77ce966d0d53e48a58abe
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jul 5 09:54:03 2026 -0400
Flip null test
---
.../org/apache/commons/imaging/common/GenericImageMetadata.java | 2 +-
.../org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java | 4 ++--
.../org/apache/commons/imaging/formats/jpeg/JpegImageParser.java | 6 +++---
.../java/org/apache/commons/imaging/formats/png/PngImageParser.java | 2 +-
src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java | 2 +-
.../java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java | 6 +++---
.../org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java | 2 +-
.../org/apache/commons/imaging/formats/tiff/TiffImageParser.java | 4 ++--
.../java/org/apache/commons/imaging/formats/tiff/TiffReader.java | 4 ++--
src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java | 2 +-
.../commons/imaging/formats/tiff/write/TiffImageWriterLossless.java | 2 +-
.../apache/commons/imaging/examples/WriteExifMetadataExample.java | 6 +++---
.../org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java | 4 ++--
.../imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java | 4 ++--
.../apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java | 6 +++---
.../java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java | 4 ++--
18 files changed, 33 insertions(+), 33 deletions(-)
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 ab6292ee..7cfea91a 100644
--- a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
@@ -118,7 +118,7 @@ public class GenericImageMetadata implements ImageMetadata {
@Override
public String toString(String prefix) {
- if (null == prefix) {
+ if (prefix == null) {
prefix = "";
}
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 6b015e54..3f4d98ed 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
@@ -249,7 +249,7 @@ public class JpegImageMetadata implements ImageMetadata {
final StringBuilder result = new StringBuilder();
result.append(prefix);
- if (null == exif) {
+ if (exif == null) {
result.append("No Exif metadata.");
} else {
result.append("Exif metadata:");
@@ -261,7 +261,7 @@ public class JpegImageMetadata implements ImageMetadata {
result.append(NEWLINE);
result.append(prefix);
- if (null == photoshop) {
+ if (photoshop == null) {
result.append("No Photoshop (IPTC) metadata.");
} else {
result.append("Photoshop (IPTC) metadata:");
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
index dc7cf05b..2a8d9196 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
@@ -246,7 +246,7 @@ public class JpegImageParser extends
AbstractImageParser<JpegImagingParameters>
*/
public TiffImageMetadata getExifMetadata(final ByteSource byteSource,
TiffImagingParameters params) throws ImagingException, IOException {
final byte[] bytes = getExifRawData(byteSource);
- if (null == bytes) {
+ if (bytes == null) {
return null;
}
@@ -677,7 +677,7 @@ public class JpegImageParser extends
AbstractImageParser<JpegImagingParameters>
final JpegPhotoshopMetadata photoshop =
getPhotoshopMetadata(byteSource, params);
- if (null == exif && null == photoshop) {
+ if (exif == null && photoshop == null) {
return null;
}
@@ -719,7 +719,7 @@ public class JpegImageParser extends
AbstractImageParser<JpegImagingParameters>
}
}
- if (null == photoshopApp13Data) {
+ if (photoshopApp13Data == null) {
return null;
}
return new JpegPhotoshopMetadata(photoshopApp13Data);
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 77c8c38c..90fba9ce 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
@@ -368,7 +368,7 @@ public class PngImageParser extends
AbstractImageParser<PngImagingParameters> im
public TiffImageMetadata getExifMetadata(final ByteSource byteSource,
TiffImagingParameters params)
throws ImagingException, IOException {
final byte[] bytes = getExifRawData(byteSource);
- if (null == bytes) {
+ if (bytes == null) {
return null;
}
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 e8c9cd71..86853bc5 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
@@ -82,7 +82,7 @@ final class RgbeInfo implements Closeable {
}
ImageMetadata getMetadata() throws IOException, ImagingException {
- if (null == metadata) {
+ if (metadata == null) {
readMetadata();
}
return metadata;
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 eddb4658..24449b56 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
@@ -973,7 +973,7 @@ public class TiffDirectory extends AbstractTiffElement
implements Iterable<TiffF
* @throws IOException in the event of an I/O error.
*/
public BufferedImage getTiffImage() throws ImagingException, IOException {
- if (null == abstractTiffImageData) {
+ if (abstractTiffImageData == null) {
return null;
}
@@ -1008,7 +1008,7 @@ public class TiffDirectory extends AbstractTiffElement
implements Iterable<TiffF
* @throws IOException in the event of an I/O error.
*/
public BufferedImage getTiffImage(final ByteOrder byteOrder, final
TiffImagingParameters params) throws ImagingException, IOException {
- if (null == abstractTiffImageData) {
+ if (abstractTiffImageData == null) {
return null;
}
@@ -1027,7 +1027,7 @@ public class TiffDirectory extends AbstractTiffElement
implements Iterable<TiffF
* @throws IOException in the event of an I/O error.
*/
public BufferedImage getTiffImage(final TiffImagingParameters params)
throws ImagingException, IOException {
- if (null == abstractTiffImageData) {
+ if (abstractTiffImageData == null) {
return null;
}
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 577bea07..a92f0ee6 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
@@ -727,7 +727,7 @@ public class TiffImageMetadata extends GenericImageMetadata
{
*/
public GpsInfo getGpsInfo() throws ImagingException {
final TiffDirectory gpsDirectory =
findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_GPS);
- if (null == gpsDirectory) {
+ if (gpsDirectory == null) {
return null;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index 68637667..bccb80a7 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -238,7 +238,7 @@ public class TiffImageParser extends
AbstractImageParser<TiffImagingParameters>
final ByteOrder byteOrder = reader.getByteOrder();
final TiffDirectory directory = contents.directories.get(0);
final BufferedImage result = directory.getTiffImage(byteOrder, params);
- if (null == result) {
+ if (result == null) {
throw new ImagingException("TIFF does not contain an image.");
}
return result;
@@ -373,7 +373,7 @@ public class TiffImageParser extends
AbstractImageParser<TiffImagingParameters>
if (photometricInterpretation !=
TiffTagConstants.PHOTOMETRIC_INTERPRETATION_VALUE_RGB || bitsPerPixel != 24) {
throw new ImagingException("For planar configuration 2, only
24 bit RGB is currently supported");
}
- if (null ==
directory.findField(TiffTagConstants.TIFF_TAG_STRIP_OFFSETS)) {
+ if (directory.findField(TiffTagConstants.TIFF_TAG_STRIP_OFFSETS)
== null) {
throw new ImagingException("For planar configuration 2, only
strips-organization is supported");
}
}
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 21fbd6ea..437b916e 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
@@ -233,13 +233,13 @@ public class TiffReader extends BinaryFileParser {
return new AbstractTiffImageData.Strips(data, rowsPerStrip);
}
final TiffField tileWidthField =
directory.findField(TiffTagConstants.TIFF_TAG_TILE_WIDTH);
- if (null == tileWidthField) {
+ if (tileWidthField == null) {
throw new ImagingException("Can't find tile width field.");
}
final int tileWidth = tileWidthField.getIntValue();
final TiffField tileLengthField =
directory.findField(TiffTagConstants.TIFF_TAG_TILE_LENGTH);
- if (null == tileLengthField) {
+ if (tileLengthField == null) {
throw new ImagingException("Can't find tile length field.");
}
final int tileLength = tileLengthField.getIntValue();
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
index 5a430450..469ec980 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
@@ -64,7 +64,7 @@ final class TiffTags {
static TagInfo getTag(final int directoryType, final int tag) {
final List<TagInfo> possibleMatches = ALL_TAG_MAP.get(tag);
- if (null == possibleMatches) {
+ if (possibleMatches == null) {
return TiffTagConstants.TIFF_TAG_UNKNOWN;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
index 5303f650..2e7650e0 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
@@ -208,7 +208,7 @@ public class TiffImageWriterLossless extends
AbstractTiffImageWriter {
}
bestFit = element;
}
- if (null == bestFit) {
+ if (bestFit == null) {
// we couldn't place this item. overflow.
if ((overflowIndex & 1L) != 0) {
overflowIndex += 1;
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 35f270e6..79de03cf 100644
---
a/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
+++
b/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
@@ -75,7 +75,7 @@ public class WriteExifMetadataExample {
// if file does not contain any exif metadata, we create an empty
// set of exif metadata. Otherwise, we keep all of the other
// existing tags.
- if (null == outputSet) {
+ if (outputSet == null) {
outputSet = new TiffOutputSet();
}
@@ -160,7 +160,7 @@ public class WriteExifMetadataExample {
}
}
- if (null == outputSet) {
+ if (outputSet == null) {
// file does not contain any exif metadata. We don't need to
// update the file; just copy it.
FileUtils.copyFile(jpegImageFile, dst);
@@ -232,7 +232,7 @@ public class WriteExifMetadataExample {
// if file does not contain any exif metadata, we create an empty
// set of exif metadata. Otherwise, we keep all of the other
// existing tags.
- if (null == outputSet) {
+ if (outputSet == null) {
outputSet = new TiffOutputSet();
}
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 58c95ff1..976c5aed 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
@@ -350,12 +350,12 @@ public class SurveyTiffFile {
}
} else {
final TiffField tileWidthField =
directory.findField(TiffTagConstants.TIFF_TAG_TILE_WIDTH);
- if (null == tileWidthField) {
+ if (tileWidthField == null) {
throw new ImagingException("Can't find tile width field.");
}
tileWidth = tileWidthField.getIntValue();
final TiffField tileLengthField =
directory.findField(TiffTagConstants.TIFF_TAG_TILE_LENGTH);
- if (null == tileLengthField) {
+ if (tileLengthField == null) {
throw new ImagingException("Can't find tile length
field.");
}
tileHeight = tileLengthField.getIntValue();
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
index 86848f03..74dc2fc4 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
@@ -47,14 +47,14 @@ public abstract class AbstractSpecificExifTagTest extends
AbstractExifTest {
// note that metadata might be null if no metadata is found.
final ImageMetadata metadata = Imaging.getMetadata(imageFile);
- if (null == metadata) {
+ if (metadata == null) {
return;
}
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
// note that exif might be null if no Exif metadata is found.
final TiffImageMetadata exif = jpegMetadata.getExif();
- if (null == exif) {
+ if (exif == null) {
return;
}
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 ed5f0f1b..8e0ea20d 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
@@ -207,13 +207,13 @@ class ExifRewriteTest extends AbstractExifTest {
new JpegUtils().dumpJfif(byteSource);
final JpegImageMetadata oldMetadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile);
- if (null == oldMetadata) {
+ if (oldMetadata == null) {
continue;
}
assertNotNull(oldMetadata);
final TiffImageMetadata oldExifMetadata =
oldMetadata.getExif();
- if (null == oldExifMetadata) {
+ if (oldExifMetadata == null) {
continue;
}
assertNotNull(oldExifMetadata);
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
index 35958fb6..ad8c4fef 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
@@ -47,17 +47,17 @@ class GpsTest extends AbstractExifTest {
}
final JpegImageMetadata metadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile);
- if (null == metadata) {
+ if (metadata == null) {
return;
}
final TiffImageMetadata exifMetadata = metadata.getExif();
- if (null == exifMetadata) {
+ if (exifMetadata == null) {
return;
}
final TiffImageMetadata.GpsInfo gpsInfo = exifMetadata.getGpsInfo();
- if (null == gpsInfo) {
+ if (gpsInfo == null) {
return;
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
index 4ad4c418..df56719f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
@@ -41,7 +41,7 @@ class XmpDumpTest extends AbstractImagingTest {
Debug.debug();
final String xmpXml = Imaging.getXmpXml(imageFile);
- if (null == xmpXml) {
+ if (xmpXml == null) {
continue;
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
index 3cbba205..a95ea489 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
@@ -55,10 +55,10 @@ public class XmpUpdateTest<E extends
XmpImagingParameters<E>> extends AbstractIm
}
String xmpXml = Imaging.getXmpXml(imageFile);
- if (null == xmpXml && imageFormat.equals(ImageFormats.GIF)) {
+ if (xmpXml == null && imageFormat.equals(ImageFormats.GIF)) {
xmpXml = "temporary test until I can locate a GIF with XMP in
the wild.";
}
- if (null == xmpXml) {
+ if (xmpXml == null) {
continue;
}
