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 2021/02/23 03:45:16 UTC
[james-project] 03/14: JAMES-3431 Fix RFC-822 date formatting for
mailets
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 828e887fcd80018676beb7691d5d1654f78b32c0
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Feb 17 12:02:23 2021 +0700
JAMES-3431 Fix RFC-822 date formatting for mailets
See http://www.java2s.com/Book/Java/Examples/Format_a_date_using_Rfc822_Date_Format.htm
---
.../main/java/org/apache/mailet/base/DateFormats.java | 2 +-
.../apache/james/transport/mailets/DSNBounceTest.java | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java b/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java
index 53d99d0..3d52d3d 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/DateFormats.java
@@ -26,6 +26,6 @@ import java.util.Locale;
public interface DateFormats {
DateTimeFormatter RFC822_DATE_FORMAT =
- DateTimeFormatter.ofPattern("EEE, d MMM yyyy HH:mm:ss 'XXXXX' (z)", Locale.US);
+ DateTimeFormatter.ofPattern("EEE, d MMM yyyy HH:mm:ss Z", Locale.US);
}
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
index a2936bf..153c1d1 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
@@ -761,7 +761,7 @@ public class DSNBounceTest {
"Action: failed\n" +
"Status: Delivery error\n" +
"Diagnostic-Code: X-James; Delivery error\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -876,7 +876,7 @@ public class DSNBounceTest {
"Final-Recipient: rfc822; recipient@domain.com\n" +
"Action: delivered\n" +
"Status: unknown\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -995,7 +995,7 @@ public class DSNBounceTest {
"Action: delayed\n" +
"Status: Delivery error\n" +
"Diagnostic-Code: X-James; Delivery error\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -1110,7 +1110,7 @@ public class DSNBounceTest {
"Final-Recipient: rfc822; recipient@domain.com\n" +
"Action: relayed\n" +
"Status: unknown\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -1225,7 +1225,7 @@ public class DSNBounceTest {
"Final-Recipient: rfc822; recipient@domain.com\n" +
"Action: expanded\n" +
"Status: unknown\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -1268,7 +1268,7 @@ public class DSNBounceTest {
"Action: failed\n" +
"Status: Delivery error\n" +
"Diagnostic-Code: X-James; Delivery error\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -1306,13 +1306,13 @@ public class DSNBounceTest {
String expectedContent = "Reporting-MTA: dns; myhost\n" +
"Received-From-MTA: dns; 111.222.333.444\n" +
"Original-Envelope-Id: xyz\n" +
- "Arrival-Date: Fri, 30 Oct 2015 16:12:00 XXXXX (UTC)\n" +
+ "Arrival-Date: Fri, 30 Oct 2015 16:12:00 +0000\n" +
"\n" +
"Final-Recipient: rfc822; recipient@domain.com\n" +
"Action: failed\n" +
"Status: Delivery error\n" +
"Diagnostic-Code: X-James; Delivery error\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
@@ -1354,7 +1354,7 @@ public class DSNBounceTest {
"Action: failed\n" +
"Status: 4.0.0\n" +
"Diagnostic-Code: X-James; 4.0.0\n" +
- "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 XXXXX (UTC)\n";
+ "Last-Attempt-Date: Thu, 8 Sep 2016 14:25:52 +0000\n";
List<SentMail> sentMails = fakeMailContext.getSentMails();
assertThat(sentMails).hasSize(1);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org