Merge remote-tracking branch 'linagora/pr/960'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/daaa36a0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/daaa36a0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/daaa36a0 Branch: refs/heads/master Commit: daaa36a02dfe267ebff5def71182da193a8349ac Parents: 1998ff3 7ee5f12 Author: Matthieu Baechler <matth...@apache.org> Authored: Mon Sep 11 10:55:45 2017 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Mon Sep 11 10:55:45 2017 +0200 ---------------------------------------------------------------------- .../james/mailbox/model/AttachmentId.java | 7 + .../james/mailbox/model/AttachmentIdTest.java | 11 +- .../CassandraMailboxSessionMapperFactory.java | 39 ++-- .../cassandra/mail/CassandraAttachmentDAO.java | 103 +++++++++++ .../mail/CassandraAttachmentDAOV2.java | 169 +++++++++++++++++ .../mail/CassandraAttachmentMapper.java | 129 ++++++------- .../cassandra/mail/CassandraBlobsDAO.java | 15 +- .../cassandra/mail/CassandraMessageDAO.java | 11 +- .../mail/CassandraMessageIdMapper.java | 3 +- .../modules/CassandraAttachmentModule.java | 19 +- .../table/CassandraAttachmentV2Table.java | 32 ++++ .../CassandraMailboxManagerProvider.java | 41 +---- .../CassandraSubscriptionManagerTest.java | 15 +- .../cassandra/CassandraTestSystemFixture.java | 42 +---- ...estCassandraMailboxSessionMapperFactory.java | 68 +++++++ .../mail/CassandraAttachmentDAOTest.java | 79 ++++++++ .../mail/CassandraAttachmentDAOV2Test.java | 86 +++++++++ .../mail/CassandraAttachmentFallbackTest.java | 180 +++++++++++++++++++ .../cassandra/mail/CassandraBlobsDAOTest.java | 38 ++-- .../CassandraMailboxManagerAttachmentTest.java | 26 +-- .../cassandra/mail/CassandraMapperProvider.java | 24 +-- mpt/impl/imap-mailbox/cassandra/pom.xml | 6 + .../cassandra/host/CassandraHostSystem.java | 48 +---- .../apache/james/util/FluentFutureStream.java | 9 + .../james/util/FluentFutureStreamTest.java | 22 +++ 25 files changed, 924 insertions(+), 298 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
