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:32 UTC
[james-project] 07/17: JAMES-3431 DSNBounce: Action should
customize error text footer
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 62d00f14ff4a6a9790eafb9e30bc3c679d6ac269
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Dec 17 08:51:54 2020 +0700
JAMES-3431 DSNBounce: Action should customize error text footer
---
.../org/apache/james/transport/mailets/DSNBounce.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 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 3862048..1c247b1 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
@@ -29,6 +29,7 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Pattern;
@@ -120,11 +121,11 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
private static final Logger LOGGER = LoggerFactory.getLogger(DSNBounce.class);
enum Action {
- DELIVERED("delivered", false),
- DELAYED("delayed", true),
- FAILED("failed", true),
- EXPANDED("expanded", false),
- RELAYED("relayed", false);
+ DELIVERED("Delivered", false),
+ DELAYED("Delayed", true),
+ FAILED("Failed", true),
+ EXPANDED("Expanded", false),
+ RELAYED("Relayed", false);
public static Optional<Action> parse(String serialized) {
return Stream.of(Action.values())
@@ -411,7 +412,7 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
StringBuilder builder = new StringBuilder();
builder.append(bounceMessage()).append(LINE_BREAK);
- builder.append("Failed recipient(s):").append(LINE_BREAK);
+ builder.append(action.asString()).append(" recipient(s):").append(LINE_BREAK);
builder.append(originalMail.getRecipients()
.stream()
.map(MailAddress::asString)
@@ -476,7 +477,7 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
private void appendRecipient(StringBuffer buffer, MailAddress mailAddress, String deliveryError, Date lastUpdated) {
buffer.append(LINE_BREAK);
buffer.append("Final-Recipient: rfc822; " + mailAddress.toString()).append(LINE_BREAK);
- buffer.append("Action: ").append(action.asString()).append(LINE_BREAK);
+ buffer.append("Action: ").append(action.asString().toLowerCase(Locale.US)).append(LINE_BREAK);
buffer.append("Status: " + deliveryError).append(LINE_BREAK);
if (action.shouldIncludeDiagnostic()) {
buffer.append("Diagnostic-Code: " + getDiagnosticType(deliveryError) + "; " + deliveryError).append(LINE_BREAK);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org