Repository: james-project Updated Branches: refs/heads/master 38acce230 -> 9d3bbbd31
JAMES-2257 Remove unused OldKeywords parameter from Keywords This parameter was never used... Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/14e53dc8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/14e53dc8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/14e53dc8 Branch: refs/heads/master Commit: 14e53dc8c444ebd15014ffdb5f0c8cae4f71c1ef Parents: 0e6082e Author: benwa <btell...@linagora.com> Authored: Tue Dec 12 08:51:20 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Fri Dec 15 14:00:36 2017 +0700 ---------------------------------------------------------------------- .../org/apache/james/jmap/model/Keywords.java | 28 +++++++------------- .../james/jmap/utils/KeywordsCombiner.java | 4 +-- .../james/jmap/json/ParsingWritingObjects.java | 2 +- .../apache/james/jmap/model/KeywordsTest.java | 23 ++++++++-------- 4 files changed, 23 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/14e53dc8/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java index 5df79fa..7a5fc79 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableSet; public class Keywords { - public static final Keywords DEFAULT_VALUE = factory().fromSet(ImmutableSet.of(), Optional.empty()); + public static final Keywords DEFAULT_VALUE = factory().fromSet(ImmutableSet.of()); private static final Logger LOGGER = LoggerFactory.getLogger(Keywords.class); public interface KeywordsValidator { @@ -78,27 +78,24 @@ public class Keywords { return this; } - public Keywords fromSet(Set<Keyword> setKeywords, Optional<OldKeyword> oldKeyword) { + public Keywords fromSet(Set<Keyword> setKeywords) { validator.orElse(keywords -> {}) .validate(setKeywords); return new Keywords(setKeywords.stream() .filter(filter.orElse(keyword -> true)) - .collect(Guavate.toImmutableSet()), - oldKeyword); + .collect(Guavate.toImmutableSet())); } public Keywords from(Keyword... keywords) { return fromSet(Arrays.stream(keywords) - .collect(Guavate.toImmutableSet()), - Optional.empty()); + .collect(Guavate.toImmutableSet())); } public Keywords fromList(List<String> keywords) { return fromSet(keywords.stream() .map(Keyword::new) - .collect(Guavate.toImmutableSet()), - Optional.empty()); + .collect(Guavate.toImmutableSet())); } @VisibleForTesting @@ -111,7 +108,7 @@ public class Keywords { .map(Keyword::new) .collect(Guavate.toImmutableSet()); - return fromSet(setKeywords, Optional.empty()); + return fromSet(setKeywords); } public Keywords fromFlags(Flags flags) { @@ -120,8 +117,7 @@ public class Keywords { .flatMap(this::asKeyword), Stream.of(flags.getSystemFlags()) .map(Keyword::fromFlag)) - .collect(Guavate.toImmutableSet()), - Optional.empty()); + .collect(Guavate.toImmutableSet())); } private Stream<Keyword> asKeyword(String flagName) { @@ -139,11 +135,9 @@ public class Keywords { } private final ImmutableSet<Keyword> keywords; - private final Optional<OldKeyword> oldKeyword; - private Keywords(ImmutableSet<Keyword> keywords, Optional<OldKeyword> oldKeyword) { + private Keywords(ImmutableSet<Keyword> keywords) { this.keywords = keywords; - this.oldKeyword = oldKeyword; } public Flags asFlags() { @@ -181,22 +175,20 @@ public class Keywords { public final boolean equals(Object other) { if (other instanceof Keywords) { Keywords otherKeyword = (Keywords) other; - return Objects.equal(keywords, otherKeyword.keywords) - && Objects.equal(oldKeyword, otherKeyword.oldKeyword); + return Objects.equal(keywords, otherKeyword.keywords); } return false; } @Override public final int hashCode() { - return Objects.hashCode(keywords, oldKeyword); + return Objects.hashCode(keywords); } @Override public String toString() { return MoreObjects.toStringHelper(this) .add("keywords", keywords) - .add("oldKeyword", oldKeyword) .toString(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/14e53dc8/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/KeywordsCombiner.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/KeywordsCombiner.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/KeywordsCombiner.java index 2dba575..185be02 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/KeywordsCombiner.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/KeywordsCombiner.java @@ -20,7 +20,6 @@ package org.apache.james.jmap.utils; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.function.BinaryOperator; @@ -47,8 +46,7 @@ public class KeywordsCombiner implements BinaryOperator<Keywords> { return keywordsFactory .fromSet(Sets.union( union(keywords.getKeywords(), keywords2.getKeywords(), KEYWORD_NOT_TO_UNION), - intersect(keywords.getKeywords(), keywords2.getKeywords(), KEYWORD_TO_INTERSECT)), - Optional.empty()); + intersect(keywords.getKeywords(), keywords2.getKeywords(), KEYWORD_TO_INTERSECT))); } public Set<Keyword> union(Set<Keyword> set1, Set<Keyword> set2, List<Keyword> exceptKeywords) { http://git-wip-us.apache.org/repos/asf/james-project/blob/14e53dc8/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java index 427a6d9..b81731a 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java @@ -77,7 +77,7 @@ public interface ParsingWritingObjects { .threadId(Common.THREAD_ID) .mailboxIds(Common.MAILBOX_IDS) .inReplyToMessageId(Common.IN_REPLY_TO_MESSAGE_ID) - .keywords(Keywords.factory().fromSet(Common.KEYWORDS, Optional.empty())) + .keywords(Keywords.factory().fromSet(Common.KEYWORDS)) .headers(Common.HEADERS) .from(Common.FROM) .to(Common.TO) http://git-wip-us.apache.org/repos/asf/james-project/blob/14e53dc8/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java index 4c3ca03..29f33ba 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java @@ -22,7 +22,6 @@ package org.apache.james.jmap.model; import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; -import java.util.Optional; import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -77,7 +76,7 @@ public class KeywordsTest { @Test public void fromSetShouldReturnKeywordsFromSetOfKeywords() throws Exception { Keywords keywords = Keywords.factory() - .fromSet(ImmutableSet.of(Keyword.ANSWERED), Optional.empty()); + .fromSet(ImmutableSet.of(Keyword.ANSWERED)); assertThat(keywords.getKeywords()) .containsOnly(Keyword.ANSWERED); @@ -86,7 +85,7 @@ public class KeywordsTest { @Test public void asFlagsShouldBuildFlagsFromKeywords() throws Exception { assertThat(Keywords.factory() - .fromSet(ImmutableSet.of(Keyword.ANSWERED), Optional.empty()) + .fromSet(ImmutableSet.of(Keyword.ANSWERED)) .asFlags()) .isEqualTo(new Flags(Flags.Flag.ANSWERED)); } @@ -102,7 +101,7 @@ public class KeywordsTest { .build(); assertThat(Keywords.factory() - .fromSet(ImmutableSet.of(Keyword.ANSWERED), Optional.empty()) + .fromSet(ImmutableSet.of(Keyword.ANSWERED)) .asFlagsWithRecentAndDeletedFrom(originFlags)) .isEqualTo(expectedFlags); } @@ -118,7 +117,7 @@ public class KeywordsTest { .build(); assertThat(Keywords.factory() - .fromSet(ImmutableSet.of(Keyword.ANSWERED), Optional.empty()) + .fromSet(ImmutableSet.of(Keyword.ANSWERED)) .asFlagsWithRecentAndDeletedFrom(originFlags)) .isEqualTo(expectedFlags); } @@ -126,7 +125,7 @@ public class KeywordsTest { @Test public void asMapShouldReturnEmptyWhenEmptyMapOfStringAndBoolean() throws Exception { assertThat(Keywords.factory() - .fromSet(ImmutableSet.of(), Optional.empty()) + .fromSet(ImmutableSet.of()) .asMap()) .isEmpty();; } @@ -135,7 +134,7 @@ public class KeywordsTest { public void asMapShouldReturnMapOfStringAndBoolean() throws Exception { Map<String, Boolean> expectedMap = ImmutableMap.of("$Answered", Keyword.FLAG_VALUE); assertThat(Keywords.factory() - .fromSet(ImmutableSet.of(Keyword.ANSWERED), Optional.empty()) + .fromSet(ImmutableSet.of(Keyword.ANSWERED)) .asMap()) .isEqualTo(expectedMap); } @@ -146,14 +145,14 @@ public class KeywordsTest { Keywords.factory() .throwOnImapNonExposedKeywords() - .fromSet(ImmutableSet.of(Keyword.DRAFT, Keyword.DELETED), Optional.empty()); + .fromSet(ImmutableSet.of(Keyword.DRAFT, Keyword.DELETED)); } @Test public void throwWhenUnsupportedKeywordShouldNotThrowWhenHaveDraft() throws Exception { Keywords keywords = Keywords.factory() .throwOnImapNonExposedKeywords() - .fromSet(ImmutableSet.of(Keyword.ANSWERED, Keyword.DRAFT), Optional.empty()); + .fromSet(ImmutableSet.of(Keyword.ANSWERED, Keyword.DRAFT)); assertThat(keywords.getKeywords()) .containsOnly(Keyword.ANSWERED, Keyword.DRAFT); @@ -163,7 +162,7 @@ public class KeywordsTest { public void filterUnsupportedShouldFilter() throws Exception { Keywords keywords = Keywords.factory() .filterImapNonExposedKeywords() - .fromSet(ImmutableSet.of(Keyword.ANSWERED, Keyword.DELETED, Keyword.RECENT, Keyword.DRAFT), Optional.empty()); + .fromSet(ImmutableSet.of(Keyword.ANSWERED, Keyword.DELETED, Keyword.RECENT, Keyword.DRAFT)); assertThat(keywords.getKeywords()) .containsOnly(Keyword.ANSWERED, Keyword.DRAFT); @@ -172,7 +171,7 @@ public class KeywordsTest { @Test public void containsShouldReturnTrueWhenKeywordsContainKeyword() { Keywords keywords = Keywords.factory() - .fromSet(ImmutableSet.of(Keyword.SEEN), Optional.empty()); + .fromSet(ImmutableSet.of(Keyword.SEEN)); assertThat(keywords.contains(Keyword.SEEN)).isTrue(); } @@ -180,7 +179,7 @@ public class KeywordsTest { @Test public void containsShouldReturnFalseWhenKeywordsDoNotContainKeyword() { Keywords keywords = Keywords.factory() - .fromSet(ImmutableSet.of(), Optional.empty()); + .fromSet(ImmutableSet.of()); assertThat(keywords.contains(Keyword.SEEN)).isFalse(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
