JAMES-2529 Remove .orElse(null)
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b62bc554 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b62bc554 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b62bc554 Branch: refs/heads/master Commit: b62bc554ddb3c31556b0a8ca33124274c878ca18 Parents: e06fb4a Author: Benoit Tellier <[email protected]> Authored: Thu Aug 30 10:21:37 2018 +0700 Committer: Antoine Duprat <[email protected]> Committed: Thu Aug 30 15:07:02 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/james/jmap/mailet/filter/MailMatcher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b62bc554/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java index aea0b75..410146e 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java @@ -133,9 +133,9 @@ public interface MailMatcher { ContentMatcher ADDRESS_EXACTLY_EQUALS_MATCHER = (contents, valueToMatch) -> contents .map(ContentMatcher::asAddressHeader) .anyMatch(addressHeader -> - StringUtils.equalsIgnoreCase(addressHeader.getFullAddress(), valueToMatch) - || StringUtils.equalsIgnoreCase(addressHeader.getAddress().orElse(null), valueToMatch) - || StringUtils.equalsIgnoreCase(addressHeader.getPersonal().orElse(null), valueToMatch)); + valueToMatch.equalsIgnoreCase(addressHeader.getFullAddress()) + || addressHeader.getAddress().map(valueToMatch::equalsIgnoreCase).orElse(false) + || addressHeader.getPersonal().map(valueToMatch::equalsIgnoreCase).orElse(false)); ContentMatcher ADDRESS_NOT_EXACTLY_EQUALS_MATCHER = negate(ADDRESS_EXACTLY_EQUALS_MATCHER); Map<Rule.Condition.Comparator, ContentMatcher> HEADER_ADDRESS_MATCHER_REGISTRY = ImmutableMap.<Rule.Condition.Comparator, ContentMatcher>builder() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
