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 2019/05/08 07:11:36 UTC
[james-project] branch master updated: Revert "JAMES-2733 RabbitMQ
should not dequeue deleted elements"
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
The following commit(s) were added to refs/heads/master by this push:
new 355a7b9 Revert "JAMES-2733 RabbitMQ should not dequeue deleted elements"
355a7b9 is described below
commit 355a7b9beb011a69c44e29d3ab9d6dc46dd93fa6
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Wed May 8 10:14:19 2019 +0700
Revert "JAMES-2733 RabbitMQ should not dequeue deleted elements"
This reverts commit fa3b6ecd96cd4d0ae6af15ad56e1e5ad2f1c315c.
---
.../java/org/apache/james/queue/rabbitmq/Dequeuer.java | 17 ++---------------
.../james/queue/rabbitmq/RabbitMQMailQueueTest.java | 8 ++++++++
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java
index a2e7a7e..d053096 100644
--- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java
+++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java
@@ -34,7 +34,6 @@ import org.apache.mailet.Mail;
import com.github.fge.lambdas.consumers.ThrowingConsumer;
import com.rabbitmq.client.Delivery;
-
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.rabbitmq.AcknowledgableDelivery;
@@ -81,20 +80,8 @@ class Dequeuer {
.filter(getResponse -> getResponse.getBody() != null);
}
- Flux<? extends MailQueue.MailQueueItem> deQueue() {
- return flux.flatMap(this::loadItem)
- .flatMap(this::filterIfDeleted);
- }
-
- private Mono<RabbitMQMailQueueItem> filterIfDeleted(RabbitMQMailQueueItem item) {
- return mailQueueView.isPresent(item.getMail())
- .flatMap(isPresent -> {
- if (isPresent) {
- return Mono.just(item);
- }
- item.done(true);
- return Mono.empty();
- });
+ Flux<MailQueue.MailQueueItem> deQueue() {
+ return flux.flatMap(this::loadItem);
}
private Mono<RabbitMQMailQueueItem> loadItem(AcknowledgableDelivery response) {
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
index c636b9d..5f44b02 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
@@ -233,6 +233,14 @@ public class RabbitMQMailQueueTest implements ManageableMailQueueContract, MailQ
}
+ @Disabled("JAMES-2733 Deleted elements are still dequeued")
+ @Test
+ @Override
+ public void deletedElementsShouldNotBeDequeued() {
+
+ }
+
+
private void enqueueSomeMails(Function<Integer, String> namePattern, int emailCount) {
IntStream.rangeClosed(1, emailCount)
.forEach(Throwing.intConsumer(i -> enQueue(defaultMail()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org