Repository: nifi Updated Branches: refs/heads/master dc5e03236 -> 23cbc3b34
NIFI-3976: This closes #1857. Fix ConsumePOP3 and ConsumeIMAP to delete messages. Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/23cbc3b3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/23cbc3b3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/23cbc3b3 Branch: refs/heads/master Commit: 23cbc3b3463dcbd477b6ebcdbfbb2784f42e0749 Parents: dc5e032 Author: Koji Kawamura <[email protected]> Authored: Thu May 25 22:56:12 2017 +0900 Committer: joewitt <[email protected]> Committed: Thu May 25 10:59:53 2017 -0400 ---------------------------------------------------------------------- .../apache/nifi/processors/email/AbstractEmailProcessor.java | 7 ------- .../java/org/apache/nifi/processors/email/ConsumeIMAP.java | 1 + .../java/org/apache/nifi/processors/email/ConsumePOP3.java | 4 +++- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/23cbc3b3/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java index dbcdd0e..8e6dbae 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java @@ -31,7 +31,6 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import javax.mail.Address; -import javax.mail.Flags; import javax.mail.Message; import javax.mail.MessagingException; @@ -369,12 +368,6 @@ abstract class AbstractEmailProcessor<T extends AbstractMailReceiver> extends Ab this.getLogger().info("Successfully received {} from {} in {} millis", new Object[]{flowFile, fromAddressesString, executionDuration}); processSession.transfer(flowFile, REL_SUCCESS); - try { - emailMessage.setFlag(Flags.Flag.DELETED, this.shouldSetDeleteFlag); - } catch (MessagingException e) { - this.logger.warn("Failed to set DELETE Flag on the message", e); - this.getLogger().warn("Failed to set DELETE Flag on the message"); - } } /** http://git-wip-us.apache.org/repos/asf/nifi/blob/23cbc3b3/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java index 62e6f5d..c19ef4a 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java @@ -70,6 +70,7 @@ public class ConsumeIMAP extends AbstractEmailProcessor<ImapMailReceiver> { ImapMailReceiver receiver = new ImapMailReceiver(this.buildUrl(processContext)); boolean shouldMarkAsRead = processContext.getProperty(SHOULD_MARK_READ).asBoolean(); receiver.setShouldMarkMessagesAsRead(shouldMarkAsRead); + receiver.setShouldDeleteMessages(processContext.getProperty(AbstractEmailProcessor.SHOULD_DELETE_MESSAGES).asBoolean()); return receiver; } http://git-wip-us.apache.org/repos/asf/nifi/blob/23cbc3b3/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java index 6deab39..7211325 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java @@ -55,7 +55,9 @@ public class ConsumePOP3 extends AbstractEmailProcessor<Pop3MailReceiver> { */ @Override protected Pop3MailReceiver buildMessageReceiver(ProcessContext context) { - return new Pop3MailReceiver(this.buildUrl(context)); + final Pop3MailReceiver receiver = new Pop3MailReceiver(this.buildUrl(context)); + receiver.setShouldDeleteMessages(context.getProperty(AbstractEmailProcessor.SHOULD_DELETE_MESSAGES).asBoolean()); + return receiver; } /**
