[nifi] branch master updated: NIFI-6695: ExtractEmailAttachments/ExtractEmailHeaders should not validate 'SendDate'

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new aba450d  NIFI-6695: ExtractEmailAttachments/ExtractEmailHeaders should 
not validate 'SendDate'
aba450d is described below

commit aba450d658e232b69add2eb942520c26cfc756b4
Author: archongum <qq349074...@live.com>
AuthorDate: Fri Sep 20 17:13:18 2019 +0800

    NIFI-6695: ExtractEmailAttachments/ExtractEmailHeaders should not validate 
'SendDate'
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #3757.
---
 .../org/apache/nifi/processors/email/ExtractEmailAttachments.java  | 6 ------
 .../java/org/apache/nifi/processors/email/ExtractEmailHeaders.java | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java
 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java
index c0496a7..c2e24e4 100644
--- 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java
+++ 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -134,11 +133,6 @@ public class ExtractEmailAttachments extends 
AbstractProcessor {
                         if (from == null) {
                             throw new MessagingException("Message failed 
RFC-2822 validation: No Sender");
                         }
-                        Date sentDate = originalMessage.getSentDate();
-                        if (sentDate == null) {
-                            // Throws MessageException due to lack of minimum 
required headers
-                            throw new MessagingException("Message failed 
RFC2822 validation: No Sent Date");
-                        }
                         originalFlowFilesList.add(originalFlowFile);
                         if (parser.hasAttachments()) {
                             final String originalFlowFileName = 
originalFlowFile.getAttribute(CoreAttributes.FILENAME.key());
diff --git 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
index 55b2b65..54a43ba 100644
--- 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
+++ 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -178,11 +177,7 @@ public class ExtractEmailHeaders extends AbstractProcessor 
{
                     if (from == null) {
                         throw new MessagingException("Message failed RFC-2822 
validation: No Sender");
                     }
-                    Date sentDate = originalMessage.getSentDate();
-                    if (sentDate == null ) {
-                        // Throws MessageException due to lack of minimum 
required headers
-                        throw new MessagingException("Message failed RFC-2822 
validation: No Sent Date");
-                    } else if (capturedHeadersList.size() > 0){
+                    if (capturedHeadersList.size() > 0){
                         Enumeration headers = originalMessage.getAllHeaders();
                         while (headers.hasMoreElements()) {
                             Header header = (Header) headers.nextElement();