You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2020/12/21 07:29:31 UTC
[james-project] 06/17: JAMES-3431 DSNBounce should include
diagnostic only if relevant
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit da28d755c5b0026539637a91fcbaa766f5ed3184
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Dec 17 08:47:41 2020 +0700
JAMES-3431 DSNBounce should include diagnostic only if relevant
---
.../java/org/apache/james/transport/mailets/DSNBounce.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
index a5eb82e..3862048 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
@@ -20,7 +20,6 @@
package org.apache.james.transport.mailets;
import static org.apache.james.transport.mailets.remote.delivery.Bouncer.DELIVERY_ERROR;
-import static org.apache.mailet.DsnParameters.Ret.HDRS;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -145,7 +144,7 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
return value;
}
- public boolean shouldIncludeDiagnosticCode() {
+ public boolean shouldIncludeDiagnostic() {
return shouldIncludeDiagnosticCode;
}
}
@@ -418,9 +417,11 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
.map(MailAddress::asString)
.collect(Collectors.joining(", ")));
builder.append(LINE_BREAK).append(LINE_BREAK);
- builder.append("Error message:").append(LINE_BREAK);
- builder.append(AttributeUtils.getValueAndCastFromMail(originalMail, DELIVERY_ERROR, String.class).orElse("")).append(LINE_BREAK);
- builder.append(LINE_BREAK);
+ if (action.shouldIncludeDiagnostic()) {
+ builder.append("Error message:").append(LINE_BREAK);
+ builder.append(AttributeUtils.getValueAndCastFromMail(originalMail, DELIVERY_ERROR, String.class).orElse("")).append(LINE_BREAK);
+ builder.append(LINE_BREAK);
+ }
MimeBodyPart bodyPart = new MimeBodyPart();
bodyPart.setText(builder.toString());
@@ -477,7 +478,7 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
buffer.append("Final-Recipient: rfc822; " + mailAddress.toString()).append(LINE_BREAK);
buffer.append("Action: ").append(action.asString()).append(LINE_BREAK);
buffer.append("Status: " + deliveryError).append(LINE_BREAK);
- if (action.shouldIncludeDiagnosticCode()) {
+ if (action.shouldIncludeDiagnostic()) {
buffer.append("Diagnostic-Code: " + getDiagnosticType(deliveryError) + "; " + deliveryError).append(LINE_BREAK);
}
buffer.append("Last-Attempt-Date: " + dateFormatter.format(ZonedDateTime.ofInstant(lastUpdated.toInstant(), ZoneId.systemDefault())))
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org