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 2020/04/01 03:32:57 UTC
[james-project] 06/14: [Refactor] Replace
Mono::switchIfEmpty(Mono.just(x)) by Mono::defaultIfEmpty(x)
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 3f96a3151729c7f10bd77d2e92173ddd884e186d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Mar 30 10:46:48 2020 +0700
[Refactor] Replace Mono::switchIfEmpty(Mono.just(x)) by Mono::defaultIfEmpty(x)
---
.../backends/cassandra/versions/CassandraSchemaVersionDAO.java | 2 +-
.../org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java | 2 +-
.../apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java | 4 ++--
.../apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java | 2 +-
.../cassandra/mail/task/SolveMailboxInconsistenciesService.java | 6 +++---
.../org/apache/james/sieve/cassandra/CassandraSieveRepository.java | 4 ++--
.../james/jmap/draft/model/message/view/MessageFullViewFactory.java | 2 +-
.../rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java
index 963099e..908a40b 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java
@@ -72,7 +72,7 @@ public class CassandraSchemaVersionDAO {
.reduce(Math::max)
.map(SchemaVersion::new)
.map(Optional::of)
- .switchIfEmpty(Mono.just(Optional.empty()));
+ .defaultIfEmpty(Optional.empty());
}
public Mono<Void> updateVersion(SchemaVersion newVersion) {
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
index 4a2734b..a14cd2b 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java
@@ -103,7 +103,7 @@ public class CassandraACLMapper {
public Mono<MailboxACL> getACL(CassandraId cassandraId) {
return getStoredACLRow(cassandraId)
.map(row -> getAcl(cassandraId, row))
- .switchIfEmpty(Mono.just(MailboxACL.EMPTY));
+ .defaultIfEmpty(MailboxACL.EMPTY);
}
private MailboxACL getAcl(CassandraId cassandraId, Row row) {
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
index 02db4a7..c8898a4 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
@@ -110,7 +110,7 @@ public class CassandraMailboxCounterDAO {
CassandraId mailboxId = (CassandraId) counters.getMailboxId();
return retrieveMailboxCounters(mailboxId)
- .switchIfEmpty(Mono.just(emptyCounters(mailboxId)))
+ .defaultIfEmpty(emptyCounters(mailboxId))
.flatMap(storedCounters -> {
if (storedCounters.equals(counters)) {
return Mono.empty();
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
index 0f0244f..7a3f7ea 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
@@ -168,7 +168,7 @@ public class CassandraMailboxMapper implements MailboxMapper {
.filter(isCreated -> isCreated)
.flatMap(mailboxHasCreated -> persistMailboxEntity(cassandraMailbox)
.thenReturn(true))
- .switchIfEmpty(Mono.just(false));
+ .defaultIfEmpty(false);
}
@Override
@@ -196,7 +196,7 @@ public class CassandraMailboxMapper implements MailboxMapper {
.flatMap(mailboxHasCreated -> deletePreviousMailboxPathReference(mailbox.generateAssociatedPath())
.then(persistMailboxEntity(cassandraMailbox))
.thenReturn(true))
- .switchIfEmpty(Mono.just(false)))
+ .defaultIfEmpty(false))
.switchIfEmpty(Mono.error(() -> new MailboxNotFoundException(cassandraId)));
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
index 11b6045..a6275e3 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
@@ -210,7 +210,7 @@ public class CassandraMessageIdDAO {
return row
.map(this::fromRowToComposedMessageIdWithFlags)
.map(Optional::of)
- .switchIfEmpty(Mono.just(Optional.empty()));
+ .defaultIfEmpty(Optional.empty());
}
private Mono<Row> selectOneRow(CassandraId mailboxId, MessageUid uid) {
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesService.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesService.java
index b740233..29c1792 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesService.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesService.java
@@ -128,7 +128,7 @@ public class SolveMailboxInconsistenciesService {
context.addFixedInconsistency(pathRegistration.getCassandraId());
})
.map(any -> Result.COMPLETED)
- .switchIfEmpty(Mono.just(Result.COMPLETED))
+ .defaultIfEmpty(Result.COMPLETED)
.onErrorResume(e -> {
LOGGER.error("Failed fixing inconsistency for orphan mailboxPath {} - {}",
pathRegistration.getCassandraId().serialize(),
@@ -410,7 +410,7 @@ public class SolveMailboxInconsistenciesService {
// Path entry references another mailbox.
return new ConflictingEntryInconsistency(mailbox, pathRegistration);
})
- .switchIfEmpty(Mono.just(new OrphanMailboxDAOEntry(mailbox)));
+ .defaultIfEmpty(new OrphanMailboxDAOEntry(mailbox));
}
private Mono<Inconsistency> detectInconsistency(CassandraIdAndPath pathRegistration) {
@@ -422,6 +422,6 @@ public class SolveMailboxInconsistenciesService {
// Mailbox references another path
return new ConflictingEntryInconsistency(mailbox, pathRegistration);
})
- .switchIfEmpty(Mono.just(new OrphanMailboxPathDAOEntry(pathRegistration)));
+ .defaultIfEmpty(new OrphanMailboxPathDAOEntry(pathRegistration));
}
}
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java
index cbb51b9..ec134e7 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java
@@ -101,7 +101,7 @@ public class CassandraSieveRepository implements SieveRepository {
private Mono<Long> spaceThatWillBeUsedByNewScript(Username username, ScriptName name, long scriptSize) {
return cassandraSieveDAO.getScript(username, name)
.map(Script::getSize)
- .switchIfEmpty(Mono.just(0L))
+ .defaultIfEmpty(0L)
.map(sizeOfStoredScript -> scriptSize - sizeOfStoredScript);
}
@@ -199,7 +199,7 @@ public class CassandraSieveRepository implements SieveRepository {
@Override
public void deleteScript(Username username, ScriptName name) throws ScriptNotFoundException, IsActiveException {
ensureIsNotActive(username, name);
- if (!cassandraSieveDAO.deleteScriptInCassandra(username, name).switchIfEmpty(Mono.just(false)).block()) {
+ if (!cassandraSieveDAO.deleteScriptInCassandra(username, name).defaultIfEmpty(false).block()) {
throw new ScriptNotFoundException();
}
}
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java
index 364d1be..0f974bc 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java
@@ -155,7 +155,7 @@ public class MessageFullViewFactory implements MessageViewFactory<MessageFullVie
private Mono<MessageFastViewPrecomputedProperties> computeProjection(MessageContent messageContent, Supplier<Boolean> hasAttachments) {
return Mono.justOrEmpty(mainTextContent(messageContent))
.map(Preview::compute)
- .switchIfEmpty(Mono.just(Preview.EMPTY))
+ .defaultIfEmpty(Preview.EMPTY)
.map(extractedPreview -> MessageFastViewPrecomputedProperties.builder()
.preview(extractedPreview)
.hasAttachment(hasAttachments.get())
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java
index a43c6c6..71b1e99 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java
@@ -66,7 +66,7 @@ public class CassandraMailQueueViewTestFactory {
BrowseStartDAO browseStartDao = new BrowseStartDAO(session);
return browseStartDao.findBrowseStart(mailQueueName)
.map(Optional::ofNullable)
- .switchIfEmpty(Mono.just(Optional.empty()))
+ .defaultIfEmpty(Optional.empty())
.block()
.isPresent();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org