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 ad...@apache.org on 2018/08/30 13:15:49 UTC
[07/26] james-project git commit: JAMES-2529 Re-indent MailMatcher
with 4 indent levels
JAMES-2529 Re-indent MailMatcher with 4 indent levels
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/247a8516
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/247a8516
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/247a8516
Branch: refs/heads/master
Commit: 247a8516fbec4b129df41a075c97ee9217fbef8e
Parents: 924d23d
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Aug 30 09:30:15 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Thu Aug 30 15:07:01 2018 +0200
----------------------------------------------------------------------
.../james/jmap/mailet/filter/MailMatcher.java | 77 ++++++++++----------
1 file changed, 38 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/247a8516/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 185c08b..d9efaf7 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
@@ -47,7 +47,9 @@ import com.google.common.collect.ImmutableMap;
public interface MailMatcher {
- interface HeaderExtractor extends ThrowingFunction<Mail, Stream<String>> {}
+ interface HeaderExtractor extends ThrowingFunction<Mail, Stream<String>> {
+
+ }
class HeaderMatcher implements MailMatcher {
@@ -58,7 +60,7 @@ public interface MailMatcher {
private final HeaderExtractor headerExtractor;
private HeaderMatcher(ContentMatcher contentMatcher, String ruleValue,
- HeaderExtractor headerExtractor) {
+ HeaderExtractor headerExtractor) {
Preconditions.checkNotNull(contentMatcher);
Preconditions.checkNotNull(headerExtractor);
@@ -122,45 +124,43 @@ public interface MailMatcher {
ContentMatcher STRING_EXACTLY_EQUALS_MATCHER = (contents, valueToMatch) -> contents.anyMatch(content -> StringUtils.equals(content, valueToMatch));
ContentMatcher STRING_NOT_EXACTLY_EQUALS_MATCHER = negate(STRING_EXACTLY_EQUALS_MATCHER);
- Map<Rule.Condition.Comparator, ContentMatcher> CONTENT_STRING_MATCHER_REGISTRY = ImmutableMap.<Rule.Condition.Comparator, ContentMatcher>builder()
- .put(Condition.Comparator.CONTAINS, STRING_CONTAINS_MATCHER)
- .put(Condition.Comparator.NOT_CONTAINS, STRING_NOT_CONTAINS_MATCHER)
- .put(Condition.Comparator.EXACTLY_EQUALS, STRING_EXACTLY_EQUALS_MATCHER)
- .put(Condition.Comparator.NOT_EXACTLY_EQUALS, STRING_NOT_EXACTLY_EQUALS_MATCHER)
- .build();
-
ContentMatcher ADDRESS_CONTAINS_MATCHER = (contents, valueToMatch) -> contents
- .map(ContentMatcher::asAddressHeader)
- .anyMatch(addressHeader -> StringUtils.containsIgnoreCase(addressHeader.getFullAddress(), valueToMatch));
-
+ .map(ContentMatcher::asAddressHeader)
+ .anyMatch(addressHeader -> StringUtils.containsIgnoreCase(addressHeader.getFullAddress(), valueToMatch));
ContentMatcher ADDRESS_NOT_CONTAINS_MATCHER = negate(ADDRESS_CONTAINS_MATCHER);
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));
-
+ .map(ContentMatcher::asAddressHeader)
+ .anyMatch(addressHeader ->
+ StringUtils.equalsIgnoreCase(addressHeader.getFullAddress(), valueToMatch)
+ || StringUtils.equalsIgnoreCase(addressHeader.getAddress().orElse(null), valueToMatch)
+ || StringUtils.equalsIgnoreCase(addressHeader.getPersonal().orElse(null), valueToMatch));
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()
- .put(Condition.Comparator.CONTAINS, ADDRESS_CONTAINS_MATCHER)
- .put(Condition.Comparator.NOT_CONTAINS, ADDRESS_NOT_CONTAINS_MATCHER)
- .put(Condition.Comparator.EXACTLY_EQUALS, ADDRESS_EXACTLY_EQUALS_MATCHER)
- .put(Condition.Comparator.NOT_EXACTLY_EQUALS, ADDRESS_NOT_EXACTLY_EQUALS_MATCHER)
- .build();
+ .put(Condition.Comparator.CONTAINS, ADDRESS_CONTAINS_MATCHER)
+ .put(Condition.Comparator.NOT_CONTAINS, ADDRESS_NOT_CONTAINS_MATCHER)
+ .put(Condition.Comparator.EXACTLY_EQUALS, ADDRESS_EXACTLY_EQUALS_MATCHER)
+ .put(Condition.Comparator.NOT_EXACTLY_EQUALS, ADDRESS_NOT_EXACTLY_EQUALS_MATCHER)
+ .build();
+
+ Map<Rule.Condition.Comparator, ContentMatcher> CONTENT_STRING_MATCHER_REGISTRY = ImmutableMap.<Rule.Condition.Comparator, ContentMatcher>builder()
+ .put(Condition.Comparator.CONTAINS, STRING_CONTAINS_MATCHER)
+ .put(Condition.Comparator.NOT_CONTAINS, STRING_NOT_CONTAINS_MATCHER)
+ .put(Condition.Comparator.EXACTLY_EQUALS, STRING_EXACTLY_EQUALS_MATCHER)
+ .put(Condition.Comparator.NOT_EXACTLY_EQUALS, STRING_NOT_EXACTLY_EQUALS_MATCHER)
+ .build();
Map<Rule.Condition.Field, Map<Rule.Condition.Comparator, ContentMatcher>> CONTENT_MATCHER_REGISTRY = ImmutableMap.<Rule.Condition.Field, Map<Rule.Condition.Comparator, ContentMatcher>>builder()
- .put(Condition.Field.SUBJECT, CONTENT_STRING_MATCHER_REGISTRY)
- .put(Condition.Field.TO, HEADER_ADDRESS_MATCHER_REGISTRY)
- .put(Condition.Field.CC, HEADER_ADDRESS_MATCHER_REGISTRY)
- .put(Condition.Field.RECIPIENT, HEADER_ADDRESS_MATCHER_REGISTRY)
- .put(Condition.Field.FROM, HEADER_ADDRESS_MATCHER_REGISTRY)
- .build();
+ .put(Condition.Field.SUBJECT, CONTENT_STRING_MATCHER_REGISTRY)
+ .put(Condition.Field.TO, HEADER_ADDRESS_MATCHER_REGISTRY)
+ .put(Condition.Field.CC, HEADER_ADDRESS_MATCHER_REGISTRY)
+ .put(Condition.Field.RECIPIENT, HEADER_ADDRESS_MATCHER_REGISTRY)
+ .put(Condition.Field.FROM, HEADER_ADDRESS_MATCHER_REGISTRY)
+ .build();
static ContentMatcher negate(ContentMatcher contentMatcher) {
return (Stream<String> contents, String valueToMatch) ->
- !contentMatcher.match(contents, valueToMatch);
+ !contentMatcher.match(contents, valueToMatch);
}
static Optional<ContentMatcher> asContentMatcher(Condition.Field field, Condition.Comparator comparator) {
@@ -179,20 +179,19 @@ public interface MailMatcher {
HeaderExtractor SUBJECT_EXTRACTOR = mail ->
OptionalUtils.ofNullableToStream(mail.getMessage().getSubject());
HeaderExtractor RECIPIENT_EXTRACTOR = mail -> addressExtractor(
- mail.getMessage().getRecipients(Message.RecipientType.TO),
- mail.getMessage().getRecipients(Message.RecipientType.CC));
-
+ mail.getMessage().getRecipients(Message.RecipientType.TO),
+ mail.getMessage().getRecipients(Message.RecipientType.CC));
HeaderExtractor FROM_EXTRACTOR = mail -> addressExtractor(mail.getMessage().getFrom());
HeaderExtractor CC_EXTRACTOR = recipientExtractor(Message.RecipientType.CC);
HeaderExtractor TO_EXTRACTOR = recipientExtractor(Message.RecipientType.TO);
Map<Field, HeaderExtractor> HEADER_EXTRACTOR_REGISTRY = ImmutableMap.<Field, HeaderExtractor>builder()
- .put(Field.SUBJECT, SUBJECT_EXTRACTOR)
- .put(Field.RECIPIENT, RECIPIENT_EXTRACTOR)
- .put(Field.FROM, FROM_EXTRACTOR)
- .put(Field.CC, CC_EXTRACTOR)
- .put(Field.TO, TO_EXTRACTOR)
- .build();
+ .put(Field.SUBJECT, SUBJECT_EXTRACTOR)
+ .put(Field.RECIPIENT, RECIPIENT_EXTRACTOR)
+ .put(Field.FROM, FROM_EXTRACTOR)
+ .put(Field.CC, CC_EXTRACTOR)
+ .put(Field.TO, TO_EXTRACTOR)
+ .build();
static MailMatcher from(Rule rule) {
Condition ruleCondition = rule.getCondition();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org