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 bt...@apache.org on 2018/01/26 01:44:31 UTC
[1/2] james-project git commit: JAMES-2922 MailQueueItemView should
express next delivery as a ZonedDateTime
Repository: james-project
Updated Branches:
refs/heads/master 866d09e24 -> cae93f359
JAMES-2922 MailQueueItemView should express next delivery as a ZonedDateTime
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cec918fc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cec918fc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cec918fc
Branch: refs/heads/master
Commit: cec918fcddb6d9428ed423a97d7e064102465711
Parents: 866d09e
Author: Matthieu Baechler <ma...@apache.org>
Authored: Thu Jan 25 15:30:41 2018 +0100
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 26 08:22:04 2018 +0700
----------------------------------------------------------------------
pom.xml | 5 +++
.../james/webadmin/utils/JsonTransformer.java | 1 +
.../james/webadmin/dto/MailQueueItemDTO.java | 24 +++--------
.../james/webadmin/routes/MailQueueRoutes.java | 5 ++-
.../webadmin/dto/MailQueueItemDTOTest.java | 7 +--
.../webadmin/routes/MailQueueRoutesTest.java | 2 -
.../james/queue/api/ManageableMailQueue.java | 27 ++++++------
.../apache/james/queue/file/FileMailQueue.java | 18 +++++---
server/queue/queue-jms/pom.xml | 4 ++
.../apache/james/queue/jms/JMSMailQueue.java | 45 ++++++++++----------
.../queue/library/MailQueueManagement.java | 4 +-
server/queue/queue-memory/pom.xml | 1 -
.../queue/memory/MemoryMailQueueFactory.java | 9 ++--
13 files changed, 81 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3411bd5..2d414a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2370,6 +2370,11 @@
<version>${testcontainers-version}</version>
</dependency>
<dependency>
+ <groupId>org.threeten</groupId>
+ <artifactId>threeten-extra</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<version>1.0.4</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java
index 6fd8f8c..ad7fe30 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java
@@ -34,6 +34,7 @@ public class JsonTransformer implements ResponseTransformer {
public JsonTransformer() {
objectMapper = new ObjectMapper()
.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+ .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
.registerModule(new Jdk8Module())
.registerModule(new JavaTimeModule());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/MailQueueItemDTO.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/MailQueueItemDTO.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/MailQueueItemDTO.java
index d7ec0b8..fb01f71 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/MailQueueItemDTO.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/MailQueueItemDTO.java
@@ -19,8 +19,8 @@
package org.apache.james.webadmin.dto;
+import java.time.ZonedDateTime;
import java.util.Collection;
-import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -34,8 +34,6 @@ import com.google.common.base.Strings;
public class MailQueueItemDTO {
- private static final long NO_NEXT_DELIVERY = -1;
-
public static Builder builder() {
return new Builder();
}
@@ -45,24 +43,16 @@ public class MailQueueItemDTO {
.name(mailQueueItemView.getMail().getName())
.sender(mailQueueItemView.getMail().getSender())
.recipients(mailQueueItemView.getMail().getRecipients())
- .nextDelivery(nextDelivery(mailQueueItemView))
+ .nextDelivery(mailQueueItemView.getNextDelivery())
.build();
}
- private static Optional<Date> nextDelivery(ManageableMailQueue.MailQueueItemView mailQueueItemView) {
- long nextDelivery = mailQueueItemView.getNextDelivery();
- if (nextDelivery == NO_NEXT_DELIVERY) {
- return Optional.empty();
- }
- return Optional.of(new Date(nextDelivery));
- }
-
public static class Builder {
private String name;
private String sender;
private List<String> recipients;
- private Optional<Date> nextDelivery;
+ private Optional<ZonedDateTime> nextDelivery;
private Builder() {
}
@@ -84,7 +74,7 @@ public class MailQueueItemDTO {
return this;
}
- public Builder nextDelivery(Optional<Date> nextDelivery) {
+ public Builder nextDelivery(Optional<ZonedDateTime> nextDelivery) {
this.nextDelivery = nextDelivery;
return this;
}
@@ -98,9 +88,9 @@ public class MailQueueItemDTO {
private final String name;
private final String sender;
private final List<String> recipients;
- private final Optional<Date> nextDelivery;
+ private final Optional<ZonedDateTime> nextDelivery;
- public MailQueueItemDTO(String name, String sender, List<String> recipients, Optional<Date> nextDelivery) {
+ public MailQueueItemDTO(String name, String sender, List<String> recipients, Optional<ZonedDateTime> nextDelivery) {
this.name = name;
this.sender = sender;
this.recipients = recipients;
@@ -119,7 +109,7 @@ public class MailQueueItemDTO {
return recipients;
}
- public Optional<Date> getNextDelivery() {
+ public Optional<ZonedDateTime> getNextDelivery() {
return nextDelivery;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
index 933bc38..a20e4c4 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
@@ -21,6 +21,7 @@ package org.apache.james.webadmin.routes;
import static org.apache.james.webadmin.Constants.SEPARATOR;
+import java.time.ZonedDateTime;
import java.util.List;
import java.util.Optional;
@@ -248,7 +249,9 @@ public class MailQueueRoutes implements Routes {
}
private boolean filter(MailQueueItemDTO item, Optional<Boolean> isDelayed) {
- return isDelayed.map(delayed -> delayed == item.getNextDelivery().isPresent())
+ boolean mailIsDelayed = item.getNextDelivery().map(date -> date.isAfter(ZonedDateTime.now())).orElse(false);
+ return isDelayed
+ .map(delayed -> delayed == mailIsDelayed)
.orElse(true);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/dto/MailQueueItemDTOTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/dto/MailQueueItemDTOTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/dto/MailQueueItemDTOTest.java
index 72d8ef7..bb3c7bc 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/dto/MailQueueItemDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/dto/MailQueueItemDTOTest.java
@@ -20,7 +20,7 @@ package org.apache.james.webadmin.dto;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import java.util.Date;
+import java.time.ZonedDateTime;
import java.util.List;
import org.apache.james.core.MailAddress;
@@ -53,7 +53,8 @@ public class MailQueueItemDTOTest {
@Test
public void fromShouldCreateTheRightObject() throws Exception {
FakeMail mail = Mails.defaultMail().build();
- MailQueueItemView mailQueueItemView = new MailQueueItemView(mail, 4);
+ ZonedDateTime date = ZonedDateTime.parse("2018-01-02T11:22:02Z");
+ MailQueueItemView mailQueueItemView = new MailQueueItemView(mail, date);
MailQueueItemDTO mailQueueItemDTO = MailQueueItemDTO.from(mailQueueItemView);
List<String> expectedRecipients = mail.getRecipients().stream()
.map(MailAddress::asString)
@@ -62,6 +63,6 @@ public class MailQueueItemDTOTest {
softly.assertThat(mailQueueItemDTO.getName()).isEqualTo(mail.getName());
softly.assertThat(mailQueueItemDTO.getSender()).isEqualTo(mail.getSender().asString());
softly.assertThat(mailQueueItemDTO.getRecipients()).isEqualTo(expectedRecipients);
- softly.assertThat(mailQueueItemDTO.getNextDelivery()).contains(new Date(4));
+ softly.assertThat(mailQueueItemDTO.getNextDelivery()).contains(date);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index f8e69b7..0279bea 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -47,7 +47,6 @@ import org.apache.mailet.base.test.FakeMail;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import com.github.steveash.guavate.Guavate;
@@ -251,7 +250,6 @@ public class MailQueueRoutesTest {
.body(".", hasSize(1));
}
- @Ignore("MemoryMailQueueFactory doesn't support delay")
@Test
public void listMailsShouldReturnDelayedMailsWhenAskFor() throws Exception {
MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
index a89154f..20635a6 100644
--- a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
+++ b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
@@ -18,7 +18,9 @@
****************************************************************/
package org.apache.james.queue.api;
+import java.time.ZonedDateTime;
import java.util.Iterator;
+import java.util.Optional;
import org.apache.mailet.Mail;
@@ -92,29 +94,26 @@ public interface ManageableMailQueue extends MailQueue {
class MailQueueItemView {
private final Mail mail;
- private final long nextDelivery;
+ private final Optional<ZonedDateTime> nextDelivery;
- public MailQueueItemView(Mail mail, long nextDelivery) {
+ public MailQueueItemView(Mail mail) {
+ this(mail, Optional.empty());
+ }
+
+ public MailQueueItemView(Mail mail, ZonedDateTime nextDelivery) {
+ this(mail, Optional.of(nextDelivery));
+ }
+
+ public MailQueueItemView(Mail mail, Optional<ZonedDateTime> nextDelivery) {
this.mail = mail;
this.nextDelivery = nextDelivery;
}
- /**
- * Return the Mail
- *
- * @return mail
- */
public Mail getMail() {
return mail;
}
- /**
- * Return the timestamp when the mail will be ready for dequeuing or -1
- * if there is no restriction set..
- *
- * @return nextDelivery
- */
- public long getNextDelivery() {
+ public Optional<ZonedDateTime> getNextDelivery() {
return nextDelivery;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
index 5801f75..461d450 100644
--- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
+++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
@@ -26,9 +26,14 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.security.SecureRandom;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
+import java.util.Optional;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
@@ -112,11 +117,11 @@ public class FileMailQueue implements ManageableMailQueue {
oin = new ObjectInputStream(new FileInputStream(item.getObjectFile()));
Mail mail = (Mail) oin.readObject();
- Long next = getNextDelivery(mail);
+ Optional<ZonedDateTime> next = getNextDelivery(mail);
final String key = mail.getName();
keyMappings.put(key, item);
- if (next <= System.currentTimeMillis()) {
+ if (!next.isPresent() || next.get().isBefore(ZonedDateTime.now())) {
try {
inmemoryQueue.put(key);
@@ -128,6 +133,7 @@ public class FileMailQueue implements ManageableMailQueue {
// Schedule a task which will put the mail in the queue
// for processing after a given delay
+ long nextDeliveryDelay = ZonedDateTime.now().until(next.get(), ChronoUnit.MILLIS);
scheduler.schedule(() -> {
try {
inmemoryQueue.put(key);
@@ -135,7 +141,7 @@ public class FileMailQueue implements ManageableMailQueue {
Thread.currentThread().interrupt();
throw new RuntimeException("Unable to init", e);
}
- }, next - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+ }, nextDeliveryDelay, TimeUnit.MILLISECONDS);
}
} catch (ClassNotFoundException | IOException e) {
LOGGER.error("Unable to load Mail", e);
@@ -153,12 +159,12 @@ public class FileMailQueue implements ManageableMailQueue {
}
}
- private Long getNextDelivery(Mail mail) {
+ private Optional<ZonedDateTime> getNextDelivery(Mail mail) {
Long next = (Long) mail.getAttribute(NEXT_DELIVERY);
if (next == null) {
- next = 0L;
+ return Optional.empty();
}
- return next;
+ return Optional.of(Instant.ofEpochMilli(next).atZone(ZoneId.systemDefault()));
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 95a05ce..bcc2368 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -143,6 +143,10 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.threeten</groupId>
+ <artifactId>threeten-extra</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
index bc12765..a0509f3 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
@@ -21,6 +21,9 @@ package org.apache.james.queue.jms;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.Serializable;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
@@ -61,6 +64,7 @@ import org.apache.james.server.core.MimeMessageCopyOnWriteProxy;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.threeten.extra.Temporals;
import com.google.common.base.Throwables;
@@ -209,11 +213,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
TimeMetric timeMetric = metricFactory.timer("enqueueMailTime:" + queueName);
Session session = null;
- long mydelay = 0;
-
- if (delay > 0) {
- mydelay = TimeUnit.MILLISECONDS.convert(delay, unit);
- }
+ long nextDeliveryTimestamp = computeNextDeliveryTimestamp(delay, unit);
try {
@@ -225,7 +225,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
msgPrio = (Integer) prio;
}
- Map<String, Object> props = getJMSProperties(mail, mydelay);
+ Map<String, Object> props = getJMSProperties(mail, nextDeliveryTimestamp);
produceMail(session, props, msgPrio, mail);
@@ -240,6 +240,16 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
}
}
+ public long computeNextDeliveryTimestamp(long delay, TimeUnit unit) {
+ if (delay > 0) {
+ return ZonedDateTime.now()
+ .plus(delay, Temporals.chronoUnit(unit))
+ .toInstant()
+ .toEpochMilli();
+ }
+ return NO_DELAY;
+ }
+
@Override
public void enQueue(Mail mail) throws MailQueueException {
enQueue(mail, NO_DELAY, TimeUnit.MILLISECONDS);
@@ -282,21 +292,8 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
}
}
- /**
- * Get JMS Message properties with values
- *
- * @param mail
- * @param delayInMillis
- * @throws JMSException
- * @throws MessagingException
- */
- protected Map<String, Object> getJMSProperties(Mail mail, long delayInMillis) throws MessagingException {
+ protected Map<String, Object> getJMSProperties(Mail mail, long nextDelivery) throws MessagingException {
Map<String, Object> props = new HashMap<>();
- long nextDelivery = -1;
- if (delayInMillis > 0) {
- nextDelivery = System.currentTimeMillis() + delayInMillis;
-
- }
props.put(JAMES_NEXT_DELIVERY, nextDelivery);
props.put(JAMES_MAIL_ERROR_MESSAGE, mail.getErrorMessage());
props.put(JAMES_MAIL_LAST_UPDATED, mail.getLastUpdated().getTime());
@@ -678,8 +675,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
while (hasNext()) {
try {
Message m = messages.nextElement();
- return new MailQueueItemView(createMail(m),
- m.getLongProperty(JAMES_NEXT_DELIVERY));
+ return new MailQueueItemView(createMail(m), nextDeliveryDate(m));
} catch (MessagingException | JMSException e) {
LOGGER.error("Unable to browse queue", e);
}
@@ -688,6 +684,11 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
throw new NoSuchElementException();
}
+ private ZonedDateTime nextDeliveryDate(Message m) throws JMSException {
+ long nextDeliveryTimestamp = m.getLongProperty(JAMES_NEXT_DELIVERY);
+ return Instant.ofEpochMilli(nextDeliveryTimestamp).atZone(ZoneId.systemDefault());
+ }
+
@Override
public boolean hasNext() {
return messages.hasMoreElements();
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
index 0b43edf..b846f33 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
@@ -19,12 +19,14 @@
package org.apache.james.queue.library;
import java.io.Serializable;
+import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
@@ -122,7 +124,7 @@ public class MailQueueManagement extends StandardMBean implements MailQueueManag
MailQueueItemView mView = it.next();
Mail m = mView.getMail();
- long nextDelivery = mView.getNextDelivery();
+ Optional<ZonedDateTime> nextDelivery = mView.getNextDelivery();
Map<String, Object> map = new HashMap<>();
map.put(names[0], m.getName());
String sender = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml
index 3c375a3..d4b7cae 100644
--- a/server/queue/queue-memory/pom.xml
+++ b/server/queue/queue-memory/pom.xml
@@ -68,7 +68,6 @@
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threeten-extra</artifactId>
- <version>1.3.2</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/cec918fc/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
index 4c5da8b..9049735 100644
--- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
+++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
@@ -20,6 +20,7 @@
package org.apache.james.queue.memory;
import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
import java.util.Iterator;
import java.util.Optional;
import java.util.Set;
@@ -98,7 +99,7 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu
@Override
public void enQueue(Mail mail, long delay, TimeUnit unit) throws MailQueueException {
- LocalDateTime nextDelivery = LocalDateTime.now().plus(delay, Temporals.chronoUnit(unit));
+ ZonedDateTime nextDelivery = ZonedDateTime.now().plus(delay, Temporals.chronoUnit(unit));
try {
mailItems.put(new MemoryMailQueueItem(cloneMail(mail), this, nextDelivery));
} catch (MessagingException e) {
@@ -194,7 +195,7 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu
public MailQueueIterator browse() throws MailQueueException {
Iterator<MailQueueItemView> underlying = ImmutableList.copyOf(mailItems)
.stream()
- .map(item -> new MailQueueItemView(item.getMail(), -1))
+ .map(item -> new MailQueueItemView(item.getMail(), item.delivery))
.iterator();
return new MailQueueIterator() {
@@ -233,9 +234,9 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu
public static class MemoryMailQueueItem implements MailQueue.MailQueueItem, Delayed {
private final Mail mail;
private final MemoryMailQueue queue;
- private final LocalDateTime delivery;
+ private final ZonedDateTime delivery;
- public MemoryMailQueueItem(Mail mail, MemoryMailQueue queue, LocalDateTime delivery) {
+ public MemoryMailQueueItem(Mail mail, MemoryMailQueue queue, ZonedDateTime delivery) {
this.mail = mail;
this.queue = queue;
this.delivery = delivery;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-2292 implement PATCH
/mailqueues/x/mails to flush mailqueue
Posted by bt...@apache.org.
JAMES-2292 implement PATCH /mailqueues/x/mails to flush mailqueue
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cae93f35
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cae93f35
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cae93f35
Branch: refs/heads/master
Commit: cae93f359e0c94801dab46c2e21f1633acd9cc44
Parents: cec918f
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Jan 24 15:00:07 2018 +0100
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 26 08:32:40 2018 +0700
----------------------------------------------------------------------
.../james/webadmin/dto/ForceDelivery.java | 39 +++++
.../james/webadmin/routes/MailQueueRoutes.java | 109 +++++++++++-
.../webadmin/routes/MailQueueRoutesTest.java | 167 +++++++++++++++++++
.../queue/memory/MemoryMailQueueFactory.java | 3 +-
4 files changed, 307 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/cae93f35/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/ForceDelivery.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/ForceDelivery.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/ForceDelivery.java
new file mode 100644
index 0000000..98ade6a
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/dto/ForceDelivery.java
@@ -0,0 +1,39 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.webadmin.dto;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ForceDelivery {
+
+ private final Optional<Boolean> delayed;
+
+ @JsonCreator
+ public ForceDelivery(@JsonProperty("delayed") Optional<Boolean> delayed) {
+ this.delayed = delayed;
+ }
+
+ public Optional<Boolean> getDelayed() {
+ return delayed;
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cae93f35/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
index a20e4c4..6815258 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
@@ -40,10 +40,13 @@ import org.apache.james.util.streams.Iterators;
import org.apache.james.util.streams.Limit;
import org.apache.james.webadmin.Constants;
import org.apache.james.webadmin.Routes;
+import org.apache.james.webadmin.dto.ForceDelivery;
import org.apache.james.webadmin.dto.MailQueueDTO;
import org.apache.james.webadmin.dto.MailQueueItemDTO;
import org.apache.james.webadmin.utils.ErrorResponder;
import org.apache.james.webadmin.utils.ErrorResponder.ErrorType;
+import org.apache.james.webadmin.utils.JsonExtractException;
+import org.apache.james.webadmin.utils.JsonExtractor;
import org.apache.james.webadmin.utils.JsonTransformer;
import org.eclipse.jetty.http.HttpStatus;
@@ -58,6 +61,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import io.swagger.jaxrs.PATCH;
import spark.HaltException;
import spark.Request;
import spark.Response;
@@ -76,19 +80,20 @@ public class MailQueueRoutes implements Routes {
private static final String DELAYED_QUERY_PARAM = "delayed";
private static final String LIMIT_QUERY_PARAM = "limit";
@VisibleForTesting static final int DEFAULT_LIMIT_VALUE = 100;
-
private static final String SENDER_QUERY_PARAM = "sender";
private static final String NAME_QUERY_PARAM = "name";
private static final String RECIPIENT_QUERY_PARAM = "recipient";
private final MailQueueFactory<ManageableMailQueue> mailQueueFactory;
private final JsonTransformer jsonTransformer;
+ private final JsonExtractor<ForceDelivery> jsonExtractor;
@Inject
@SuppressWarnings("unchecked")
@VisibleForTesting MailQueueRoutes(MailQueueFactory<?> mailQueueFactory, JsonTransformer jsonTransformer) {
this.mailQueueFactory = (MailQueueFactory<ManageableMailQueue>) mailQueueFactory;
this.jsonTransformer = jsonTransformer;
+ this.jsonExtractor = new JsonExtractor<>(ForceDelivery.class);
}
@Override
@@ -100,6 +105,8 @@ public class MailQueueRoutes implements Routes {
listMails(service);
deleteMails(service);
+
+ forceDelayedMailsDelivery(service);
}
@GET
@@ -170,16 +177,16 @@ public class MailQueueRoutes implements Routes {
@ApiImplicitParams({
@ApiImplicitParam(required = true, dataType = "string", name = "mailQueueName", paramType = "path"),
@ApiImplicitParam(
- required = false,
- dataType = "boolean",
- name = DELAYED_QUERY_PARAM,
+ required = false,
+ dataType = "boolean",
+ name = DELAYED_QUERY_PARAM,
paramType = "query",
example = "?delayed=true",
value = "Whether the mails are delayed in the mail queue or not (already sent)."),
@ApiImplicitParam(
- required = false,
- dataType = "int",
- name = LIMIT_QUERY_PARAM,
+ required = false,
+ dataType = "int",
+ name = LIMIT_QUERY_PARAM,
paramType = "query",
example = "?limit=100",
defaultValue = "100",
@@ -195,8 +202,8 @@ public class MailQueueRoutes implements Routes {
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.")
})
public void listMails(Service service) {
- service.get(BASE_URL + SEPARATOR + MAIL_QUEUE_NAME + MAILS,
- (request, response) -> listMails(request),
+ service.get(BASE_URL + SEPARATOR + MAIL_QUEUE_NAME + MAILS,
+ (request, response) -> listMails(request),
jsonTransformer);
}
@@ -344,6 +351,79 @@ public class MailQueueRoutes implements Routes {
}
}
+ @PATCH
+ @Path("/{mailQueueName}/mails")
+ @ApiImplicitParams({
+ @ApiImplicitParam(
+ required = true,
+ dataType = "string",
+ name = "mailQueueName",
+ paramType = "path"),
+ @ApiImplicitParam(
+ required = false,
+ dataType = "boolean",
+ name = DELAYED_QUERY_PARAM,
+ paramType = "query",
+ example = "?delayed=true",
+ value = "Whether the mails are delayed in the mail queue or not (already sent).")
+ })
+ @ApiOperation(
+ value = "Force delayed mails delivery"
+ )
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK"),
+ @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "Invalid request for getting the mail queue."),
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The MailQueue does not exist."),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.")
+ })
+ public void forceDelayedMailsDelivery(Service service) {
+ service.patch(BASE_URL + SEPARATOR + MAIL_QUEUE_NAME + MAILS,
+ this::forceDelayedMailsDelivery,
+ jsonTransformer);
+ }
+
+ private Response forceDelayedMailsDelivery(Request request, Response response) throws JsonExtractException, MailQueueException {
+ assertDelayedParamIsTrue(request);
+ assertPayloadContainsDelayedEntry(request);
+ ManageableMailQueue mailQueue = assertMailQueueExists(request);
+
+ mailQueue.flush();
+
+ response.status(HttpStatus.NO_CONTENT_204);
+ return response;
+ }
+
+ private ManageableMailQueue assertMailQueueExists(Request request) {
+ String mailQueueName = request.params(MAIL_QUEUE_NAME);
+ return mailQueueFactory.getQueue(mailQueueName)
+ .orElseThrow(() -> ErrorResponder.builder()
+ .message(String.format("%s can not be found", mailQueueName))
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .type(ErrorType.NOT_FOUND)
+ .haltError());
+ }
+
+ private void assertPayloadContainsDelayedEntry(Request request) {
+ try {
+ if (jsonExtractor.parse(request.body())
+ .getDelayed()
+ .orElse(true)) {
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .type(ErrorType.INVALID_ARGUMENT)
+ .message("This request requires payload to contain delayed attribute set to false")
+ .haltError();
+ }
+ } catch (JsonExtractException e) {
+ throw ErrorResponder.builder()
+ .type(ErrorResponder.ErrorType.INVALID_ARGUMENT)
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .message("Invalid JSON document: " + e.getMessage())
+ .cause(e)
+ .haltError();
+ }
+ }
+
private Object deleteMails(ManageableMailQueue queue, Optional<MailAddress> maybeSender, Optional<String> maybeName, Optional<MailAddress> maybeRecipient) {
if (Booleans.countTrue(maybeSender.isPresent(), maybeName.isPresent(), maybeRecipient.isPresent()) != 1) {
throw ErrorResponder.builder()
@@ -358,4 +438,15 @@ public class MailQueueRoutes implements Routes {
maybeRecipient.ifPresent(Throwing.consumer((MailAddress recipient) -> queue.remove(Type.Recipient, recipient.asString())).sneakyThrow());
return Constants.EMPTY_BODY;
}
+
+ private void assertDelayedParamIsTrue(Request request) {
+ if (!isDelayed(request.queryParams(DELAYED_QUERY_PARAM)).orElse(false)) {
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .type(ErrorType.INVALID_ARGUMENT)
+ .message("This request requires delayed param to be set to true")
+ .haltError();
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cae93f35/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 0279bea..f0f99d6 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -21,6 +21,7 @@ package org.apache.james.webadmin.routes;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.when;
+import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
@@ -30,6 +31,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import java.nio.charset.StandardCharsets;
+import java.time.ZonedDateTime;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -399,6 +401,80 @@ public class MailQueueRoutesTest {
}
@Test
+ public void forcingDelayedMailsDeliveryShouldReturnNoContent() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "true")
+ .body("{\"delayed\": \"false\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.NO_CONTENT_204);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryForUnknownQueueShouldReturnNotFound() throws Exception {
+ given()
+ .queryParam("delayed", "true")
+ .body("{\"delayed\": \"false\"}")
+ .when()
+ .patch("unknown queue" + "/mails")
+ .then()
+ .statusCode(HttpStatus.NOT_FOUND_404);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryRequiresDelayedParameter() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .body("{\"delayed\": \"false\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldRejectFalseDelayedParam() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "false")
+ .body("{\"delayed\": \"false\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldRejectNonBooleanDelayedParam() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "wrong")
+ .body("{\"delayed\": \"false\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldRejectRequestWithoutBody() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "true")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
public void deleteMailsShouldDeleteMailsWhenSenderIsGiven() throws Exception {
MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
String sender = "sender@james.org";
@@ -461,6 +537,61 @@ public class MailQueueRoutesTest {
.param("recipient", "recipient@james.org")
.when()
.delete(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldRejectRequestWithoutDelayedParameter() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "true")
+ .body("{\"xx\": \"false\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldAcceptRequestWithUnknownFields() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "true")
+ .body("{" +
+ "\"xx\": \"false\"," +
+ "\"delayed\": \"false\"" +
+ "}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldRejectMalformedJsonPayload() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "true")
+ .body("{\"xx\":")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldRejectTrueDelayedAttribute() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "false")
+ .body("{\"delayed\": \"true\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
.then()
.statusCode(HttpStatus.BAD_REQUEST_400);
}
@@ -478,6 +609,19 @@ public class MailQueueRoutesTest {
}
@Test
+ public void forcingDelayedMailsDeliveryShouldRejectStringDelayedAttribute() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+
+ given()
+ .queryParam("delayed", "false")
+ .body("{\"delayed\": \"string\"}")
+ .when()
+ .patch(FIRST_QUEUE + "/mails")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400);
+ }
+
+ @Test
public void deleteMailsShouldDeleteMailsWhenTheyAreMatching() throws Exception {
MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
String recipient = "recipient@james.org";
@@ -501,4 +645,27 @@ public class MailQueueRoutesTest {
assertThat(item.getMail().getRecipients()).doesNotContain(deletedRecipientMailAddress);
});
}
+
+ @Test
+ public void forcingDelayedMailsDeliveryShouldActuallyChangePropertyOnMails() throws Exception {
+ MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+ FakeMail mail = Mails.defaultMail().build();
+ queue.enQueue(mail, 10L, TimeUnit.MINUTES);
+ queue.enQueue(mail, 10L, TimeUnit.MINUTES);
+ queue.enQueue(mail);
+
+ with()
+ .queryParam("delayed", "true")
+ .body("{\"delayed\": \"false\"}")
+ .then()
+ .patch(FIRST_QUEUE + "/mails");
+
+ assertThat(queue.browse())
+ .extracting(ManageableMailQueue.MailQueueItemView::getNextDelivery)
+ .hasSize(3)
+ .allSatisfy((delivery) -> {
+ assertThat(delivery).isNotEmpty();
+ assertThat(delivery.get()).isBefore(ZonedDateTime.now());
+ });
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/cae93f35/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
index 9049735..a5b4233 100644
--- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
+++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
@@ -19,7 +19,6 @@
package org.apache.james.queue.memory;
-import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.Iterator;
import java.util.Optional;
@@ -257,7 +256,7 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu
@Override
public long getDelay(TimeUnit unit) {
- return LocalDateTime.now().until(delivery, Temporals.chronoUnit(unit));
+ return ZonedDateTime.now().until(delivery, Temporals.chronoUnit(unit));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org