Repository: james-project Updated Branches: refs/heads/master 917c9da07 -> 635607f23
JAMES-1800 Filter.header should be optional too Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f117ec67 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f117ec67 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f117ec67 Branch: refs/heads/master Commit: f117ec67bef50aa4a40ad6e58bfc3fc41e2b8755 Parents: 917c9da Author: Raphael Ouazana <[email protected]> Authored: Wed Jul 13 15:02:33 2016 +0200 Committer: Raphael Ouazana <[email protected]> Committed: Wed Jul 13 15:02:33 2016 +0200 ---------------------------------------------------------------------- .../org/apache/james/jmap/model/FilterCondition.java | 12 ++++++------ .../apache/james/jmap/model/FilterConditionTest.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f117ec67/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/FilterCondition.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/FilterCondition.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/FilterCondition.java index 8802da5..430d88e 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/FilterCondition.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/FilterCondition.java @@ -58,12 +58,12 @@ public class FilterCondition implements Filter { private String bcc; private String subject; private String body; - private final ImmutableList.Builder<String> header; + private Optional<List<String>> header; private Builder() { inMailboxes = Optional.empty(); notInMailboxes = Optional.empty(); - header = ImmutableList.builder(); + header = Optional.empty(); } public Builder inMailboxes(Optional<List<String>> inMailboxes) { @@ -147,7 +147,7 @@ public class FilterCondition implements Filter { public FilterCondition build() { return new FilterCondition(inMailboxes, notInMailboxes, Optional.ofNullable(before), Optional.ofNullable(after), Optional.ofNullable(minSize), Optional.ofNullable(maxSize), Optional.ofNullable(isFlagged), Optional.ofNullable(isUnread), Optional.ofNullable(isAnswered), Optional.ofNullable(isDraft), Optional.ofNullable(hasAttachment), - Optional.ofNullable(text), Optional.ofNullable(from), Optional.ofNullable(to), Optional.ofNullable(cc), Optional.ofNullable(bcc), Optional.ofNullable(subject), Optional.ofNullable(body), header.build()); + Optional.ofNullable(text), Optional.ofNullable(from), Optional.ofNullable(to), Optional.ofNullable(cc), Optional.ofNullable(bcc), Optional.ofNullable(subject), Optional.ofNullable(body), header); } } @@ -169,11 +169,11 @@ public class FilterCondition implements Filter { private final Optional<String> bcc; private final Optional<String> subject; private final Optional<String> body; - private final List<String> header; + private final Optional<List<String>> header; @VisibleForTesting FilterCondition(Optional<List<String>> inMailboxes, Optional<List<String>> notInMailboxes, Optional<Date> before, Optional<Date> after, Optional<Integer> minSize, Optional<Integer> maxSize, Optional<Boolean> isFlagged, Optional<Boolean> isUnread, Optional<Boolean> isAnswered, Optional<Boolean> isDraft, Optional<Boolean> hasAttachment, - Optional<String> text, Optional<String> from, Optional<String> to, Optional<String> cc, Optional<String> bcc, Optional<String> subject, Optional<String> body, List<String> header) { + Optional<String> text, Optional<String> from, Optional<String> to, Optional<String> cc, Optional<String> bcc, Optional<String> subject, Optional<String> body, Optional<List<String>> header) { this.inMailboxes = inMailboxes; this.notInMailboxes = notInMailboxes; @@ -268,7 +268,7 @@ public class FilterCondition implements Filter { return body; } - public List<String> getHeader() { + public Optional<List<String>> getHeader() { return header; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/f117ec67/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterConditionTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterConditionTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterConditionTest.java index e034275..0ae7372 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterConditionTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterConditionTest.java @@ -141,7 +141,7 @@ public class FilterConditionTest { public void buildShouldWork() { FilterCondition expectedFilterCondition = new FilterCondition(Optional.of(ImmutableList.of("1")), Optional.of(ImmutableList.of("2")), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), - Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), ImmutableList.of()); + Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()); FilterCondition filterCondition = FilterCondition.builder() .inMailboxes(Optional.of(ImmutableList.of("1"))) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
