Merge branch 'reactor-blob-store-2'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ab4171cf Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ab4171cf Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ab4171cf Branch: refs/heads/master Commit: ab4171cfaed38ab908c34975644f066195ca89cf Parents: 829074f ba4d902 Author: Matthieu Baechler <[email protected]> Authored: Fri Feb 1 14:45:49 2019 +0100 Committer: Matthieu Baechler <[email protected]> Committed: Fri Feb 1 14:45:49 2019 +0100 ---------------------------------------------------------------------- .../mail/CassandraAttachmentMapper.java | 8 +- .../cassandra/mail/CassandraMessageDAO.java | 6 +- .../mail/migration/AttachmentV2Migration.java | 2 +- .../mail/CassandraAttachmentFallbackTest.java | 6 +- .../migration/AttachmentV2MigrationTest.java | 14 +- metrics/metrics-api/pom.xml | 7 + .../apache/james/metrics/api/MetricFactory.java | 7 + .../org/apache/james/blob/api/BlobStore.java | 9 +- .../james/blob/api/MetricableBlobStore.java | 9 +- .../java/org/apache/james/blob/api/Store.java | 47 ++++--- .../james/blob/api/BlobStoreContract.java | 38 +++--- .../blob/api/MetricableBlobStoreContract.java | 18 +-- .../james/blob/cassandra/CassandraBlobsDAO.java | 29 ++-- .../blob/cassandra/CassandraBlobsDAOTest.java | 6 +- .../james/blob/memory/MemoryBlobStore.java | 17 +-- server/blob/blob-objectstorage/pom.xml | 4 + .../objectstorage/ObjectStorageBlobsDAO.java | 49 +++---- .../ObjectStorageBlobsDAOContract.java | 4 +- .../ObjectStorageBlobsDAOTest.java | 40 +++--- .../apache/james/blob/union/UnionBlobStore.java | 55 +++----- .../james/blob/union/UnionBlobStoreTest.java | 131 ++++++++++--------- .../james/blob/mail/MimeMessageStoreTest.java | 14 +- .../ObjectStorageDependenciesModule.java | 4 +- .../ObjectStorageBlobStoreModuleTest.java | 2 +- .../cassandra/CassandraMailRepository.java | 2 + ...ilRepositoryWithFakeImplementationsTest.java | 12 +- .../apache/james/queue/rabbitmq/Enqueuer.java | 2 +- .../apache/james/queue/rabbitmq/MailLoader.java | 2 +- .../cassandra/CassandraMailQueueBrowser.java | 2 +- .../cassandra/CassandraMailQueueMailDelete.java | 2 +- .../view/cassandra/CassandraMailQueueView.java | 2 +- 31 files changed, 264 insertions(+), 286 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
