JAMES-2122 ElasticSearchSearcher should rely on OptionalConverter
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8061849b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8061849b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8061849b Branch: refs/heads/master Commit: 8061849b564de1919819744da36bfef3dc588097 Parents: bc50d81 Author: benwa <btell...@linagora.com> Authored: Thu Aug 17 10:27:31 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Thu Aug 17 13:13:33 2017 +0200 ---------------------------------------------------------------------- .../mailbox/elasticsearch/search/ElasticSearchSearcher.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/8061849b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java index 1599559..726980c 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java @@ -38,6 +38,7 @@ import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MultimailboxesSearchQuery; import org.apache.james.mailbox.store.search.MessageSearchIndex; +import org.apache.james.util.OptionalConverter; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; @@ -112,7 +113,8 @@ public class ElasticSearchSearcher { if (mailboxId != null && uid != null) { Number uidAsNumber = uid.getValue(); return Optional.of( - new MessageSearchIndex.SearchResult(toGuava(id.map(field -> messageIdFactory.fromString(field.getValue()))), + new MessageSearchIndex.SearchResult( + OptionalConverter.toGuava(id.map(field -> messageIdFactory.fromString(field.getValue()))), mailboxIdFactory.fromString(mailboxId.getValue()), MessageUid.of(uidAsNumber.longValue()))); } else { @@ -129,8 +131,4 @@ public class ElasticSearchSearcher { } } - private <T> com.google.common.base.Optional<T> toGuava(Optional<T> optional) { - return com.google.common.base.Optional.fromNullable(optional.orElse(null)); - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org