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 b9683f8 Reduce the boilerplate with lambdas.
b9683f8 is described below
commit b9683f8dc0cc14c8874cdae241c672bde67e1d49
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Oct 8 18:18:37 2019 -0400
Reduce the boilerplate with lambdas.
---
.../imaging/formats/jpeg/iptc/IptcParser.java | 7 +---
.../imaging/formats/jpeg/iptc/IptcRecord.java | 7 +---
.../imaging/formats/jpeg/xmp/JpegRewriter.java | 21 ++----------
.../commons/imaging/formats/tiff/TiffElement.java | 17 ++++------
.../tiff/write/TiffImageWriterLossless.java | 14 ++------
.../formats/tiff/write/TiffOutputDirectory.java | 28 +++++++---------
.../imaging/palette/LongestAxisMedianCut.java | 38 +++++++++-------------
.../org/apache/commons/imaging/ImagingTest.java | 20 +++---------
.../commons/imaging/formats/bmp/BmpBaseTest.java | 7 +---
.../commons/imaging/formats/dcx/DcxBaseTest.java | 7 +---
.../commons/imaging/formats/gif/GifBaseTest.java | 7 +---
.../commons/imaging/formats/icns/IcnsBaseTest.java | 7 +---
.../commons/imaging/formats/ico/IcoBaseTest.java | 7 +---
.../commons/imaging/formats/jpeg/JpegBaseTest.java | 7 +---
.../imaging/formats/jpeg/exif/ExifBaseTest.java | 14 ++------
.../imaging/formats/jpeg/exif/ExifRewriteTest.java | 22 +++----------
.../imaging/formats/jpeg/iptc/IptcBaseTest.java | 14 ++------
.../imaging/formats/jpeg/xmp/JpegXmpBaseTest.java | 7 +---
.../commons/imaging/formats/pam/PamBaseTest.java | 7 +---
.../commons/imaging/formats/pcx/PcxBaseTest.java | 7 +---
.../commons/imaging/formats/png/PngBaseTest.java | 7 +---
.../commons/imaging/formats/psd/PsdBaseTest.java | 7 +---
.../commons/imaging/formats/rgbe/RgbeBaseTest.java | 7 +---
.../commons/imaging/formats/tiff/TiffBaseTest.java | 7 +---
.../commons/imaging/formats/wbmp/WbmpBaseTest.java | 7 +---
.../commons/imaging/formats/xbm/XbmBaseTest.java | 7 +---
.../commons/imaging/formats/xpm/XpmBaseTest.java | 7 +---
27 files changed, 70 insertions(+), 244 deletions(-)
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 c5377ce..958c56c 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
@@ -401,12 +401,7 @@ public class IptcParser extends BinaryFileParser {
elements = new ArrayList<>(elements);
// sort the list. Records must be in numerical order.
- final Comparator<IptcRecord> comparator = new
Comparator<IptcRecord>() {
- @Override
- public int compare(final IptcRecord e1, final IptcRecord e2) {
- return e2.iptcType.getType() - e1.iptcType.getType();
- }
- };
+ final Comparator<IptcRecord> comparator = (e1, e2) ->
e2.iptcType.getType() - e1.iptcType.getType();
Collections.sort(elements, comparator);
// TODO: make sure order right
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
index aa07d39..821aaf6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
@@ -24,12 +24,7 @@ import java.util.Comparator;
public class IptcRecord {
public final IptcType iptcType;
private final String value;
- public static final Comparator<IptcRecord> COMPARATOR = new
Comparator<IptcRecord>() {
- @Override
- public int compare(final IptcRecord e1, final IptcRecord e2) {
- return e1.iptcType.getType() - e2.iptcType.getType();
- }
- };
+ public static final Comparator<IptcRecord> COMPARATOR = (e1, e2) ->
e1.iptcType.getType() - e2.iptcType.getType();
public IptcRecord(final IptcType iptcType, final String value) {
this.iptcType = iptcType;
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 b113835..d696409 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,24 +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 = new
SegmentFilter() {
- @Override
- public boolean filter(final JFIFPieceSegment segment) {
- return segment.isExifSegment();
- }
- };
- private static final SegmentFilter XMP_SEGMENT_FILTER = new
SegmentFilter() {
- @Override
- public boolean filter(final JFIFPieceSegment segment) {
- return segment.isXmpSegment();
- }
- };
- private static final SegmentFilter PHOTOSHOP_APP13_SEGMENT_FILTER = new
SegmentFilter() {
- @Override
- public boolean filter(final JFIFPieceSegment segment) {
- return segment.isPhotoshopApp13Segment();
- }
- };
+ 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();
/**
* Constructor. to guess whether a file contains an image based on its file
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
index 26e49cf..a36f7c8 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
@@ -21,16 +21,13 @@ import java.util.Comparator;
public abstract class TiffElement {
public final long offset;
public final int length;
- public static final Comparator<TiffElement> COMPARATOR = new
Comparator<TiffElement>() {
- @Override
- public int compare(final TiffElement e1, final TiffElement e2) {
- if (e1.offset < e2.offset) {
- return -1;
- } else if (e1.offset > e2.offset) {
- return 1;
- } else {
- return 0;
- }
+ public static final Comparator<TiffElement> COMPARATOR = (e1, e2) -> {
+ if (e1.offset < e2.offset) {
+ return -1;
+ } else if (e1.offset > e2.offset) {
+ return 1;
+ } else {
+ return 0;
}
};
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 8e2e80d..63ec862 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
@@ -47,18 +47,8 @@ import
org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
public class TiffImageWriterLossless extends TiffImageWriterBase {
private final byte[] exifBytes;
- private static final Comparator<TiffElement> ELEMENT_SIZE_COMPARATOR = new
Comparator<TiffElement>() {
- @Override
- public int compare(final TiffElement e1, final TiffElement e2) {
- return e1.length - e2.length;
- }
- };
- private static final Comparator<TiffOutputItem> ITEM_SIZE_COMPARATOR = new
Comparator<TiffOutputItem>() {
- @Override
- public int compare(final TiffOutputItem e1, final TiffOutputItem e2) {
- return e1.getItemLength() - e2.getItemLength();
- }
- };
+ private static final Comparator<TiffElement> ELEMENT_SIZE_COMPARATOR =
(e1, e2) -> e1.length - e2.length;
+ private static final Comparator<TiffOutputItem> ITEM_SIZE_COMPARATOR =
(e1, e2) -> e1.getItemLength() - e2.getItemLength();
public TiffImageWriterLossless(final byte[] exifBytes) {
this.exifBytes = exifBytes;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
index 83f1caa..afdc763 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
@@ -74,16 +74,13 @@ public final class TiffOutputDirectory extends
TiffOutputItem {
private final List<TiffOutputField> fields = new ArrayList<>();
private final ByteOrder byteOrder;
private TiffOutputDirectory nextDirectory;
- public static final Comparator<TiffOutputDirectory> COMPARATOR = new
Comparator<TiffOutputDirectory>() {
- @Override
- public int compare(final TiffOutputDirectory o1, final
TiffOutputDirectory o2) {
- if (o1.type < o2.type) {
- return -1;
- } else if (o1.type > o2.type) {
- return 1;
- } else {
- return 0;
- }
+ public static final Comparator<TiffOutputDirectory> COMPARATOR = (o1, o2)
-> {
+ if (o1.type < o2.type) {
+ return -1;
+ } else if (o1.type > o2.type) {
+ return 1;
+ } else {
+ return 0;
}
};
private JpegImageData jpegImageData;
@@ -597,14 +594,11 @@ public final class TiffOutputDirectory extends
TiffOutputItem {
}
public void sortFields() {
- final Comparator<TiffOutputField> comparator = new
Comparator<TiffOutputField>() {
- @Override
- public int compare(final TiffOutputField e1, final TiffOutputField
e2) {
- if (e1.tag != e2.tag) {
- return e1.tag - e2.tag;
- }
- return e1.getSortHint() - e2.getSortHint();
+ final Comparator<TiffOutputField> comparator = (e1, e2) -> {
+ if (e1.tag != e2.tag) {
+ return e1.tag - e2.tag;
}
+ return e1.getSortHint() - e2.getSortHint();
};
Collections.sort(fields, comparator);
}
diff --git
a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
b/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
index d1751d8..be7525c 100644
--- a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
+++ b/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
@@ -24,14 +24,11 @@ import java.util.List;
import org.apache.commons.imaging.ImageWriteException;
public class LongestAxisMedianCut implements MedianCut {
- private static final Comparator<ColorGroup> COMPARATOR = new
Comparator<ColorGroup>() {
- @Override
- public int compare(final ColorGroup cg1, final ColorGroup cg2) {
- if (cg1.maxDiff == cg2.maxDiff) {
- return cg2.diffTotal - cg1.diffTotal;
- }
- return cg2.maxDiff - cg1.maxDiff;
+ private static final Comparator<ColorGroup> COMPARATOR = (cg1, cg2) -> {
+ if (cg1.maxDiff == cg2.maxDiff) {
+ return cg2.diffTotal - cg1.diffTotal;
}
+ return cg2.maxDiff - cg1.maxDiff;
};
@Override
@@ -62,21 +59,18 @@ public class LongestAxisMedianCut implements MedianCut {
private void doCut(final ColorGroup colorGroup, final ColorComponent mode,
final List<ColorGroup> colorGroups, final boolean ignoreAlpha)
throws ImageWriteException {
- final Comparator<ColorCount> comp = new Comparator<ColorCount>() {
- @Override
- public int compare(final ColorCount c1, final ColorCount c2) {
- switch (mode) {
- case ALPHA:
- return c1.alpha - c2.alpha;
- case RED:
- return c1.red - c2.red;
- case GREEN:
- return c1.green - c2.green;
- case BLUE:
- return c1.blue - c2.blue;
- default:
- return 0;
- }
+ final Comparator<ColorCount> comp = (c1, c2) -> {
+ switch (mode) {
+ case ALPHA:
+ return c1.alpha - c2.alpha;
+ case RED:
+ return c1.red - c2.red;
+ case GREEN:
+ return c1.green - c2.green;
+ case BLUE:
+ return c1.blue - c2.blue;
+ default:
+ return 0;
}
};
diff --git a/src/test/java/org/apache/commons/imaging/ImagingTest.java
b/src/test/java/org/apache/commons/imaging/ImagingTest.java
index fff09d6..635a12e 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingTest.java
@@ -54,13 +54,7 @@ public abstract class ImagingTest {
protected File getTestImageByName(final String fileName)
throws IOException, ImageReadException {
- return getTestImage(new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
- ImageReadException {
- return file.getName().equals(fileName);
- }
- });
+ return getTestImage(file -> file.getName().equals(fileName));
}
protected File getTestImage(final ImageFilter filter) throws IOException,
@@ -91,16 +85,12 @@ public abstract class ImagingTest {
Debug.debug("imagesFolder", imagesFolder);
assertTrue(imagesFolder.exists());
- final FileSystemTraversal.Visitor visitor = new
FileSystemTraversal.Visitor() {
-
- @Override
- public boolean visit(final File file, final double
progressEstimate) {
- if (!Imaging.hasImageFileExtension(file)) {
- return true;
- }
- ALL_IMAGES.add(file);
+ final FileSystemTraversal.Visitor visitor = (file, progressEstimate)
-> {
+ if (!Imaging.hasImageFileExtension(file)) {
return true;
}
+ ALL_IMAGES.add(file);
+ return true;
};
new FileSystemTraversal().traverseFiles(imagesFolder, visitor);
}
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 819b1e7..3fc9dde 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,12 +34,7 @@ public abstract class BmpBaseTest extends ImagingTest {
return format == ImageFormats.BMP;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isBmp(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isBmp(file);
protected static List<File> getBmpImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 f2f72c6..63cd502 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,12 +35,7 @@ public abstract class DcxBaseTest extends ImagingTest {
return format == ImageFormats.DCX;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isDcx(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isDcx(file);
protected static List<File> getDcxImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 9b1b65b..2d79f9c 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
@@ -35,12 +35,7 @@ public abstract class GifBaseTest extends ImagingTest {
return format == ImageFormats.GIF;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isGif(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isGif(file);
protected static List<File> getGifImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 5a28d4e..9c961e2 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,12 +35,7 @@ public abstract class IcnsBaseTest extends ImagingTest {
return format == ImageFormats.ICNS;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isIcns(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isIcns(file);
protected static List<File> getIcnsImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 60ca3e1..8c17298 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,12 +31,7 @@ public abstract class IcoBaseTest extends ImagingTest {
|| file.getName().toLowerCase().endsWith(".cur");
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isIco(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isIco(file);
protected static List<File> getIcoImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 592b8c3..a869555 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,12 +35,7 @@ public abstract class JpegBaseTest extends ImagingTest {
return format == ImageFormats.JPEG;
}
- public static final ImageFilter imageFilter = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isJpeg(file);
- }
- };
+ public static final ImageFilter imageFilter = file -> isJpeg(file);
protected static List<File> getJpegImages() throws IOException,
ImageReadException {
return getTestImages(imageFilter);
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 afa6bff..6ab8562 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,19 +42,9 @@ public abstract class ExifBaseTest extends ImagingTest {
}
}
- private static final ImageFilter HAS_EXIF_IMAGE_FILTER = new ImageFilter()
{
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return hasExifData(file);
- }
- };
+ private static final ImageFilter HAS_EXIF_IMAGE_FILTER = file ->
hasExifData(file);
- private static final ImageFilter JPEG_IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return file.getName().toLowerCase().endsWith(".jpg");
- }
- };
+ private static final ImageFilter JPEG_IMAGE_FILTER = file ->
file.getName().toLowerCase().endsWith(".jpg");
protected File getImageWithExifData() throws IOException,
ImageReadException {
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 a672231..2bd1f1b 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
@@ -248,30 +248,16 @@ public class ExifRewriteTest extends ExifBaseTest {
@Test
public void testRewriteLossy() throws Exception {
- final Rewriter rewriter = new Rewriter() {
- @Override
- public void rewrite(final ByteSource byteSource, final
OutputStream os,
- final TiffOutputSet outputSet) throws ImageReadException,
- IOException, ImageWriteException {
- new ExifRewriter().updateExifMetadataLossy(byteSource, os,
- outputSet);
- }
- };
+ final Rewriter rewriter = (byteSource, os, outputSet) -> new
ExifRewriter().updateExifMetadataLossy(byteSource, os,
+ outputSet);
rewrite(rewriter, "lossy");
}
@Test
public void testRewriteLossless() throws Exception {
- final Rewriter rewriter = new Rewriter() {
- @Override
- public void rewrite(final ByteSource byteSource, final
OutputStream os,
- final TiffOutputSet outputSet) throws ImageReadException,
- IOException, ImageWriteException {
- new ExifRewriter().updateExifMetadataLossless(byteSource, os,
- outputSet);
- }
- };
+ final Rewriter rewriter = (byteSource, os, outputSet) -> new
ExifRewriter().updateExifMetadataLossless(byteSource, os,
+ outputSet);
rewrite(rewriter, "lossless");
}
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 0c29b27..a5e2b1d 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,19 +49,9 @@ public abstract class IptcBaseTest extends ImagingTest {
}
}
- private static final ImageFilter HAS_IPTC_IMAGE_FILTER = new ImageFilter()
{
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return hasIptcData(file);
- }
- };
+ private static final ImageFilter HAS_IPTC_IMAGE_FILTER = file ->
hasIptcData(file);
- private static final ImageFilter JPEG_IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return file.getName().toLowerCase().endsWith(".jpg");
- }
- };
+ private static final ImageFilter JPEG_IMAGE_FILTER = file ->
file.getName().toLowerCase().endsWith(".jpg");
protected File getImageWithIptcData() throws IOException,
ImageReadException {
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 6573f9e..d4bc9fe 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,12 +50,7 @@ public abstract class JpegXmpBaseTest extends ImagingTest {
}
}
- private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = new
ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return hasJpegXmpData(file);
- }
- };
+ private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = file ->
hasJpegXmpData(file);
// private static final ImageFilter JPEG_IMAGE_FILTER = new ImageFilter()
// {
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 4b57fca..879fdf9 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,12 +35,7 @@ public abstract class PamBaseTest extends ImagingTest {
return format == ImageFormats.PAM;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isPam(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isPam(file);
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 1873cf6..16727cd 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,12 +30,7 @@ public abstract class PcxBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".pcx");
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isPcx(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isPcx(file);
protected List<File> getPcxImages() throws IOException, ImageReadException
{
return getTestImages(IMAGE_FILTER);
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 757a3b3..978e686 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,12 +35,7 @@ public abstract class PngBaseTest extends ImagingTest {
return format == ImageFormats.PNG;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isPng(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isPng(file);
protected List<File> getPngImages() throws IOException, ImageReadException
{
return getTestImages(IMAGE_FILTER);
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 0ee2d0c..4f60d1a 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,12 +33,7 @@ public abstract class PsdBaseTest extends ImagingTest {
return format == ImageFormats.PSD;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isPsd(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isPsd(file);
protected List<File> getPsdImages() throws IOException, ImageReadException
{
return getTestImages(IMAGE_FILTER);
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 09e2868..d003a8f 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,12 +33,7 @@ public abstract class RgbeBaseTest extends ImagingTest {
return format == ImageFormats.RGBE;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isRgbe(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isRgbe(file);
protected List<File> getRgbeImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 ab9f120..4d01d7e 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,12 +35,7 @@ public abstract class TiffBaseTest extends ImagingTest {
return format == ImageFormats.TIFF;
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isTiff(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isTiff(file);
protected List<File> getTiffImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
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 15450bd..6aa6a20 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,12 +26,7 @@ public abstract class WbmpBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".wbmp");
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isWbmp(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isWbmp(file);
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 d42b67c..11c7aa4 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,12 +27,7 @@ public abstract class XbmBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".xbm");
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isXbm(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isXbm(file);
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 d6946ac..970dce7 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,12 +27,7 @@ public abstract class XpmBaseTest extends ImagingTest {
return file.getName().toLowerCase().endsWith(".xpm");
}
- private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
- @Override
- public boolean accept(final File file) throws IOException,
ImageReadException {
- return isXpm(file);
- }
- };
+ private static final ImageFilter IMAGE_FILTER = file -> isXpm(file);
protected List<File> getXpmImages() throws IOException, ImageReadException
{
return getTestImages(IMAGE_FILTER);
