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 2017/11/28 13:50:32 UTC

[5/5] james-project git commit: Merge remote-tracking branch 'mine/JAMES-2232'

Merge remote-tracking branch 'mine/JAMES-2232'


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1b49712c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1b49712c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1b49712c

Branch: refs/heads/master
Commit: 1b49712c501ce7d3ddaee0b4313d01fdec762aab
Parents: 28453d4 35a6e92
Author: Antoine Duprat <ad...@linagora.com>
Authored: Tue Nov 28 14:49:55 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Tue Nov 28 14:49:55 2017 +0100

----------------------------------------------------------------------
 .../integration/SetMessagesMethodTest.java      | 357 +++++++++++++++++++
 .../cucumber/SetMessagesMethodStepdefs.java     |  18 +
 .../test/resources/cucumber/SetMessages.feature |  11 +
 .../james/jmap/methods/MessageAppender.java     |  22 +-
 .../methods/SetMessagesCreationProcessor.java   |  21 +-
 .../methods/SetMessagesUpdateProcessor.java     |  36 +-
 .../james/jmap/model/CreationMessage.java       |  23 +-
 .../org/apache/james/jmap/model/Keywords.java   |  70 ++--
 .../org/apache/james/jmap/model/OldKeyword.java |  46 +++
 .../james/jmap/model/UpdateMessagePatch.java    |  25 +-
 .../james/jmap/utils/KeywordsCombiner.java      |   6 +-
 .../james/jmap/json/ParsingWritingObjects.java  |   2 +-
 .../james/jmap/model/CreationMessageTest.java   |  15 +
 .../apache/james/jmap/model/KeywordsTest.java   | 178 +--------
 .../apache/james/jmap/model/OldKeywordTest.java |  59 ++-
 .../jmap/model/UpdateMessagePatchTest.java      |  35 --
 16 files changed, 641 insertions(+), 283 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org