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 2020/05/06 17:07:10 UTC

svn commit: r1877448 - in /pdfbox/trunk: preflight/src/main/java/org/apache/pdfbox/preflight/ preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ preflight/src/main/java/org/apache/pdfbox/preflight/process/ xmpbox/src/main/java/org/apache/xmpb...

Author: tilman
Date: Wed May  6 17:07:10 2020
New Revision: 1877448

URL: http://svn.apache.org/viewvc?rev=1877448&view=rev
Log:
PDFBOX-4071: use jdk8 functional syntax

Modified:
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/ValidationResult.java
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AbstractProcess.java
    pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java?rev=1877448&r1=1877447&r2=1877448&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java Wed May  6 17:07:10 2020
@@ -215,11 +215,7 @@ public class PreflightContext implements
      */
     public void addValidationErrors(List<ValidationError> errors)
     {
-        PreflightDocument pfDoc = this.document;
-        for (ValidationError error : errors)
-        {
-            pfDoc.addValidationError(error);
-        }
+        errors.forEach(this.document::addValidationError);
     }
 
     public PreflightPath getValidationPath()

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/ValidationResult.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/ValidationResult.java?rev=1877448&r1=1877447&r2=1877448&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/ValidationResult.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/ValidationResult.java Wed May  6 17:07:10 2020
@@ -150,10 +150,7 @@ public class ValidationResult
     {
         if (errors != null)
         {
-            for (ValidationError validationError : errors)
-            {
-                addError(validationError);
-            }
+            errors.forEach(this::addError);
         }
     }
 

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1877448&r1=1877447&r2=1877448&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Wed May  6 17:07:10 2020
@@ -25,6 +25,7 @@ import java.awt.color.ICC_Profile;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSBase;
@@ -328,13 +329,9 @@ public class StandardColorSpaceHelper im
             {
                 final Map<String, PDSeparation> colorants = attr.getColorants();
                 numberOfColorants = colorants.size();
-                for (PDSeparation col : colorants.values())
-                {
-                    if (col != null)
-                    {
-                        processAllColorSpace(col);
-                    }
-                }
+                colorants.values().stream().
+                        filter(Objects::nonNull).
+                        forEachOrdered(this::processAllColorSpace);
                 PDDeviceNProcess process = attr.getProcess();
                 if (process != null)
                 {

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AbstractProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AbstractProcess.java?rev=1877448&r1=1877447&r2=1877448&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AbstractProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AbstractProcess.java Wed May  6 17:07:10 2020
@@ -40,10 +40,7 @@ public abstract class AbstractProcess im
 
     protected void addValidationErrors(PreflightContext ctx, List<ValidationError> errors)
     {
-        for (ValidationError error : errors)
-        {
-            addValidationError(ctx, error);
-        }
+        errors.forEach(error -> addValidationError(ctx, error));
     }
 
     /**

Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java?rev=1877448&r1=1877447&r2=1877448&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java Wed May  6 17:07:10 2020
@@ -837,10 +837,7 @@ public class DomXmpParser
         }
 
         // now remove the child nodes
-        for (Node node : forDeletion)
-        {
-        	root.removeChild(node);
-        }
+        forDeletion.forEach(root::removeChild);
     }
 
     private AbstractStructuredType instanciateStructured(TypeMapping tm, Types type, String name,