JAMES-2162 Rename confusing optional method
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/23dd9053 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/23dd9053 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/23dd9053 Branch: refs/heads/master Commit: 23dd9053ab65bbde40e9383ccd9ebe1a580576f4 Parents: 69d783e Author: benwa <[email protected]> Authored: Mon Oct 2 15:58:23 2017 +0700 Committer: benwa <[email protected]> Committed: Tue Oct 3 07:52:17 2017 +0700 ---------------------------------------------------------------------- .../james/mailbox/cassandra/mail/CassandraBlobsDAO.java | 2 +- .../mailbox/cassandra/mail/CassandraMailboxMapper.java | 2 +- .../mailbox/cassandra/mail/CassandraMessageMapper.java | 3 ++- .../src/main/java/org/apache/james/util/OptionalUtils.java | 2 +- .../test/java/org/apache/james/util/OptionalUtilsTest.java | 9 +++++---- 5 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/23dd9053/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java index 031a429..b96e5c4 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java @@ -168,7 +168,7 @@ public class CassandraBlobsDAO { private byte[] concatenateDataParts(Stream<BlobPart> blobParts) { ImmutableList<byte[]> parts = blobParts - .map(blobPart -> OptionalUtils.ifEmpty( + .map(blobPart -> OptionalUtils.peekOnEmpty( blobPart.row, () -> LOGGER.warn("Missing blob part for blobId {} and position {}", blobPart.blobId, blobPart.position))) .flatMap(OptionalUtils::toStream) http://git-wip-us.apache.org/repos/asf/james-project/blob/23dd9053/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java ---------------------------------------------------------------------- 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 1b6d2f8..d9d5c10 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 @@ -141,7 +141,7 @@ public class CassandraMailboxMapper implements MailboxMapper { private CompletableFuture<Optional<SimpleMailbox>> retrieveMailbox(CassandraMailboxPathDAO.CassandraIdAndPath idAndPath) { return retrieveMailbox(idAndPath.getCassandraId()) - .thenApply(optional -> OptionalUtils.ifEmpty(optional, + .thenApply(optional -> OptionalUtils.peekOnEmpty(optional, () -> LOGGER.warn("Could not retrieve mailbox {} with path {} in mailbox table.", idAndPath.getCassandraId(), idAndPath.getMailboxPath()))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/23dd9053/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java index 957595a..cf38640 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; + import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -225,7 +226,7 @@ public class CassandraMessageMapper implements MessageMapper { private CompletableFuture<Optional<ComposedMessageIdWithMetaData>> retrieveComposedId(CassandraId mailboxId, MessageUid uid) { return messageIdDAO.retrieve(mailboxId, uid) - .thenApply(optional -> OptionalUtils.ifEmpty(optional, + .thenApply(optional -> OptionalUtils.peekOnEmpty(optional, () -> LOGGER.warn("Could not retrieve message {} {}", mailboxId, uid))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/23dd9053/server/container/util-java8/src/main/java/org/apache/james/util/OptionalUtils.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/OptionalUtils.java b/server/container/util-java8/src/main/java/org/apache/james/util/OptionalUtils.java index 709981b..66628ba 100644 --- a/server/container/util-java8/src/main/java/org/apache/james/util/OptionalUtils.java +++ b/server/container/util-java8/src/main/java/org/apache/james/util/OptionalUtils.java @@ -28,7 +28,7 @@ public class OptionalUtils { void perform(); } - public static <T> Optional<T> ifEmpty(Optional<T> optional, Operation operation) { + public static <T> Optional<T> peekOnEmpty(Optional<T> optional, Operation operation) { if (!optional.isPresent()) { operation.perform(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/23dd9053/server/container/util-java8/src/test/java/org/apache/james/util/OptionalUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/OptionalUtilsTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/OptionalUtilsTest.java index 79b993c..a270469 100644 --- a/server/container/util-java8/src/test/java/org/apache/james/util/OptionalUtilsTest.java +++ b/server/container/util-java8/src/test/java/org/apache/james/util/OptionalUtilsTest.java @@ -19,6 +19,7 @@ package org.apache.james.util; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; @@ -35,7 +36,7 @@ public class OptionalUtilsTest { @Test public void ifEmptyShouldPreserveValueOfEmptyOptionals() { - Optional<Object> expected = OptionalUtils.ifEmpty(Optional.empty(), () -> { }); + Optional<Object> expected = OptionalUtils.peekOnEmpty(Optional.empty(), () -> { }); assertThat(expected).isEmpty(); } @@ -43,7 +44,7 @@ public class OptionalUtilsTest { @Test public void ifEmptyShouldPreserveValueOfPresentOptionals() { String value = "value"; - Optional<String> expected = OptionalUtils.ifEmpty(Optional.of(value), () -> { }); + Optional<String> expected = OptionalUtils.peekOnEmpty(Optional.of(value), () -> { }); assertThat(expected).contains(value); } @@ -52,7 +53,7 @@ public class OptionalUtilsTest { public void ifEmptyShouldPerformOperationIfEmpty() { AtomicInteger operationCounter = new AtomicInteger(0); - OptionalUtils.ifEmpty(Optional.empty(), operationCounter::incrementAndGet); + OptionalUtils.peekOnEmpty(Optional.empty(), operationCounter::incrementAndGet); assertThat(operationCounter.get()).isEqualTo(1); } @@ -61,7 +62,7 @@ public class OptionalUtilsTest { public void ifEmptyShouldNotPerformOperationIfPresent() { AtomicInteger operationCounter = new AtomicInteger(0); - OptionalUtils.ifEmpty(Optional.of("value"), operationCounter::incrementAndGet); + OptionalUtils.peekOnEmpty(Optional.of("value"), operationCounter::incrementAndGet); assertThat(operationCounter.get()).isEqualTo(0); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
