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
commit 30d97458200dfda7cba52d42ca63ab9401e1de82 Author: Benoit Tellier <[email protected]> AuthorDate: Sun Apr 12 12:55:09 2020 +0700 JAMES-3148 FunctionalUtils negate helper --- .../util/src/main/java/org/apache/james/util/FunctionalUtils.java | 5 +++++ .../java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java | 4 +++- .../james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java | 4 +++- .../apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/container/util/src/main/java/org/apache/james/util/FunctionalUtils.java b/server/container/util/src/main/java/org/apache/james/util/FunctionalUtils.java index 30c0b63..5a06060 100644 --- a/server/container/util/src/main/java/org/apache/james/util/FunctionalUtils.java +++ b/server/container/util/src/main/java/org/apache/james/util/FunctionalUtils.java @@ -19,6 +19,7 @@ package org.apache.james.util; import java.util.function.Consumer; +import java.util.function.Function; import java.util.function.Predicate; import java.util.function.UnaryOperator; @@ -37,6 +38,10 @@ public class FunctionalUtils { }; } + public static Function<Boolean, Boolean> negate() { + return b -> !b; + } + public static Predicate<Boolean> identityPredicate() { return b -> b; } diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java index a93c5ad..3252e95 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.jmap.http; +import static org.apache.james.util.FunctionalUtils.negate; + import java.util.Optional; import java.util.function.Function; @@ -80,7 +82,7 @@ class DefaultMailboxesProvisioner { private Mono<Boolean> mailboxDoesntExist(MailboxPath mailboxPath, MailboxSession session) { try { return Mono.from(mailboxManager.mailboxExists(mailboxPath, session)) - .map(x -> !x); + .map(negate()); } catch (MailboxException e) { throw new RuntimeException(e); } diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java index 0c5af4c..aede929 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java @@ -19,6 +19,8 @@ package org.apache.james.queue.rabbitmq.view.cassandra; +import static org.apache.james.util.FunctionalUtils.negate; + import javax.inject.Inject; import org.apache.james.queue.api.ManageableMailQueue; @@ -125,6 +127,6 @@ public class CassandraMailQueueView implements MailQueueView { @Override public Mono<Boolean> isPresent(EnqueueId id) { return cassandraMailQueueMailDelete.isDeleted(id, mailQueueName) - .map(bool -> !bool); + .map(negate()); } } diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java index a0551e9..1594d87 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java @@ -26,6 +26,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; import static org.apache.james.queue.rabbitmq.view.cassandra.CassandraMailQueueViewModule.DeletedMailTable.ENQUEUE_ID; import static org.apache.james.queue.rabbitmq.view.cassandra.CassandraMailQueueViewModule.DeletedMailTable.QUEUE_NAME; import static org.apache.james.queue.rabbitmq.view.cassandra.CassandraMailQueueViewModule.DeletedMailTable.TABLE_NAME; +import static org.apache.james.util.FunctionalUtils.negate; import javax.inject.Inject; @@ -79,6 +80,6 @@ public class DeletedMailsDAO { Mono<Boolean> isStillEnqueued(MailQueueName mailQueueName, EnqueueId enqueueId) { return isDeleted(mailQueueName, enqueueId) - .map(b -> !b); + .map(negate()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
