You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2020/05/04 10:01:50 UTC
[james-project] 03/14: [Refactoring] remove formatter from
DateResolutionFormatter
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a899a7362b9bddf276edc712e5254f8479ccb4c4
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 28 21:30:04 2020 +0200
[Refactoring] remove formatter from DateResolutionFormatter
---
.../apache/james/mailbox/elasticsearch/json/IndexableMessage.java | 8 +++++---
.../james/mailbox/elasticsearch/query/CriterionConverter.java | 5 +++--
.../mailbox/elasticsearch/query/DateResolutionFormatter.java | 3 ---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
index edd1ad3..82dc941 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -30,7 +31,6 @@ import java.util.stream.Stream;
import org.apache.james.mailbox.ModSeq;
import org.apache.james.mailbox.elasticsearch.IndexAttachments;
-import org.apache.james.mailbox.elasticsearch.query.DateResolutionFormatter;
import org.apache.james.mailbox.extractor.TextExtractor;
import org.apache.james.mailbox.model.MessageAttachmentMetadata;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
@@ -45,6 +45,8 @@ import com.google.common.collect.ImmutableList;
public class IndexableMessage {
+ private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ");
+
public static class Builder {
private static ZonedDateTime getSanitizedInternalDate(MailboxMessage message, ZoneId zoneId) {
if (message.getInternalDate() == null) {
@@ -116,7 +118,7 @@ public class IndexableMessage {
EMailers to = EMailers.from(headerCollection.getToAddressSet());
EMailers cc = EMailers.from(headerCollection.getCcAddressSet());
EMailers bcc = EMailers.from(headerCollection.getBccAddressSet());
- String sentDate = DateResolutionFormatter.DATE_TIME_FORMATTER.format(headerCollection.getSentDate().orElse(internalDate));
+ String sentDate = DATE_TIME_FORMATTER.format(headerCollection.getSentDate().orElse(internalDate));
Optional<String> mimeMessageID = headerCollection.getMessageID();
String text = Stream.of(from.serialize(),
@@ -133,7 +135,7 @@ public class IndexableMessage {
String mailboxId = message.getMailboxId().serialize();
ModSeq modSeq = message.getModSeq();
long size = message.getFullContentOctets();
- String date = DateResolutionFormatter.DATE_TIME_FORMATTER.format(getSanitizedInternalDate(message, zoneId));
+ String date = DATE_TIME_FORMATTER.format(getSanitizedInternalDate(message, zoneId));
String mediaType = message.getMediaType();
String subType = message.getSubType();
boolean isAnswered = message.isAnswered();
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java
index 202c27f..0d6c24a 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java
@@ -28,6 +28,7 @@ import static org.elasticsearch.index.query.QueryBuilders.nestedQuery;
import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Locale;
@@ -186,11 +187,11 @@ public class CriterionConverter {
return boolQuery().filter(
convertDateOperator(field,
dateOperator.getType(),
- DateResolutionFormatter.DATE_TIME_FORMATTER.format(
+ DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(
DateResolutionFormatter.computeLowerDate(
DateResolutionFormatter.convertDateToZonedDateTime(dateOperator.getDate()),
dateOperator.getDateResultion())),
- DateResolutionFormatter.DATE_TIME_FORMATTER.format(
+ DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(
DateResolutionFormatter.computeUpperDate(
DateResolutionFormatter.convertDateToZonedDateTime(dateOperator.getDate()),
dateOperator.getDateResultion()))));
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java
index 55b026e..0f88ba2 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java
@@ -22,7 +22,6 @@ package org.apache.james.mailbox.elasticsearch.query;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit;
import java.util.Date;
@@ -31,8 +30,6 @@ import org.apache.james.mailbox.model.SearchQuery;
public class DateResolutionFormatter {
- public static DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ");
-
public static ZonedDateTime computeUpperDate(ZonedDateTime date, SearchQuery.DateResolution resolution) {
return computeLowerDate(date, resolution).plus(1, convertDateResolutionField(resolution));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org