You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/09/25 17:54:29 UTC
svn commit: r1867524 - in /pdfbox/trunk:
pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
Author: tilman
Date: Wed Sep 25 17:54:29 2019
New Revision: 1867524
URL: http://svn.apache.org/viewvc?rev=1867524&view=rev
Log:
PDFBOX-4071: use jdk8 lambda expressions and streams
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java?rev=1867524&r1=1867523&r2=1867524&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java Wed Sep 25 17:54:29 2019
@@ -24,11 +24,10 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* Functional test for PDF rendering. This test simply tries to render
@@ -46,21 +45,9 @@ public class TestRendering
@Parameters(name = "{0}")
public static Collection<Object[]> data()
{
- File[] testFiles = new File(INPUT_DIR).listFiles(new FilenameFilter()
- {
- @Override
- public boolean accept(File dir, String name)
- {
- return (name.endsWith(".pdf") || name.endsWith(".ai"));
- }
- });
-
- List<Object[]> params = new ArrayList<>();
- for (File file : testFiles)
- {
- params.add(new Object[] { file.getName() });
- }
- return params;
+ File[] testFiles = new File(INPUT_DIR).listFiles(
+ (dir, name) -> (name.endsWith(".pdf") || name.endsWith(".ai")));
+ return Stream.of(testFiles).map(file -> new Object[] { file.getName() }).collect(Collectors.toList());
}
private final String fileName;
Modified: pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java?rev=1867524&r1=1867523&r2=1867524&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java (original)
+++ pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java Wed Sep 25 17:54:29 2019
@@ -25,7 +25,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.OutputStream;
import java.util.HashSet;
@@ -292,14 +291,8 @@ public class TestImageIOUtils extends Te
throw new IOException("could not create output directory");
}
- File[] testFiles = new File(inDir).listFiles(new FilenameFilter()
- {
- @Override
- public boolean accept(File dir, String name)
- {
- return (name.endsWith(".pdf") || name.endsWith(".ai"));
- }
- });
+ File[] testFiles = new File(inDir).listFiles(
+ (dir, name) -> (name.endsWith(".pdf") || name.endsWith(".ai")));
for (File file : testFiles)
{