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:48 UTC
[james-project] 01/14: [Refactoring] fix some typos
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 f7ac1ed343e60389dfde9e5eee2443621443ab51
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 28 21:09:13 2020 +0200
[Refactoring] fix some typos
---
.../mailbox/elasticsearch/json/IndexableMessage.java | 6 +++---
.../mailbox/elasticsearch/query/CriterionConverter.java | 12 ++++++------
...olutionFormater.java => DateResolutionFormatter.java} | 4 ++--
...ormaterTest.java => DateResolutionFormatterTest.java} | 16 ++++++++--------
4 files changed, 19 insertions(+), 19 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 62df164..edd1ad3 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
@@ -30,7 +30,7 @@ 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.DateResolutionFormater;
+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;
@@ -116,7 +116,7 @@ public class IndexableMessage {
EMailers to = EMailers.from(headerCollection.getToAddressSet());
EMailers cc = EMailers.from(headerCollection.getCcAddressSet());
EMailers bcc = EMailers.from(headerCollection.getBccAddressSet());
- String sentDate = DateResolutionFormater.DATE_TIME_FOMATTER.format(headerCollection.getSentDate().orElse(internalDate));
+ String sentDate = DateResolutionFormatter.DATE_TIME_FORMATTER.format(headerCollection.getSentDate().orElse(internalDate));
Optional<String> mimeMessageID = headerCollection.getMessageID();
String text = Stream.of(from.serialize(),
@@ -133,7 +133,7 @@ public class IndexableMessage {
String mailboxId = message.getMailboxId().serialize();
ModSeq modSeq = message.getModSeq();
long size = message.getFullContentOctets();
- String date = DateResolutionFormater.DATE_TIME_FOMATTER.format(getSanitizedInternalDate(message, zoneId));
+ String date = DateResolutionFormatter.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 bd9bd11..202c27f 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
@@ -186,13 +186,13 @@ public class CriterionConverter {
return boolQuery().filter(
convertDateOperator(field,
dateOperator.getType(),
- DateResolutionFormater.DATE_TIME_FOMATTER.format(
- DateResolutionFormater.computeLowerDate(
- DateResolutionFormater.convertDateToZonedDateTime(dateOperator.getDate()),
+ DateResolutionFormatter.DATE_TIME_FORMATTER.format(
+ DateResolutionFormatter.computeLowerDate(
+ DateResolutionFormatter.convertDateToZonedDateTime(dateOperator.getDate()),
dateOperator.getDateResultion())),
- DateResolutionFormater.DATE_TIME_FOMATTER.format(
- DateResolutionFormater.computeUpperDate(
- DateResolutionFormater.convertDateToZonedDateTime(dateOperator.getDate()),
+ DateResolutionFormatter.DATE_TIME_FORMATTER.format(
+ DateResolutionFormatter.computeUpperDate(
+ DateResolutionFormatter.convertDateToZonedDateTime(dateOperator.getDate()),
dateOperator.getDateResultion()))));
}
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java
similarity index 95%
rename from mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java
rename to mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java
index 830086f..55b026e 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatter.java
@@ -29,9 +29,9 @@ import java.util.Date;
import org.apache.james.mailbox.model.SearchQuery;
-public class DateResolutionFormater {
+public class DateResolutionFormatter {
- public static DateTimeFormatter DATE_TIME_FOMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ");
+ 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));
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatterTest.java
similarity index 74%
rename from mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java
rename to mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatterTest.java
index f21add2..4b6932c 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormatterTest.java
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.model.SearchQuery;
import org.junit.jupiter.api.Test;
-class DateResolutionFormaterTest {
+class DateResolutionFormatterTest {
final String dateString = "2014-01-02T15:15:15Z";
@@ -36,7 +36,7 @@ class DateResolutionFormaterTest {
void calculateUpperDateShouldReturnDateUpToTheNextMinuteUsingMinuteUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Minute)
+ DateResolutionFormatter.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Minute)
)
).isEqualTo("2014-01-02T15:16:00Z");
}
@@ -45,7 +45,7 @@ class DateResolutionFormaterTest {
void calculateUpperDateShouldReturnDateUpToTheNextHourUsingHourUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Hour)
+ DateResolutionFormatter.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Hour)
)
).isEqualTo("2014-01-02T16:00:00Z");
}
@@ -54,7 +54,7 @@ class DateResolutionFormaterTest {
void calculateUpperDateShouldReturnDateUpToTheNextMonthUsingMonthUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Month)
+ DateResolutionFormatter.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Month)
)
).isEqualTo("2014-02-01T00:00:00Z");
}
@@ -63,7 +63,7 @@ class DateResolutionFormaterTest {
void calculateUpperDateShouldReturnDateUpToTheNextYearUsingYearUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Year)
+ DateResolutionFormatter.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Year)
)
).isEqualTo("2015-01-01T00:00:00Z");
}
@@ -72,7 +72,7 @@ class DateResolutionFormaterTest {
void calculateUpperDateShouldReturnDateUpToTheNextDayUsingDayUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Day)
+ DateResolutionFormatter.computeUpperDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Day)
)
).isEqualTo("2014-01-03T00:00:00Z");
}
@@ -81,7 +81,7 @@ class DateResolutionFormaterTest {
void calculateLowerDateShouldReturnDateUpToThePreviousMinuteUsingMinuteUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeLowerDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Minute)
+ DateResolutionFormatter.computeLowerDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Minute)
)
).isEqualTo("2014-01-02T15:15:00Z");
}
@@ -90,7 +90,7 @@ class DateResolutionFormaterTest {
void calculateLowerDateShouldReturnDateUpToThePreviousDayUsingDayUnit() {
assertThat(
ISO_OFFSET_DATE_TIME.format(
- DateResolutionFormater.computeLowerDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Day)
+ DateResolutionFormatter.computeLowerDate(ZonedDateTime.parse(dateString, ISO_OFFSET_DATE_TIME), SearchQuery.DateResolution.Day)
)
).isEqualTo("2014-01-02T00:00:00Z");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org