opendev/gerrit
Code Issues Proposed changes

Switch to Java Date/Time API for mail related code

Browse Source 
Change-Id: I2b13d56ac8ee5b2ffc9b20ec43a6b525d4491889
This commit is contained in:
Alice Kober-Sotzek
2017-10-01 10:46:05 +02:00
parent 3f4336dea9
commit 1c50562df5
12 changed files with 73 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailMessage.java
View File

@@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.server.mail.Address;
import org.joda.time.DateTime;
import java.time.Instant;
/**
* A simplified representation of an RFC 2045-2047 mime email message used for representing received
@@ -40,7 +40,7 @@ public abstract class MailMessage {
public abstract ImmutableList<Address> cc();
// Metadata
public abstract DateTime dateReceived();
public abstract Instant dateReceived();
public abstract ImmutableList<String> additionalHeaders();
// Content
@@ -84,7 +84,7 @@ public abstract class MailMessage {
return this;
}
public abstract Builder dateReceived(DateTime val);
public abstract Builder dateReceived(Instant instant);
public abstract ImmutableList.Builder<String> additionalHeadersBuilder();

3
gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java
View File

@@ -33,7 +33,6 @@ import org.apache.james.mime4j.dom.Multipart;
import org.apache.james.mime4j.dom.TextBody;
import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.message.DefaultMessageBuilder;
import org.joda.time.DateTime;
/** Parses raw email content received through POP3 or IMAP into an internal {@link MailMessage}. */
public class RawMailParser {
@@ -66,7 +65,7 @@ public class RawMailParser {
if (mimeMessage.getSubject() != null) {
messageBuilder.subject(mimeMessage.getSubject());
}
messageBuilder.dateReceived(new DateTime(mimeMessage.getDate()));
messageBuilder.dateReceived(mimeMessage.getDate().toInstant());
// Add From, To and Cc
if (mimeMessage.getFrom() != null && mimeMessage.getFrom().size() > 0) {