JAMES-2257 Remove now useless OldKeywords::asFlags We rely on Keywords::asFlags instead.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8ef14e2d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8ef14e2d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8ef14e2d Branch: refs/heads/master Commit: 8ef14e2d1e36aca43d82745d3efb4f30555732f5 Parents: bf9d789 Author: benwa <btell...@linagora.com> Authored: Tue Dec 12 08:56:13 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Fri Dec 15 14:03:32 2017 +0700 ---------------------------------------------------------------------- .../james/jmap/methods/MessageAppender.java | 8 ++++--- .../methods/SetMessagesCreationProcessor.java | 12 +++++------ .../org/apache/james/jmap/model/OldKeyword.java | 22 -------------------- 3 files changed, 10 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/8ef14e2d/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageAppender.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageAppender.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageAppender.java index 7bb2edc..dd3e7e8 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageAppender.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageAppender.java @@ -107,9 +107,11 @@ public class MessageAppender { private Flags getFlags(CreationMessage message) { return message.getOldKeyword() - .map(OldKeyword::asFlags) - .orElseGet(() -> keywordsOrDefault(message) - .asFlags()); + .map(OldKeyword::asKeywords) + .map(Optional::of) + .orElse(message.getKeywords()) + .orElse(Keywords.DEFAULT_VALUE) + .asFlags(); } private Keywords keywordsOrDefault(CreationMessage message) { http://git-wip-us.apache.org/repos/asf/james-project/blob/8ef14e2d/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java index 00e4c1c..21a52c0 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java @@ -45,6 +45,7 @@ import org.apache.james.jmap.model.MessageFactory; import org.apache.james.jmap.model.MessageFactory.MetaDataWithContent; import org.apache.james.jmap.model.MessageProperties; import org.apache.james.jmap.model.MessageProperties.MessageProperty; +import org.apache.james.jmap.model.OldKeyword; import org.apache.james.jmap.model.SetError; import org.apache.james.jmap.model.SetMessagesError; import org.apache.james.jmap.model.SetMessagesRequest; @@ -238,13 +239,10 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor { private Boolean isDraft(CreationMessage creationMessage) { - if (creationMessage.getOldKeyword().isPresent()) { - return creationMessage.getOldKeyword().get() - .isDraft() - .orElse(false); - } - return creationMessage - .getKeywords() + return creationMessage.getOldKeyword() + .map(OldKeyword::asKeywords) + .map(Optional::of) + .orElse(creationMessage.getKeywords()) .map(keywords -> keywords.contains(Keyword.DRAFT)) .orElse(false); } http://git-wip-us.apache.org/repos/asf/james-project/blob/8ef14e2d/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/OldKeyword.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/OldKeyword.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/OldKeyword.java index 019d7aa..f205bb9 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/OldKeyword.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/OldKeyword.java @@ -163,28 +163,6 @@ public class OldKeyword { return newStateFlags; } - public Flags asFlags() { - Flags newStateFlags = new Flags(); - - if (isFlagged().orElse(false)) { - newStateFlags.add(Flags.Flag.FLAGGED); - } - if (isAnswered().orElse(false)) { - newStateFlags.add(Flags.Flag.ANSWERED); - } - if (isDraft().orElse(false)) { - newStateFlags.add(Flags.Flag.DRAFT); - } - if (isForwarded().orElse(false)) { - newStateFlags.add(new Flags("$Forwarded")); - } - boolean shouldMessageBeMarkSeen = isUnread().map(b -> !b).orElse(false); - if (shouldMessageBeMarkSeen) { - newStateFlags.add(Flags.Flag.SEEN); - } - return newStateFlags; - } - public Keywords asKeywords() { return Keywords.factory() .fromSet(StreamUtils --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
