Merge remote-tracking branch 'jhelou/JAMES-2525-blob-store-swift-tempauth'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1968a528 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1968a528 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1968a528 Branch: refs/heads/master Commit: 1968a528f61ee0c16515177b99919825ab3e0597 Parents: 69818cf ca8e29f Author: Antoine Duprat <[email protected]> Authored: Wed Aug 29 16:23:54 2018 +0200 Committer: Antoine Duprat <[email protected]> Committed: Wed Aug 29 16:23:54 2018 +0200 ---------------------------------------------------------------------- .../CassandraMailboxSessionMapperFactory.java | 10 +- .../mail/CassandraAttachmentMapper.java | 14 +- .../cassandra/mail/CassandraMessageDAO.java | 18 +-- .../mail/migration/AttachmentV2Migration.java | 10 +- .../CassandraSubscriptionManagerTest.java | 6 +- .../mail/CassandraAttachmentDAOV2Test.java | 4 +- .../mail/CassandraAttachmentFallbackTest.java | 4 +- .../cassandra/mail/CassandraMessageDAOTest.java | 4 +- .../AttachmentMessageIdCreationTest.java | 4 +- .../migration/AttachmentV2MigrationTest.java | 4 +- .../cassandra/mail/utils/GuiceUtils.java | 8 +- pom.xml | 5 + server/blob/blob-api/pom.xml | 6 +- .../java/org/apache/james/blob/api/BlobId.java | 6 + .../org/apache/james/blob/api/BlobStore.java | 33 ++++ .../org/apache/james/blob/api/HashBlobId.java | 78 +++++++++ .../org/apache/james/blob/api/ObjectStore.java | 33 ---- .../james/blob/api/BlobStoreContract.java | 162 +++++++++++++++++++ .../apache/james/blob/api/HashBlobIdTest.java | 90 +++++++++++ .../james/blob/api/ObjectStoreContract.java | 162 ------------------- .../blob-api/src/test/resources/shattered-1.pdf | Bin 0 -> 422435 bytes .../blob-api/src/test/resources/shattered-2.pdf | Bin 0 -> 422435 bytes .../james/blob/cassandra/CassandraBlobId.java | 80 --------- .../james/blob/cassandra/CassandraBlobsDAO.java | 19 +-- .../blob/cassandra/CassandraBlobIdTest.java | 89 ---------- .../blob/cassandra/CassandraBlobsDAOTest.java | 13 +- .../src/test/resources/shattered-1.pdf | Bin 422435 -> 0 bytes .../src/test/resources/shattered-2.pdf | Bin 422435 -> 0 bytes server/blob/blob-objectstorage/pom.xml | 100 ++++++++++++ .../james/blob/objectstorage/ContainerName.java | 63 ++++++++ .../james/blob/objectstorage/Credentials.java | 63 ++++++++ .../james/blob/objectstorage/HeaderName.java | 59 +++++++ .../james/blob/objectstorage/Identity.java | 63 ++++++++ .../objectstorage/ObjectStorageBlobsDAO.java | 128 +++++++++++++++ .../ObjectStorageConfiguration.java | 132 +++++++++++++++ .../blob/objectstorage/PassHeaderName.java | 30 ++++ .../apache/james/blob/objectstorage/Region.java | 63 ++++++++ .../blob/objectstorage/UserHeaderName.java | 30 ++++ .../blob/objectstorage/ContainerNameTest.java | 31 ++++ .../blob/objectstorage/CredentialsTest.java | 31 ++++ .../DockerSwiftTempAuthExtension.java | 73 +++++++++ .../blob/objectstorage/HeaderNameTest.java | 31 ++++ .../james/blob/objectstorage/IdentityTest.java | 31 ++++ .../ObjectStorageBlobsDAOTest.java | 90 +++++++++++ .../ObjectStorageConfigurationTest.java | 72 +++++++++ .../james/blob/objectstorage/RegionTest.java | 31 ++++ .../src/test/resources/logback-test.xml | 39 +++++ server/blob/pom.xml | 1 + .../mailbox/CassandraObjectStoreModule.java | 10 +- .../cassandra/CassandraMailRepository.java | 16 +- .../CassandraMailRepositoryProvider.java | 10 +- .../cassandra/CassandraMailRepositoryTest.java | 4 +- 52 files changed, 1620 insertions(+), 443 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/1968a528/pom.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
