You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by jh...@apache.org on 2024/07/31 04:40:55 UTC
(james-project) 08/11: JAMES-3763 Renames HashBlobId to PlainBlobId
This is an automated email from the ASF dual-hosted git repository.
jhelou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e8f0ee1b9cafa79475a6a807ba7a5c160d3f90f3
Author: Jean Helou <je...@xn--gml-cma.com>
AuthorDate: Thu Jul 18 23:29:55 2024 +0200
JAMES-3763 Renames HashBlobId to PlainBlobId
The HashBlobId doesn't do hashing anymore, its done in DeduplicationBlobStore
Co-Authored-By: Matthieu Baechler <ma...@apache.org>
---
.../mailbox/cassandra/CassandraMailboxManagerTest.java | 10 +++++-----
.../cassandra/mail/CassandraAttachmentDAOV2Test.java | 4 ++--
.../mailbox/cassandra/mail/CassandraMessageDAOV3Test.java | 4 ++--
.../mailbox/cassandra/mail/CassandraMessageIdDAOTest.java | 6 +++---
.../cassandra/mail/CassandraMessageIdMapperTest.java | 12 ++++++------
.../cassandra/mail/CassandraMessageIdToImapUidDAOTest.java | 6 +++---
.../mailbox/cassandra/mail/CassandraMessageMapperTest.java | 12 ++++++------
.../james/mailbox/cassandra/mail/utils/GuiceUtils.java | 4 ++--
.../mailbox/cassandra/search/AllSearchOverrideTest.java | 6 +++---
.../search/NotDeletedWithRangeSearchOverrideTest.java | 6 +++---
.../mailbox/cassandra/search/UidSearchOverrideTest.java | 6 +++---
.../metadata/CassandraDeletedMessageMetadataVaultTest.java | 4 ++--
.../org/apache/james/vault/metadata/MetadataDAOTest.java | 4 ++--
.../james/vault/metadata/StorageInformationDAOTest.java | 8 ++++----
.../apache/james/vault/DeletedMessageVaultHookTest.java | 4 ++--
.../james/vault/blob/BlobStoreDeletedMessageVaultTest.java | 4 ++--
.../dto/DeletedMessageWithStorageInformationDTOTest.java | 4 ++--
.../vault/metadata/DeletedMessageVaultMetadataFixture.java | 6 +++---
.../james/blob/api/{HashBlobId.java => PlainBlobId.java} | 14 +++++++-------
.../blob/api/{HashBlobIdTest.java => PlainBlobIdTest.java} | 8 ++++----
.../james/blob/cassandra/CassandraBlobStoreFactory.java | 4 ++--
.../james/blob/cassandra/CassandraBlobStoreClOneTest.java | 6 +++---
.../james/blob/cassandra/CassandraBlobStoreFixture.java | 6 +++---
.../james/blob/cassandra/CassandraBlobStoreTest.java | 6 +++---
.../james/blob/cassandra/CassandraBucketDAOTest.java | 4 ++--
.../blob/cassandra/CassandraPassTroughBlobStoreTest.java | 6 +++---
.../james/blob/cassandra/cache/CachedBlobStoreTest.java | 4 ++--
.../blob/cassandra/cache/CassandraBlobStoreCacheTest.java | 6 +++---
.../blob/export/file/LocalFileBlobExportMechanismTest.java | 6 +++---
.../org/apache/james/blob/file/FileBlobStoreDAOTest.java | 4 ++--
.../james/blob/file/FileBlobStoreGCAlgorithmTest.java | 4 ++--
.../james/blob/file/FileBlobStorePassThroughTest.java | 4 ++--
.../java/org/apache/james/blob/file/FileBlobStoreTest.java | 4 ++--
.../james/blob/memory/MemoryBlobStorePassThroughTest.java | 4 ++--
.../org/apache/james/blob/memory/MemoryBlobStoreTest.java | 4 ++--
.../objectstorage/aws/S3DeDuplicationBlobStoreTest.java | 6 +++---
.../james/blob/objectstorage/aws/S3NamespaceTest.java | 6 +++---
.../blob/objectstorage/aws/S3PassThroughBlobStoreTest.java | 6 +++---
.../blob/objectstorage/aws/S3PrefixAndNamespaceTest.java | 6 +++---
.../apache/james/blob/objectstorage/aws/S3PrefixTest.java | 6 +++---
.../blob/deduplication/BlobGCTaskSerializationTest.java | 4 ++--
.../blob/deduplication/BloomFilterGCAlgorithmContract.java | 4 ++--
.../blob/deduplication/GenerationAwareBlobIdTest.java | 4 ++--
.../org/apache/james/blob/mail/MimeMessageStoreTest.java | 4 ++--
.../apache/james/modules/mailbox/BlobStoreAPIModule.java | 7 +++----
.../james/modules/blobstore/BlobDeduplicationGCModule.java | 6 +++---
.../java/org/apache/james/modules/BlobMemoryModule.java | 6 +++---
.../CassandraJMAPCurrentUploadUsageCalculatorTest.java | 4 ++--
.../cassandra/upload/CassandraUploadRepositoryTest.java | 4 ++--
.../jmap/cassandra/upload/CassandraUploadServiceTest.java | 6 +++---
.../InMemoryJMAPCurrentUploadUsageCalculatorTest.java | 4 ++--
.../jmap/memory/upload/InMemoryUploadRepositoryTest.java | 4 ++--
.../jmap/memory/upload/InMemoryUploadServiceTest.java | 4 ++--
.../james/mailrepository/blob/BlobMailRepositoryTest.java | 6 +++---
.../blob/MailRepositoryBlobIdFactoryTest.java | 4 ++--
.../cassandra/CassandraMailRepositoryTest.java | 4 ++--
...CassandraMailRepositoryWithFakeImplementationsTest.java | 4 ++--
.../task/MetaDataFixInconsistenciesServiceTest.java | 8 ++++----
.../org/apache/james/webadmin/routes/BlobRoutesTest.java | 4 ++--
.../james/webadmin/data/jmap/JmapUploadRoutesTest.java | 6 +++---
.../vault/routes/DeletedMessagesVaultRoutesTest.java | 6 +++---
.../apache/james/webadmin/service/ExportServiceTest.java | 4 ++--
.../james/webadmin/service/ExportServiceTestSystem.java | 4 ++--
.../webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java | 8 ++++----
.../james/queue/pulsar/PulsarMailQueueFactoryTest.java | 6 +++---
.../org/apache/james/queue/pulsar/PulsarMailQueueTest.java | 6 +++---
.../org/apache/james/queue/rabbitmq/EnqueuedItemTest.java | 6 +++---
.../java/org/apache/james/queue/rabbitmq/MailDTOTest.java | 4 ++--
.../org/apache/james/queue/rabbitmq/MailLoaderTest.java | 4 ++--
.../rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java | 4 ++--
.../apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java | 6 +++---
.../james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java | 4 ++--
.../james/queue/rabbitmq/view/api/DeleteConditionTest.java | 6 +++---
.../view/cassandra/CassandraMailQueueViewTestFactory.java | 4 ++--
.../rabbitmq/view/cassandra/EnqueuedMailsDaoTest.java | 6 +++---
.../model/EnqueuedItemWithSlicingContextTest.java | 6 +++---
.../james/linshare/LinshareBlobExportMechanismTest.java | 6 +++---
77 files changed, 210 insertions(+), 211 deletions(-)
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index e78f3014a2..ee8bce8a78 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -41,7 +41,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.StatementRecorder;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.BlobTables;
import org.apache.james.core.Username;
import org.apache.james.events.EventBus;
@@ -812,18 +812,18 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
private CassandraAttachmentDAOV2 attachmentDAO(CassandraCluster cassandraCluster) {
return new CassandraAttachmentDAOV2(
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
cassandraCluster.getConf());
}
private CassandraMessageIdDAO messageIdDAO(CassandraCluster cassandraCluster) {
- return new CassandraMessageIdDAO(cassandraCluster.getConf(), new HashBlobId.Factory());
+ return new CassandraMessageIdDAO(cassandraCluster.getConf(), new PlainBlobId.Factory());
}
private CassandraMessageIdToImapUidDAO imapUidDAO(CassandraCluster cassandraCluster) {
return new CassandraMessageIdToImapUidDAO(
cassandraCluster.getConf(),
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
CassandraConfiguration.DEFAULT_CONFIGURATION);
}
@@ -832,7 +832,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
cassandraCluster.getConf(),
cassandraCluster.getTypesProvider(),
mock(BlobStore.class),
- new HashBlobId.Factory());
+ new PlainBlobId.Factory());
}
private CassandraThreadDAO threadDAO(CassandraCluster cassandraCluster) {
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
index e7b21618b3..7b8ba9065d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
@@ -27,7 +27,7 @@ import java.util.Optional;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2.DAOAttachment;
import org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule;
@@ -42,7 +42,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
class CassandraAttachmentDAOV2Test {
private static final StringBackedAttachmentId ATTACHMENT_ID = StringBackedAttachmentId.from("id1");
private static final StringBackedAttachmentId ATTACHMENT_ID_2 = StringBackedAttachmentId.from("id2");
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraAttachmentModule.MODULE);
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOV3Test.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOV3Test.java
index 22e75e1f62..69d3173ba3 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOV3Test.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOV3Test.java
@@ -35,7 +35,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.mailbox.MessageUid;
@@ -96,7 +96,7 @@ class CassandraMessageDAOV3Test {
threadId = ThreadId.fromBaseMessageId(messageId);
BlobStore blobStore = CassandraBlobStoreFactory.forTesting(cassandra.getConf(), new RecordingMetricFactory())
.passthrough();
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
testee = new CassandraMessageDAOV3(
cassandra.getConf(),
cassandra.getTypesProvider(),
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java
index e48102b730..097fde999c 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java
@@ -30,7 +30,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.ModSeq;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
@@ -50,7 +50,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import reactor.core.publisher.Flux;
class CassandraMessageIdDAOTest {
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
@@ -64,7 +64,7 @@ class CassandraMessageIdDAOTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
messageIdFactory = new CassandraMessageId.Factory();
- testee = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ testee = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
}
@Test
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
index fbdbbdf8ea..00200d3b21 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.StatementRecorder;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.core.Username;
import org.apache.james.junit.categories.Unstable;
import org.apache.james.mailbox.MailboxSession;
@@ -159,7 +159,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(sut.find(ImmutableList.of(message1.getMessageId()), MessageMapper.FetchType.METADATA))
.isEmpty();
@@ -183,7 +183,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(sut.find(ImmutableList.of(message1.getMessageId()), MessageMapper.FetchType.METADATA))
.isEmpty();
@@ -207,7 +207,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(sut.find(ImmutableList.of(message1.getMessageId()), MessageMapper.FetchType.METADATA))
.isEmpty();
@@ -231,7 +231,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(sut.find(ImmutableList.of(message1.getMessageId()), MessageMapper.FetchType.METADATA))
.isEmpty();
@@ -257,7 +257,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest {
CassandraMessageIdToImapUidDAO imapUidDAO = new CassandraMessageIdToImapUidDAO(
cassandra.getConf(),
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
CassandraConfiguration.DEFAULT_CONFIGURATION);
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java
index c0819ef2c1..3d97699259 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.ModSeq;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
@@ -51,7 +51,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
import reactor.core.publisher.Flux;
class CassandraMessageIdToImapUidDAOTest {
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraSchemaVersionModule.MODULE,
CassandraMessageModule.MODULE);
@@ -66,7 +66,7 @@ class CassandraMessageIdToImapUidDAOTest {
CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory();
testee = new CassandraMessageIdToImapUidDAO(
cassandra.getConf(),
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
CassandraConfiguration.DEFAULT_CONFIGURATION);
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
index ba4a1eeba7..c2ee70f01f 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
@@ -38,7 +38,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.StatementRecorder;
import org.apache.james.backends.cassandra.StatementRecorder.Selector;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.junit.categories.Unstable;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
@@ -248,7 +248,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.all(), FetchType.METADATA, 1))
.toIterable()
@@ -271,7 +271,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.all(), FetchType.METADATA, 1))
.toIterable()
@@ -294,7 +294,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.all(), FetchType.METADATA, 1))
.toIterable()
@@ -317,7 +317,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
// ignoring expected error
}
- CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ CassandraMessageIdDAO messageIdDAO = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
softly.assertThat(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.all(), FetchType.METADATA, 1))
.toIterable()
@@ -342,7 +342,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
CassandraMessageIdToImapUidDAO imapUidDAO = new CassandraMessageIdToImapUidDAO(
cassandra.getConf(),
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
CassandraConfiguration.DEFAULT_CONFIGURATION);
SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
index ea71bdf4c1..ecbb898d0b 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
@@ -27,7 +27,7 @@ import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
@@ -87,7 +87,7 @@ public class GuiceUtils {
binder -> binder.bind(UidProvider.class).to(CassandraUidProvider.class),
binder -> binder.bind(ModSeqProvider.class).to(CassandraModSeqProvider.class),
binder -> binder.bind(ACLMapper.class).to(CassandraACLMapper.class),
- binder -> binder.bind(BlobId.Factory.class).toInstance(new HashBlobId.Factory()),
+ binder -> binder.bind(BlobId.Factory.class).toInstance(new PlainBlobId.Factory()),
binder -> binder.bind(BlobStore.class).toProvider(() -> CassandraBlobStoreFactory.forTesting(session, new RecordingMetricFactory()).passthrough()),
binder -> binder.bind(CqlSession.class).toInstance(session),
binder -> Multibinder.newSetBinder(binder, new TypeLiteral<EventDTOModule<? extends Event, ? extends EventDTO>>() {})
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java
index 6c843d1d53..22bbe42dbc 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.core.Username;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
@@ -56,7 +56,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class AllSearchOverrideTest {
private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
private static final Mailbox MAILBOX = new Mailbox(MailboxPath.inbox(MAILBOX_SESSION), UidValidity.of(12), CassandraId.timeBased());
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
@@ -69,7 +69,7 @@ class AllSearchOverrideTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- dao = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ dao = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
testee = new AllSearchOverride(dao);
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java
index 2d8b47c8d8..60d10b8514 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java
@@ -32,7 +32,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.core.Username;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
@@ -58,7 +58,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class NotDeletedWithRangeSearchOverrideTest {
private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
private static final Mailbox MAILBOX = new Mailbox(MailboxPath.inbox(MAILBOX_SESSION), UidValidity.of(12), CassandraId.timeBased());
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
@@ -71,7 +71,7 @@ class NotDeletedWithRangeSearchOverrideTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- dao = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ dao = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
testee = new NotDeletedWithRangeSearchOverride(dao);
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java
index b9acfc55ab..dd4f8506a2 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.core.Username;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
@@ -57,7 +57,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class UidSearchOverrideTest {
private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
private static final Mailbox MAILBOX = new Mailbox(MailboxPath.inbox(MAILBOX_SESSION), UidValidity.of(12), CassandraId.timeBased());
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
@@ -70,7 +70,7 @@ class UidSearchOverrideTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- dao = new CassandraMessageIdDAO(cassandra.getConf(), new HashBlobId.Factory());
+ dao = new CassandraMessageIdDAO(cassandra.getConf(), new PlainBlobId.Factory());
testee = new UidSearchOverride(dao);
}
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java
index 13a44d2f7a..cb01409d58 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.vault.dto.DeletedMessageWithStorageInformationConverter;
@@ -56,7 +56,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
@BeforeEach
void setUp(CassandraCluster cassandra) {
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
DeletedMessageWithStorageInformationConverter dtoConverter = new DeletedMessageWithStorageInformationConverter(blobIdFactory, messageIdFactory, new InMemoryId.Factory());
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/MetadataDAOTest.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/MetadataDAOTest.java
index 49e0a5dd45..f632ccfc6d 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/MetadataDAOTest.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/MetadataDAOTest.java
@@ -31,7 +31,7 @@ import java.util.stream.Stream;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.mailbox.model.MessageId;
@@ -49,7 +49,7 @@ class MetadataDAOTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
DeletedMessageWithStorageInformationConverter dtoConverter = new DeletedMessageWithStorageInformationConverter(
- new HashBlobId.Factory(), new InMemoryMessageId.Factory(), new InMemoryId.Factory());
+ new PlainBlobId.Factory(), new InMemoryMessageId.Factory(), new InMemoryId.Factory());
testee = new MetadataDAO(cassandra.getConf(), new InMemoryMessageId.Factory(),
new MetadataSerializer(dtoConverter));
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/StorageInformationDAOTest.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/StorageInformationDAOTest.java
index 4a59ef65fe..f2e703a619 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/StorageInformationDAOTest.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/StorageInformationDAOTest.java
@@ -29,7 +29,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.core.Username;
import org.apache.james.mailbox.model.TestMessageId;
import org.junit.jupiter.api.BeforeEach;
@@ -39,11 +39,11 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class StorageInformationDAOTest {
private static final BucketName BUCKET_NAME = BucketName.of("deletedMessages-2019-06-01");
private static final BucketName BUCKET_NAME_2 = BucketName.of("deletedMessages-2019-07-01");
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private static final Username OWNER = Username.of("owner");
private static final TestMessageId MESSAGE_ID = TestMessageId.of(36);
- private static final BlobId BLOB_ID = new HashBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d23");
- private static final BlobId BLOB_ID_2 = new HashBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d24");
+ private static final BlobId BLOB_ID = new PlainBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d23");
+ private static final BlobId BLOB_ID_2 = new PlainBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d24");
private static final StorageInformation STORAGE_INFORMATION = StorageInformation.builder().bucketName(BUCKET_NAME).blobId(BLOB_ID);
private static final StorageInformation STORAGE_INFORMATION_2 = StorageInformation.builder().bucketName(BUCKET_NAME_2).blobId(BLOB_ID_2);
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java
index 2ec44ca23b..9149599fba 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java
@@ -31,7 +31,7 @@ import java.time.ZoneOffset;
import java.util.List;
import java.util.stream.IntStream;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.core.MailAddress;
import org.apache.james.core.MaybeSender;
@@ -118,7 +118,7 @@ class DeletedMessageVaultHookTest {
messageVault = new BlobStoreDeletedMessageVault(new RecordingMetricFactory(), new MemoryDeletedMessageMetadataVault(),
BlobStoreFactory.builder()
.blobStoreDAO(blobStoreDAO)
- .blobIdFactory(new HashBlobId.Factory())
+ .blobIdFactory(new PlainBlobId.Factory())
.defaultBucketName()
.passthrough(), blobStoreDAO, new BucketNameGenerator(clock), clock,
VaultConfiguration.ENABLED_DEFAULT);
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java
index 0e111ff019..328a520660 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java
@@ -39,7 +39,7 @@ import java.time.Instant;
import java.time.ZonedDateTime;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -68,7 +68,7 @@ class BlobStoreDeletedMessageVaultTest implements DeletedMessageVaultContract, D
messageVault = new BlobStoreDeletedMessageVault(metricFactory, new MemoryDeletedMessageMetadataVault(),
BlobStoreFactory.builder()
.blobStoreDAO(blobStoreDAO)
- .blobIdFactory(new HashBlobId.Factory())
+ .blobIdFactory(new PlainBlobId.Factory())
.defaultBucketName()
.passthrough(),
blobStoreDAO, new BucketNameGenerator(clock), clock, VaultConfiguration.ENABLED_DEFAULT);
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/DeletedMessageWithStorageInformationDTOTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/DeletedMessageWithStorageInformationDTOTest.java
index 194c5f2082..a05ef7885e 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/DeletedMessageWithStorageInformationDTOTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/DeletedMessageWithStorageInformationDTOTest.java
@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import jakarta.mail.internet.AddressException;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.vault.metadata.DeletedMessageWithStorageInformation;
@@ -73,7 +73,7 @@ class DeletedMessageWithStorageInformationDTOTest {
.setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
this.converter = new DeletedMessageWithStorageInformationConverter(
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
new InMemoryMessageId.Factory(),
new InMemoryId.Factory());
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java
index 41972b90a1..ad9babe40d 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java
@@ -21,12 +21,12 @@ package org.apache.james.vault.metadata;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.vault.DeletedMessageFixture;
public interface DeletedMessageVaultMetadataFixture {
- BlobId BLOB_ID = new HashBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d23");
- BlobId BLOB_ID_2 = new HashBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d24");
+ BlobId BLOB_ID = new PlainBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d23");
+ BlobId BLOB_ID_2 = new PlainBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d24");
BucketName BUCKET_NAME = BucketName.of("bucket-2019-06-01");
BucketName OTHER_BUCKET_NAME = BucketName.of("other");
diff --git a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/HashBlobId.java b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/PlainBlobId.java
similarity index 88%
rename from server/blob/blob-api/src/main/java/org/apache/james/blob/api/HashBlobId.java
rename to server/blob/blob-api/src/main/java/org/apache/james/blob/api/PlainBlobId.java
index ed9b18f8ce..239734b809 100644
--- a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/HashBlobId.java
+++ b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/PlainBlobId.java
@@ -26,17 +26,17 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
// FIXME (in later commit) use java record
-public class HashBlobId implements BlobId {
+public class PlainBlobId implements BlobId {
public static class Factory implements BlobId.Factory {
@Override
- public HashBlobId of(String id) {
+ public PlainBlobId of(String id) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(id));
- return new HashBlobId(id);
+ return new PlainBlobId(id);
}
@Override
- public HashBlobId parse(String id) {
+ public PlainBlobId parse(String id) {
return of(id);
}
}
@@ -44,7 +44,7 @@ public class HashBlobId implements BlobId {
private final String id;
@VisibleForTesting
- HashBlobId(String id) {
+ PlainBlobId(String id) {
this.id = id;
}
@@ -55,8 +55,8 @@ public class HashBlobId implements BlobId {
@Override
public final boolean equals(Object obj) {
- if (obj instanceof HashBlobId) {
- HashBlobId other = (HashBlobId) obj;
+ if (obj instanceof PlainBlobId) {
+ PlainBlobId other = (PlainBlobId) obj;
return Objects.equal(id, other.id);
}
return false;
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/HashBlobIdTest.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/PlainBlobIdTest.java
similarity index 89%
rename from server/blob/blob-api/src/test/java/org/apache/james/blob/api/HashBlobIdTest.java
rename to server/blob/blob-api/src/test/java/org/apache/james/blob/api/PlainBlobIdTest.java
index e83e5f9335..da991b0d28 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/HashBlobIdTest.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/PlainBlobIdTest.java
@@ -26,20 +26,20 @@ import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-class HashBlobIdTest {
+class PlainBlobIdTest {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
@Test
void shouldRespectBeanContract() {
- EqualsVerifier.forClass(HashBlobId.class).verify();
+ EqualsVerifier.forClass(PlainBlobId.class).verify();
}
@Test
void fromShouldConstructBlobId() {
String id = "111";
assertThat(BLOB_ID_FACTORY.parse(id))
- .isEqualTo(new HashBlobId(id));
+ .isEqualTo(new PlainBlobId(id));
}
@Test
diff --git a/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreFactory.java b/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreFactory.java
index 6810d77020..59d98f27fa 100644
--- a/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreFactory.java
+++ b/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobStoreFactory.java
@@ -21,7 +21,7 @@ package org.apache.james.blob.cassandra;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -29,7 +29,7 @@ import com.datastax.oss.driver.api.core.CqlSession;
public class CassandraBlobStoreFactory {
public static BlobStoreFactory.RequireStoringStrategy forTesting(CqlSession session, MetricFactory metricFactory) {
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, session);
CassandraDefaultBucketDAO defaultBucketDAO = new CassandraDefaultBucketDAO(session, blobIdFactory);
CassandraBlobStoreDAO blobStoreDAO = new CassandraBlobStoreDAO(defaultBucketDAO, bucketDAO, CassandraConfiguration.DEFAULT_CONFIGURATION, BucketName.DEFAULT, metricFactory);
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
index fe49d43ef4..4453799e7a 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreClOneTest.java
@@ -40,9 +40,9 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.DeduplicationBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +69,7 @@ class CassandraBlobStoreClOneTest implements CassandraBlobStoreContract, Dedupli
@Override
public MetricableBlobStore createBlobStore() {
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, this.cassandra.getConf());
defaultBucketDAO = spy(new CassandraDefaultBucketDAO(this.cassandra.getConf(), blobIdFactory));
CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
@@ -93,7 +93,7 @@ class CassandraBlobStoreClOneTest implements CassandraBlobStoreContract, Dedupli
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
@Override
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreFixture.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreFixture.java
index 8491304d7c..97b9bf09e0 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreFixture.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreFixture.java
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
public interface CassandraBlobStoreFixture {
byte[] DATA = "anydata".getBytes(StandardCharsets.UTF_8);
@@ -32,8 +32,8 @@ public interface CassandraBlobStoreFixture {
int POSITION_2 = 43;
int NUMBER_OF_CHUNK = 17;
int NUMBER_OF_CHUNK_2 = 18;
- BlobId BLOB_ID = new HashBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d23");
- BlobId BLOB_ID_2 = new HashBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d24");
+ BlobId BLOB_ID = new PlainBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d23");
+ BlobId BLOB_ID_2 = new PlainBlobId.Factory().parse("05dcb33b-8382-4744-923a-bc593ad84d24");
BucketName BUCKET_NAME = BucketName.of("aBucket");
BucketName BUCKET_NAME_2 = BucketName.of("anotherBucket");
}
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
index c49bfa962b..5b65c47dbe 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java
@@ -28,8 +28,8 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.DeduplicationBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
import org.junit.jupiter.api.BeforeEach;
@@ -51,7 +51,7 @@ public class CassandraBlobStoreTest implements CassandraBlobStoreContract, Dedup
@Override
public MetricableBlobStore createBlobStore() {
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, this.cassandra.getConf());
defaultBucketDAO = spy(new CassandraDefaultBucketDAO(this.cassandra.getConf(), blobIdFactory));
CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
@@ -74,7 +74,7 @@ public class CassandraBlobStoreTest implements CassandraBlobStoreContract, Dedup
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
@Override
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBucketDAOTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBucketDAOTest.java
index 2142200376..9177450221 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBucketDAOTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBucketDAOTest.java
@@ -37,7 +37,7 @@ import java.util.Optional;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -50,7 +50,7 @@ class CassandraBucketDAOTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- testee = new CassandraBucketDAO(new HashBlobId.Factory(), cassandraCluster.getCassandraCluster().getConf());
+ testee = new CassandraBucketDAO(new PlainBlobId.Factory(), cassandraCluster.getCassandraCluster().getConf());
}
@Test
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java
index 8ae565e7b3..8011096fee 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java
@@ -28,8 +28,8 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.DeleteBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
import org.junit.jupiter.api.BeforeEach;
@@ -44,7 +44,7 @@ public class CassandraPassTroughBlobStoreTest implements DeleteBlobStoreContract
@BeforeEach
void setUp(CassandraCluster cassandra) {
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
CassandraBucketDAO bucketDAO = new CassandraBucketDAO(blobIdFactory, cassandra.getConf());
defaultBucketDAO = spy(new CassandraDefaultBucketDAO(cassandra.getConf(), blobIdFactory));
CassandraConfiguration cassandraConfiguration = CassandraConfiguration.builder()
@@ -67,7 +67,7 @@ public class CassandraPassTroughBlobStoreTest implements DeleteBlobStoreContract
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
@Override
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CachedBlobStoreTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CachedBlobStoreTest.java
index 445df1a5aa..05226fc876 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CachedBlobStoreTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CachedBlobStoreTest.java
@@ -46,8 +46,8 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreContract;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectNotFoundException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.api.Store;
import org.apache.james.blob.api.TestBlobId;
import org.apache.james.blob.cassandra.CassandraBlobModule;
@@ -101,7 +101,7 @@ public class CachedBlobStoreTest implements BlobStoreContract {
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
@Test
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CassandraBlobStoreCacheTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CassandraBlobStoreCacheTest.java
index ae36d886a9..471208f7bb 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CassandraBlobStoreCacheTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/cache/CassandraBlobStoreCacheTest.java
@@ -27,7 +27,7 @@ import java.util.UUID;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -43,11 +43,11 @@ class CassandraBlobStoreCacheTest implements BlobStoreCacheContract {
private static final Duration _2_SEC_TTL = Duration.ofSeconds(2);
private BlobStoreCache testee;
- private HashBlobId.Factory blobIdFactory;
+ private PlainBlobId.Factory blobIdFactory;
@BeforeEach
void setUp(CassandraCluster cassandra) {
- blobIdFactory = new HashBlobId.Factory();
+ blobIdFactory = new PlainBlobId.Factory();
CassandraCacheConfiguration cacheConfiguration = new CassandraCacheConfiguration.Builder()
.sizeThresholdInBytes(DEFAULT_THRESHOLD_IN_BYTES)
.ttl(_2_SEC_TTL)
diff --git a/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java b/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java
index fd93f8aafc..2162464b4d 100644
--- a/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java
+++ b/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java
@@ -37,8 +37,8 @@ import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectStoreException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.export.api.FileExtension;
import org.apache.james.blob.export.file.LocalFileBlobExportMechanism.Configuration;
import org.apache.james.blob.memory.MemoryBlobStoreFactory;
@@ -68,7 +68,7 @@ class LocalFileBlobExportMechanismTest {
void setUp(FileSystem fileSystem) throws Exception {
mailetContext = FakeMailContext.builder().postmaster(MailAddressFixture.POSTMASTER_AT_JAMES).build();
blobStore = MemoryBlobStoreFactory.builder()
- .blobIdFactory(new HashBlobId.Factory())
+ .blobIdFactory(new PlainBlobId.Factory())
.defaultBucketName()
.passthrough();
@@ -140,7 +140,7 @@ class LocalFileBlobExportMechanismTest {
@Test
void shareShouldFailWhenBlobDoesNotExist() {
- BlobId blobId = new HashBlobId.Factory().of("NOT_EXISTING_BLOB_ID");
+ BlobId blobId = new PlainBlobId.Factory().of("NOT_EXISTING_BLOB_ID");
assertThatThrownBy(() ->
testee.blobId(blobId)
diff --git a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreDAOTest.java b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreDAOTest.java
index 8f537b26fa..f08b490c9f 100644
--- a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreDAOTest.java
+++ b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreDAOTest.java
@@ -21,7 +21,7 @@ package org.apache.james.blob.file;
import org.apache.james.blob.api.BlobStoreDAO;
import org.apache.james.blob.api.BlobStoreDAOContract;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.server.core.filesystem.FileSystemImpl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -32,7 +32,7 @@ class FileBlobStoreDAOTest implements BlobStoreDAOContract {
@BeforeEach
void setUp() throws Exception {
- blobStore = new FileBlobStoreDAO(FileSystemImpl.forTesting(), new HashBlobId.Factory());
+ blobStore = new FileBlobStoreDAO(FileSystemImpl.forTesting(), new PlainBlobId.Factory());
}
@Override
diff --git a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreGCAlgorithmTest.java b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreGCAlgorithmTest.java
index d13c223f84..fe72ec9444 100644
--- a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreGCAlgorithmTest.java
+++ b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreGCAlgorithmTest.java
@@ -20,7 +20,7 @@
package org.apache.james.blob.file;
import org.apache.james.blob.api.BlobStoreDAO;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.server.blob.deduplication.BloomFilterGCAlgorithmContract;
import org.apache.james.server.core.filesystem.FileSystemImpl;
import org.junit.jupiter.api.BeforeEach;
@@ -31,7 +31,7 @@ public class FileBlobStoreGCAlgorithmTest implements BloomFilterGCAlgorithmContr
@BeforeEach
public void beforeEach() throws Exception {
- blobStoreDAO = new FileBlobStoreDAO(FileSystemImpl.forTesting(), new HashBlobId.Factory());
+ blobStoreDAO = new FileBlobStoreDAO(FileSystemImpl.forTesting(), new PlainBlobId.Factory());
}
@Override
diff --git a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStorePassThroughTest.java b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStorePassThroughTest.java
index e0d15cdbcb..0538af2990 100644
--- a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStorePassThroughTest.java
+++ b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStorePassThroughTest.java
@@ -22,15 +22,15 @@ package org.apache.james.blob.file;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.DeleteBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
import org.apache.james.blob.api.MetricableBlobStoreContract;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.server.core.filesystem.FileSystemImpl;
import org.junit.jupiter.api.BeforeEach;
public class FileBlobStorePassThroughTest implements DeleteBlobStoreContract, MetricableBlobStoreContract {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private BlobStore blobStore;
@BeforeEach
diff --git a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreTest.java b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreTest.java
index ca3d30ab20..a41404d725 100644
--- a/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreTest.java
+++ b/server/blob/blob-file/src/test/java/org/apache/james/blob/file/FileBlobStoreTest.java
@@ -22,14 +22,14 @@ package org.apache.james.blob.file;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.DeduplicationBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
import org.apache.james.blob.api.MetricableBlobStoreContract;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.server.core.filesystem.FileSystemImpl;
import org.junit.jupiter.api.BeforeEach;
public class FileBlobStoreTest implements MetricableBlobStoreContract, DeduplicationBlobStoreContract {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private BlobStore blobStore;
@BeforeEach
diff --git a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java
index 3ab634b158..30431191c2 100644
--- a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java
+++ b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java
@@ -22,14 +22,14 @@ package org.apache.james.blob.memory;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.DeleteBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
import org.apache.james.blob.api.MetricableBlobStoreContract;
+import org.apache.james.blob.api.PlainBlobId;
import org.junit.jupiter.api.BeforeEach;
public class MemoryBlobStorePassThroughTest implements DeleteBlobStoreContract, MetricableBlobStoreContract {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private BlobStore blobStore;
@BeforeEach
diff --git a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java
index 7310f0d86a..19fdd2176b 100644
--- a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java
+++ b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java
@@ -22,13 +22,13 @@ package org.apache.james.blob.memory;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.DeduplicationBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
import org.apache.james.blob.api.MetricableBlobStoreContract;
+import org.apache.james.blob.api.PlainBlobId;
import org.junit.jupiter.api.BeforeEach;
public class MemoryBlobStoreTest implements MetricableBlobStoreContract, DeduplicationBlobStoreContract {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private BlobStore blobStore;
@BeforeEach
diff --git a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3DeDuplicationBlobStoreTest.java b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3DeDuplicationBlobStoreTest.java
index 728a25d216..ad10af232c 100644
--- a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3DeDuplicationBlobStoreTest.java
+++ b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3DeDuplicationBlobStoreTest.java
@@ -28,7 +28,7 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreContract;
import org.apache.james.blob.api.DeduplicationBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -66,7 +66,7 @@ class S3DeDuplicationBlobStoreTest implements BlobStoreContract, DeduplicationBl
.region(dockerAwsS3.dockerAwsS3().region())
.build();
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
s3ClientFactory = new S3ClientFactory(s3Configuration, new RecordingMetricFactory(), new NoopGaugeRegistry());
s3BlobStoreDAO = new S3BlobStoreDAO(s3ClientFactory, s3Configuration, blobIdFactory);
@@ -101,7 +101,7 @@ class S3DeDuplicationBlobStoreTest implements BlobStoreContract, DeduplicationBl
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
}
\ No newline at end of file
diff --git a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3NamespaceTest.java b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3NamespaceTest.java
index ea9c5ce7e1..ae73ae445a 100644
--- a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3NamespaceTest.java
+++ b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3NamespaceTest.java
@@ -23,7 +23,7 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreContract;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -52,7 +52,7 @@ class S3NamespaceTest implements BlobStoreContract {
.defaultBucketName(BucketName.of("namespace"))
.build();
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
s3ClientFactory = new S3ClientFactory(s3Configuration, new RecordingMetricFactory(), new NoopGaugeRegistry());
s3BlobStoreDAO = new S3BlobStoreDAO(s3ClientFactory, s3Configuration, blobIdFactory);
@@ -80,6 +80,6 @@ class S3NamespaceTest implements BlobStoreContract {
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
}
diff --git a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PassThroughBlobStoreTest.java b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PassThroughBlobStoreTest.java
index 516f0b7ade..45ba236d56 100644
--- a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PassThroughBlobStoreTest.java
+++ b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PassThroughBlobStoreTest.java
@@ -22,7 +22,7 @@ package org.apache.james.blob.objectstorage.aws;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -52,7 +52,7 @@ class S3PassThroughBlobStoreTest implements BlobStoreContract {
.region(dockerAwsS3.dockerAwsS3().region())
.build();
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
s3ClientFactory = new S3ClientFactory(s3Configuration, new RecordingMetricFactory(), new NoopGaugeRegistry());
s3BlobStoreDAO = new S3BlobStoreDAO(s3ClientFactory, s3Configuration, blobIdFactory);
@@ -80,7 +80,7 @@ class S3PassThroughBlobStoreTest implements BlobStoreContract {
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
}
\ No newline at end of file
diff --git a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixAndNamespaceTest.java b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixAndNamespaceTest.java
index 10d39c21ff..893d29b209 100644
--- a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixAndNamespaceTest.java
+++ b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixAndNamespaceTest.java
@@ -24,7 +24,7 @@ import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreContract;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.DeduplicationBlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -61,7 +61,7 @@ class S3PrefixAndNamespaceTest implements BlobStoreContract, DeduplicationBlobSt
.bucketPrefix("prefix")
.build();
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
s3ClientFactory = new S3ClientFactory(s3Configuration, new RecordingMetricFactory(), new NoopGaugeRegistry());
s3BlobStoreDAO = new S3BlobStoreDAO(s3ClientFactory, s3Configuration, blobIdFactory);
@@ -85,6 +85,6 @@ class S3PrefixAndNamespaceTest implements BlobStoreContract, DeduplicationBlobSt
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
}
diff --git a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixTest.java b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixTest.java
index 72b867f480..bef47890e4 100644
--- a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixTest.java
+++ b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3PrefixTest.java
@@ -22,7 +22,7 @@ package org.apache.james.blob.objectstorage.aws;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreContract;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.blob.deduplication.BlobStoreFactory;
@@ -51,7 +51,7 @@ class S3PrefixTest implements BlobStoreContract {
.bucketPrefix("prefix")
.build();
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
s3ClientFactory = new S3ClientFactory(s3Configuration, new RecordingMetricFactory(), new NoopGaugeRegistry());
s3BlobStoreDAO = new S3BlobStoreDAO(s3ClientFactory, s3Configuration, blobIdFactory);
@@ -79,6 +79,6 @@ class S3PrefixTest implements BlobStoreContract {
@Override
public BlobId.Factory blobIdFactory() {
- return new HashBlobId.Factory();
+ return new PlainBlobId.Factory();
}
}
diff --git a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BlobGCTaskSerializationTest.java b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BlobGCTaskSerializationTest.java
index 3be209cd76..48d9bc1d6e 100644
--- a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BlobGCTaskSerializationTest.java
+++ b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BlobGCTaskSerializationTest.java
@@ -31,7 +31,7 @@ import org.apache.james.JsonSerializationVerifier;
import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.blob.api.BlobStoreDAO;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.json.JsonGenericSerializer;
import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.utils.UpdatableTickingClock;
@@ -53,7 +53,7 @@ class BlobGCTaskSerializationTest {
blobReferenceSources = ImmutableSet.of(mock(BlobReferenceSource.class));
clock = new UpdatableTickingClock(Instant.parse("2007-12-03T10:15:30.00Z"));
generationAwareBlobIdConfiguration = GenerationAwareBlobId.Configuration.DEFAULT;
- generationAwareBlobIdFactory = new GenerationAwareBlobId.Factory(clock, new HashBlobId.Factory(), generationAwareBlobIdConfiguration);
+ generationAwareBlobIdFactory = new GenerationAwareBlobId.Factory(clock, new PlainBlobId.Factory(), generationAwareBlobIdConfiguration);
}
@Test
diff --git a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BloomFilterGCAlgorithmContract.java b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BloomFilterGCAlgorithmContract.java
index aea70878a2..39397f1f14 100644
--- a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BloomFilterGCAlgorithmContract.java
+++ b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/BloomFilterGCAlgorithmContract.java
@@ -39,8 +39,8 @@ import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreDAO;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectNotFoundException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.server.blob.deduplication.BloomFilterGCAlgorithm.Context;
import org.apache.james.server.blob.deduplication.BloomFilterGCAlgorithm.Context.Snapshot;
import org.apache.james.task.Task;
@@ -57,7 +57,7 @@ import reactor.core.publisher.Mono;
public interface BloomFilterGCAlgorithmContract {
- HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
ZonedDateTime NOW = ZonedDateTime.parse("2015-10-30T16:12:00Z");
BucketName DEFAULT_BUCKET = BucketName.of("default");
GenerationAwareBlobId.Configuration GENERATION_AWARE_BLOB_ID_CONFIGURATION = GenerationAwareBlobId.Configuration.DEFAULT;
diff --git a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java
index d80deb0c9e..a51f8edff5 100644
--- a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java
+++ b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java
@@ -29,7 +29,7 @@ import java.util.UUID;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.utils.UpdatableTickingClock;
import org.assertj.core.api.SoftAssertions;
import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +49,7 @@ class GenerationAwareBlobIdTest {
@BeforeEach
void setUp() {
- delegate = new HashBlobId.Factory();
+ delegate = new PlainBlobId.Factory();
clock = new UpdatableTickingClock(NOW);
testee = new GenerationAwareBlobId.Factory(clock, delegate, GenerationAwareBlobId.Configuration.DEFAULT);
}
diff --git a/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java b/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java
index c297f168b8..54351e44b7 100644
--- a/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java
+++ b/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java
@@ -29,8 +29,8 @@ import jakarta.mail.internet.MimeMessage;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectNotFoundException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.api.Store;
import org.apache.james.blob.memory.MemoryBlobStoreFactory;
import org.apache.james.core.builder.MimeMessageBuilder;
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
class MimeMessageStoreTest {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private Store<MimeMessage, MimeMessagePartsId> testee;
private BlobStore blobStore;
diff --git a/server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java b/server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java
index a2d95a96e9..b1d5f22494 100644
--- a/server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java
+++ b/server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java
@@ -21,18 +21,17 @@ package org.apache.james.modules.mailbox;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.PlainBlobId;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
public class BlobStoreAPIModule extends AbstractModule {
-
@Override
protected void configure() {
- bind(HashBlobId.Factory.class).in(Scopes.SINGLETON);
- bind(BlobId.Factory.class).to(HashBlobId.Factory.class);
+ bind(PlainBlobId.Factory.class).in(Scopes.SINGLETON);
+ bind(BlobId.Factory.class).to(PlainBlobId.Factory.class);
bind(MetricableBlobStore.class).in(Scopes.SINGLETON);
bind(BlobStore.class).to(MetricableBlobStore.class);
diff --git a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/BlobDeduplicationGCModule.java b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/BlobDeduplicationGCModule.java
index 410510c201..4c8dff091b 100644
--- a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/BlobDeduplicationGCModule.java
+++ b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/BlobDeduplicationGCModule.java
@@ -29,8 +29,8 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreDAO;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.MetricableBlobStore;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.modules.blobstore.server.BlobRoutesModules;
import org.apache.james.server.blob.deduplication.BlobGCTaskAdditionalInformationDTO;
import org.apache.james.server.blob.deduplication.BlobGCTaskDTO;
@@ -57,7 +57,7 @@ public class BlobDeduplicationGCModule extends AbstractModule {
@Override
protected void configure() {
- bind(HashBlobId.Factory.class).in(Scopes.SINGLETON);
+ bind(PlainBlobId.Factory.class).in(Scopes.SINGLETON);
bind(BlobId.Factory.class).to(GenerationAwareBlobId.Factory.class);
bind(MetricableBlobStore.class).in(Scopes.SINGLETON);
@@ -68,7 +68,7 @@ public class BlobDeduplicationGCModule extends AbstractModule {
@Singleton
@Provides
- public GenerationAwareBlobId.Factory generationAwareBlobIdFactory(Clock clock, HashBlobId.Factory delegate, GenerationAwareBlobId.Configuration configuration) {
+ public GenerationAwareBlobId.Factory generationAwareBlobIdFactory(Clock clock, PlainBlobId.Factory delegate, GenerationAwareBlobId.Configuration configuration) {
return new GenerationAwareBlobId.Factory(clock, delegate, configuration);
}
diff --git a/server/container/guice/blob/memory/src/main/java/org/apache/james/modules/BlobMemoryModule.java b/server/container/guice/blob/memory/src/main/java/org/apache/james/modules/BlobMemoryModule.java
index dc365319a6..331c7cf057 100644
--- a/server/container/guice/blob/memory/src/main/java/org/apache/james/modules/BlobMemoryModule.java
+++ b/server/container/guice/blob/memory/src/main/java/org/apache/james/modules/BlobMemoryModule.java
@@ -23,7 +23,7 @@ import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreDAO;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.server.blob.deduplication.DeDuplicationBlobStore;
@@ -35,8 +35,8 @@ public class BlobMemoryModule extends AbstractModule {
@Override
protected void configure() {
- bind(HashBlobId.Factory.class).in(Scopes.SINGLETON);
- bind(BlobId.Factory.class).to(HashBlobId.Factory.class);
+ bind(PlainBlobId.Factory.class).in(Scopes.SINGLETON);
+ bind(BlobId.Factory.class).to(PlainBlobId.Factory.class);
bind(DeDuplicationBlobStore.class).in(Scopes.SINGLETON);
bind(BlobStore.class).to(DeDuplicationBlobStore.class);
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraJMAPCurrentUploadUsageCalculatorTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraJMAPCurrentUploadUsageCalculatorTest.java
index 93df1ee8e7..e65933993b 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraJMAPCurrentUploadUsageCalculatorTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraJMAPCurrentUploadUsageCalculatorTest.java
@@ -26,7 +26,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.components.CassandraMutualizedQuotaModule;
import org.apache.james.backends.cassandra.components.CassandraQuotaCurrentValueDao;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.jmap.api.upload.JMAPCurrentUploadUsageCalculator;
import org.apache.james.jmap.api.upload.JMAPCurrentUploadUsageCalculatorContract;
@@ -49,7 +49,7 @@ public class CassandraJMAPCurrentUploadUsageCalculatorTest implements JMAPCurren
private void setup() {
Clock clock = Clock.systemUTC();
uploadRepository = new CassandraUploadRepository(new UploadDAO(cassandraCluster.getCassandraCluster().getConf(),
- new HashBlobId.Factory()), new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.of("default"), new HashBlobId.Factory()),
+ new PlainBlobId.Factory()), new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.of("default"), new PlainBlobId.Factory()),
clock);
uploadUsageRepository = new CassandraUploadUsageRepository(new CassandraQuotaCurrentValueDao(cassandraCluster.getCassandraCluster().getConf()));
jmapCurrentUploadUsageCalculator = new JMAPCurrentUploadUsageCalculator(uploadRepository, uploadUsageRepository);
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java
index f54520df90..22c4713971 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java
@@ -23,7 +23,7 @@ import java.time.Clock;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.jmap.api.model.UploadId;
import org.apache.james.jmap.api.upload.UploadRepository;
@@ -44,7 +44,7 @@ class CassandraUploadRepositoryTest implements UploadRepositoryContract {
void setUp() {
Clock clock = Clock.systemUTC();
testee = new CassandraUploadRepository(new UploadDAO(cassandra.getCassandraCluster().getConf(),
- new HashBlobId.Factory()), new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.of("default"), new HashBlobId.Factory()),
+ new PlainBlobId.Factory()), new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.of("default"), new PlainBlobId.Factory()),
clock);
}
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
index 3a377b5b80..0f7f4b67a3 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
@@ -27,7 +27,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.components.CassandraMutualizedQuotaModule;
import org.apache.james.backends.cassandra.components.CassandraQuotaCurrentValueDao;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.jmap.api.upload.UploadRepository;
import org.apache.james.jmap.api.upload.UploadService;
@@ -51,8 +51,8 @@ class CassandraUploadServiceTest implements UploadServiceContract {
@BeforeEach
void setUp(CassandraCluster cassandraCluster) {
Clock clock = Clock.systemUTC();
- uploadRepository = new CassandraUploadRepository(new UploadDAO(cassandraCluster.getConf(), new HashBlobId.Factory()), new DeDuplicationBlobStore(new MemoryBlobStoreDAO(),
- BucketName.of("default"), new HashBlobId.Factory()), clock);
+ uploadRepository = new CassandraUploadRepository(new UploadDAO(cassandraCluster.getConf(), new PlainBlobId.Factory()), new DeDuplicationBlobStore(new MemoryBlobStoreDAO(),
+ BucketName.of("default"), new PlainBlobId.Factory()), clock);
uploadUsageRepository = new CassandraUploadUsageRepository(new CassandraQuotaCurrentValueDao(cassandraCluster.getConf()));
testee = new UploadServiceDefaultImpl(uploadRepository, uploadUsageRepository, UploadServiceContract.TEST_CONFIGURATION());
}
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryJMAPCurrentUploadUsageCalculatorTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryJMAPCurrentUploadUsageCalculatorTest.java
index 64c4530075..bddc9d808f 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryJMAPCurrentUploadUsageCalculatorTest.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryJMAPCurrentUploadUsageCalculatorTest.java
@@ -23,7 +23,7 @@ import java.time.Clock;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.jmap.api.upload.JMAPCurrentUploadUsageCalculator;
import org.apache.james.jmap.api.upload.JMAPCurrentUploadUsageCalculatorContract;
@@ -40,7 +40,7 @@ public class InMemoryJMAPCurrentUploadUsageCalculatorTest implements JMAPCurrent
@BeforeEach
private void setup() {
- BlobStore blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new HashBlobId.Factory());
+ BlobStore blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new PlainBlobId.Factory());
uploadRepository = new InMemoryUploadRepository(blobStore, Clock.systemUTC());
uploadUsageRepository = new InMemoryUploadUsageRepository();
jmapCurrentUploadUsageCalculator = new JMAPCurrentUploadUsageCalculator(uploadRepository, uploadUsageRepository);
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadRepositoryTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadRepositoryTest.java
index 72fcb6a927..e949525ac2 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadRepositoryTest.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadRepositoryTest.java
@@ -23,7 +23,7 @@ import java.time.Clock;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.jmap.api.upload.UploadRepository;
import org.apache.james.jmap.api.upload.UploadRepositoryContract;
@@ -36,7 +36,7 @@ public class InMemoryUploadRepositoryTest implements UploadRepositoryContract {
@BeforeEach
void setUp() {
- BlobStore blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new HashBlobId.Factory());
+ BlobStore blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new PlainBlobId.Factory());
testee = new InMemoryUploadRepository(blobStore, Clock.systemUTC());
}
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadServiceTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadServiceTest.java
index 3be92a42fd..628761c71d 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadServiceTest.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadServiceTest.java
@@ -23,7 +23,7 @@ import java.time.Clock;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.jmap.api.upload.UploadRepository;
import org.apache.james.jmap.api.upload.UploadService;
@@ -41,7 +41,7 @@ public class InMemoryUploadServiceTest implements UploadServiceContract {
@BeforeEach
void setUp() {
- BlobStore blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new HashBlobId.Factory());
+ BlobStore blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new PlainBlobId.Factory());
uploadRepository = new InMemoryUploadRepository(blobStore, Clock.systemUTC());
uploadUsageRepository = new InMemoryUploadUsageRepository();
testee = new UploadServiceDefaultImpl(uploadRepository, uploadUsageRepository, UploadServiceContract.TEST_CONFIGURATION());
diff --git a/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/BlobMailRepositoryTest.java b/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/BlobMailRepositoryTest.java
index b8b7c183f6..fbf0f8036e 100644
--- a/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/BlobMailRepositoryTest.java
+++ b/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/BlobMailRepositoryTest.java
@@ -19,7 +19,7 @@
package org.apache.james.mailrepository.blob;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessageStore;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.blob.memory.MemoryBlobStoreFactory;
@@ -34,14 +34,14 @@ import org.junit.jupiter.api.BeforeEach;
class BlobMailRepositoryTest implements MailRepositoryContract {
private MailRepository blobMailRepository;
- private HashBlobId.Factory blobIdFactory;
+ private PlainBlobId.Factory blobIdFactory;
private MemoryBlobStoreDAO blobStore;
private MimeMessageStore.Factory mimeMessageStoreFactory;
private BlobMailRepositoryFactory blobMailRepositoryFactory;
@BeforeEach
void setup() {
- blobIdFactory = new HashBlobId.Factory();
+ blobIdFactory = new PlainBlobId.Factory();
blobStore = new MemoryBlobStoreDAO();
var mimeMessageBlobStore = MemoryBlobStoreFactory.builder()
.blobIdFactory(blobIdFactory)
diff --git a/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/MailRepositoryBlobIdFactoryTest.java b/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/MailRepositoryBlobIdFactoryTest.java
index 7f6fb9d0f3..dc25461a91 100644
--- a/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/MailRepositoryBlobIdFactoryTest.java
+++ b/server/mailrepository/mailrepository-blob/src/test/java/org/apache/james/mailrepository/blob/MailRepositoryBlobIdFactoryTest.java
@@ -22,7 +22,7 @@ package org.apache.james.mailrepository.blob;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.mailrepository.api.MailRepositoryPath;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
import org.apache.james.mailrepository.api.Protocol;
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
class MailRepositoryBlobIdFactoryTest {
static String MAIL_REPOSITORY_PATH = "/var/mail/error";
- BlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ BlobId.Factory blobIdFactory = new PlainBlobId.Factory();
MailRepositoryUrl url = MailRepositoryUrl.fromPathAndProtocol(
new Protocol("blob"),
MailRepositoryPath.from(MAIL_REPOSITORY_PATH)
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
index f12c114940..fe0ee30eac 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
@@ -29,7 +29,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.BlobTables;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
@@ -49,7 +49,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraMailRepositoryTest {
static final MailRepositoryUrl URL = MailRepositoryUrl.from("proto://url");
- static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java
index 64920aabab..3a9d190c2c 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java
@@ -30,7 +30,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.BlobTables;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
@@ -55,7 +55,7 @@ class CassandraMailRepositoryWithFakeImplementationsTest {
CassandraSchemaVersionModule.MODULE));
private static final MailRepositoryUrl URL = MailRepositoryUrl.from("proto://url");
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
CassandraMailRepository cassandraMailRepository;
diff --git a/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java b/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java
index 072286d9c1..45c77a455a 100644
--- a/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java
+++ b/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.mailbox.MessageUid;
@@ -78,7 +78,7 @@ public class MetaDataFixInconsistenciesServiceTest {
private static final ModSeq MOD_SEQ_2 = ModSeq.of(2L);
private static final String CONTENT_MESSAGE = "CONTENT 123 BLA BLA";
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraMessageMetadata MESSAGE_1 = CassandraMessageMetadata.builder()
.ids(ComposedMessageIdWithMetaData.builder()
.composedMessageId(new ComposedMessageId(MAILBOX_ID, MESSAGE_ID_1, MESSAGE_UID_1))
@@ -161,7 +161,7 @@ public class MetaDataFixInconsistenciesServiceTest {
pop3MetadataStore = new CassandraPop3MetadataStore(cassandra.getConf());
imapUidDAO = new CassandraMessageIdToImapUidDAO(
cassandra.getConf(),
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
CassandraConfiguration.DEFAULT_CONFIGURATION);
cassandraMessageDAOV3 = new CassandraMessageDAOV3(
@@ -169,7 +169,7 @@ public class MetaDataFixInconsistenciesServiceTest {
cassandra.getTypesProvider(),
CassandraBlobStoreFactory.forTesting(cassandra.getConf(), new RecordingMetricFactory())
.passthrough(),
- new HashBlobId.Factory());
+ new PlainBlobId.Factory());
testee = new MetaDataFixInconsistenciesService(imapUidDAO, pop3MetadataStore, cassandraMessageDAOV3);
}
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java
index f612fab960..8f3204489e 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java
@@ -44,8 +44,8 @@ import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BlobStoreDAO;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectNotFoundException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.json.DTOConverter;
import org.apache.james.server.blob.deduplication.BlobGCTaskAdditionalInformationDTO;
@@ -76,7 +76,7 @@ import reactor.core.publisher.Mono;
class BlobRoutesTest {
private static final String BASE_PATH = "/blobs";
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private static final ZonedDateTime TIMESTAMP = ZonedDateTime.parse("2015-10-30T16:12:00Z");
private static final BucketName DEFAULT_BUCKET = BucketName.of("default");
private static final GenerationAwareBlobId.Configuration GENERATION_AWARE_BLOB_ID_CONFIGURATION = GenerationAwareBlobId.Configuration.DEFAULT;
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java
index 0414a6aa10..29a2e54b3c 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java
@@ -38,7 +38,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.core.Username;
import org.apache.james.jmap.api.model.UploadId;
@@ -99,10 +99,10 @@ class JmapUploadRoutesTest {
clock = new UpdatableTickingClock(TIMESTAMP.toInstant());
blobStore = new PassThroughBlobStore(new MemoryBlobStoreDAO(),
BucketName.of("default"),
- new HashBlobId.Factory());
+ new PlainBlobId.Factory());
cassandraUploadRepository = new CassandraUploadRepository(new UploadDAO(cassandraCluster.getCassandraCluster().getConf(),
- new HashBlobId.Factory()), blobStore, clock);
+ new PlainBlobId.Factory()), blobStore, clock);
JsonTransformer jsonTransformer = new JsonTransformer();
TasksRoutes tasksRoutes = new TasksRoutes(taskManager, jsonTransformer, DTOConverter.of(UploadCleanupTaskAdditionalInformationDTO.SERIALIZATION_MODULE));
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 39571fd587..33b7539449 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -75,7 +75,7 @@ import java.util.stream.Stream;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.export.api.BlobExportMechanism;
import org.apache.james.blob.memory.MemoryBlobStoreDAO;
import org.apache.james.core.Domain;
@@ -177,12 +177,12 @@ class DeletedMessagesVaultRoutesTest {
private DeletedMessageZipper zipper;
private MemoryUsersRepository usersRepository;
private ExportService exportService;
- private HashBlobId.Factory blobIdFactory;
+ private PlainBlobId.Factory blobIdFactory;
private UpdatableTickingClock clock;
@BeforeEach
void beforeEach() throws Exception {
- blobIdFactory = new HashBlobId.Factory();
+ blobIdFactory = new PlainBlobId.Factory();
MemoryBlobStoreDAO blobStoreDAO = new MemoryBlobStoreDAO();
blobStore = spy(BlobStoreFactory.builder()
.blobStoreDAO(blobStoreDAO)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
index e222b5ad67..c173676518 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
@@ -35,8 +35,8 @@ import java.io.InputStream;
import jakarta.mail.MessagingException;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectNotFoundException;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.export.api.FileExtension;
import org.apache.james.blob.export.file.FileSystemExtension;
import org.apache.james.core.Domain;
@@ -72,7 +72,7 @@ class ExportServiceTest {
"testmail";
private static final String TWELVE_MEGABYTES_STRING = Strings.repeat("0123456789\r\n", 1024 * 1024);
private static final String FILE_PREFIX = "mailbox-backup-";
- private static final BlobId.Factory FACTORY = new HashBlobId.Factory();
+ private static final BlobId.Factory FACTORY = new PlainBlobId.Factory();
private ExportService testee;
private ExportServiceTestSystem testSystem;
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java
index ff1133d943..26a973db14 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java
@@ -26,7 +26,7 @@ import java.net.UnknownHostException;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.export.api.BlobExportMechanism;
import org.apache.james.blob.export.file.LocalFileBlobExportMechanism;
import org.apache.james.blob.memory.MemoryBlobStoreFactory;
@@ -58,7 +58,7 @@ public class ExportServiceTestSystem {
public static final Username CEDRIC = Username.fromLocalPartWithDomain("cedric", DOMAIN);
public static final String PASSWORD = "password";
private static final String JAMES_HOST = "james-host";
- private static final BlobId.Factory FACTORY = new HashBlobId.Factory();
+ private static final BlobId.Factory FACTORY = new PlainBlobId.Factory();
final FakeMailContext mailetContext;
final InMemoryMailboxManager mailboxManager;
diff --git a/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java b/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
index 34f0aec4a8..86403f2e42 100644
--- a/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
@@ -35,7 +35,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.json.DTOConverter;
@@ -119,7 +119,7 @@ class Pop3MetaDataFixInconsistenciesRoutesTest {
private static final String CONTENT_MESSAGE = "CONTENT 123 BLA BLA";
private static final ModSeq MOD_SEQ_1 = ModSeq.of(1L);
private static final ModSeq MOD_SEQ_2 = ModSeq.of(2L);
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
+ private static final PlainBlobId HEADER_BLOB_ID_1 = new PlainBlobId.Factory().of("abc");
private static final CassandraMessageMetadata MESSAGE_1 = CassandraMessageMetadata.builder()
.ids(ComposedMessageIdWithMetaData.builder()
.composedMessageId(new ComposedMessageId(MAILBOX_ID, MESSAGE_ID_1, MESSAGE_UID_1))
@@ -178,7 +178,7 @@ class Pop3MetaDataFixInconsistenciesRoutesTest {
Pop3MetadataStore pop3MetadataStore = new CassandraPop3MetadataStore(cassandra.getConf());
imapUidDAO = new CassandraMessageIdToImapUidDAO(
cassandra.getConf(),
- new HashBlobId.Factory(),
+ new PlainBlobId.Factory(),
CassandraConfiguration.DEFAULT_CONFIGURATION);
cassandraMessageDAOV3 = new CassandraMessageDAOV3(
@@ -186,7 +186,7 @@ class Pop3MetaDataFixInconsistenciesRoutesTest {
cassandra.getTypesProvider(),
CassandraBlobStoreFactory.forTesting(cassandra.getConf(), new RecordingMetricFactory())
.passthrough(),
- new HashBlobId.Factory());
+ new PlainBlobId.Factory());
MetaDataFixInconsistenciesService fixInconsistenciesService = new MetaDataFixInconsistenciesService(imapUidDAO, pop3MetadataStore, cassandraMessageDAOV3);
taskManager = new MemoryTaskManager(new Hostname("foo"));
diff --git a/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueFactoryTest.java b/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueFactoryTest.java
index 2bb1db4df2..e7bcdc6f3c 100644
--- a/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueFactoryTest.java
+++ b/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueFactoryTest.java
@@ -29,7 +29,7 @@ import org.apache.james.backends.pulsar.DockerPulsarExtension;
import org.apache.james.backends.pulsar.PulsarClients;
import org.apache.james.backends.pulsar.PulsarConfiguration;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.api.Store;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.james.blob.mail.MimeMessageStore;
@@ -56,7 +56,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
class PulsarMailQueueFactoryTest implements MailQueueFactoryContract<PulsarMailQueue>, ManageableMailQueueFactoryContract<PulsarMailQueue> {
PulsarMailQueueFactory mailQueueFactory;
- private HashBlobId.Factory blobIdFactory;
+ private PlainBlobId.Factory blobIdFactory;
private Store<MimeMessage, MimeMessagePartsId> mimeMessageStore;
private MailQueueItemDecoratorFactory factory;
private PulsarConfiguration config;
@@ -67,7 +67,7 @@ class PulsarMailQueueFactoryTest implements MailQueueFactoryContract<PulsarMailQ
void setUp(DockerPulsarExtension.DockerPulsar dockerPulsar, MailQueueMetricExtension.MailQueueMetricTestSystem metricTestSystem) throws PulsarClientException, PulsarAdminException {
this.metricTestSystem = metricTestSystem;
- blobIdFactory = new HashBlobId.Factory();
+ blobIdFactory = new PlainBlobId.Factory();
MemoryBlobStoreDAO memoryBlobStore = new MemoryBlobStoreDAO();
PassThroughBlobStore blobStore = new PassThroughBlobStore(memoryBlobStore, BucketName.DEFAULT, blobIdFactory);
diff --git a/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueTest.java b/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueTest.java
index 4a2b468f4c..135210a630 100644
--- a/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueTest.java
+++ b/server/queue/queue-pulsar/src/test/java/org/apache/james/queue/pulsar/PulsarMailQueueTest.java
@@ -36,7 +36,7 @@ import org.apache.james.backends.pulsar.DockerPulsarExtension;
import org.apache.james.backends.pulsar.PulsarClients;
import org.apache.james.backends.pulsar.PulsarConfiguration;
import org.apache.james.blob.api.BucketName;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.api.Store;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.james.blob.mail.MimeMessageStore;
@@ -78,7 +78,7 @@ public class PulsarMailQueueTest implements MailQueueContract, MailQueueMetricCo
int maxConcurrency = 10;
PulsarMailQueue mailQueue;
- private HashBlobId.Factory blobIdFactory;
+ private PlainBlobId.Factory blobIdFactory;
private Store<MimeMessage, MimeMessagePartsId> mimeMessageStore;
private MailQueueItemDecoratorFactory factory;
private MailQueueName mailQueueName;
@@ -91,7 +91,7 @@ public class PulsarMailQueueTest implements MailQueueContract, MailQueueMetricCo
@BeforeEach
void setUp(DockerPulsarExtension.DockerPulsar pulsar, MailQueueMetricExtension.MailQueueMetricTestSystem metricTestSystem) {
this.metricTestSystem = metricTestSystem;
- blobIdFactory = new HashBlobId.Factory();
+ blobIdFactory = new PlainBlobId.Factory();
memoryBlobStore = new MemoryBlobStoreDAO();
PassThroughBlobStore blobStore = new PassThroughBlobStore(memoryBlobStore, BucketName.DEFAULT, blobIdFactory);
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
index 7ab7ba5e5e..b0546da7d6 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/EnqueuedItemTest.java
@@ -25,7 +25,7 @@ import java.time.Instant;
import jakarta.mail.MessagingException;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
@@ -45,8 +45,8 @@ class EnqueuedItemTest {
mail = FakeMail.defaultFakeMail();
enqueuedTime = Instant.now();
partsId = MimeMessagePartsId.builder()
- .headerBlobId(new HashBlobId.Factory().parse("headerBlobId"))
- .bodyBlobId(new HashBlobId.Factory().parse("bodyBlobId"))
+ .headerBlobId(new PlainBlobId.Factory().parse("headerBlobId"))
+ .bodyBlobId(new PlainBlobId.Factory().parse("bodyBlobId"))
.build();
}
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailDTOTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailDTOTest.java
index d0b42a2bec..a8c48093a7 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailDTOTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailDTOTest.java
@@ -28,7 +28,7 @@ import java.util.Date;
import jakarta.mail.MessagingException;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.james.server.core.MailImpl;
import org.apache.mailet.Attribute;
@@ -47,7 +47,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
class MailDTOTest {
static final EnqueueId EN_QUEUE_ID = EnqueueId.ofSerialized("110e8400-e29b-11d4-a716-446655440000");
- static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
static final Date LAST_UPDATED = Date.from(Instant.parse("2016-09-08T14:25:52.000Z"));
private ObjectMapper objectMapper;
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailLoaderTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailLoaderTest.java
index 2e54737af1..901f02bdb9 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailLoaderTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/MailLoaderTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
import jakarta.mail.internet.MimeMessage;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.api.Store;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.junit.jupiter.api.Test;
@@ -40,7 +40,7 @@ class MailLoaderTest {
when(store.read(any())).thenReturn(Mono.error(new RuntimeException("Cassandra problem")));
MailReferenceDTO dto = mock(MailReferenceDTO.class);
when(dto.toMailReference(any())).thenReturn(mock(MailReference.class));
- MailLoader loader = new MailLoader(store, new HashBlobId.Factory());
+ MailLoader loader = new MailLoader(store, new PlainBlobId.Factory());
String result = loader.load(dto)
.thenReturn("continued")
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java
index 45cfea2b43..7f26d3284c 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java
@@ -36,7 +36,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.backends.rabbitmq.RabbitMQExtension;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.blob.mail.MimeMessageStore;
@@ -71,7 +71,7 @@ import com.datastax.oss.driver.api.core.CqlSession;
import com.github.fge.lambdas.Throwing;
class RabbitMQMailQueueConfigurationChangeTest {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private static final int THREE_BUCKET_COUNT = 3;
private static final int UPDATE_BROWSE_START_PACE = 2;
private static final Duration ONE_HOUR_SLICE_WINDOW = Duration.ofHours(1);
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
index 5f1cf5b4a8..802a3d6daa 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
@@ -60,7 +60,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.backends.rabbitmq.RabbitMQExtension;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.cassandra.BlobTables;
import org.apache.james.blob.cassandra.CassandraBlobModule;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
@@ -109,7 +109,7 @@ import reactor.rabbitmq.OutboundMessage;
import reactor.rabbitmq.Sender;
class RabbitMQMailQueueTest {
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private static final int THREE_BUCKET_COUNT = 3;
private static final int UPDATE_BROWSE_START_PACE = 25;
private static final Duration ONE_HOUR_SLICE_WINDOW = Duration.ofHours(1);
@@ -398,7 +398,7 @@ class RabbitMQMailQueueTest {
dequeueMails(emailCount);
// ensure slice 1 was cleaned
- EnqueuedMailsDAO mailsDAO = new EnqueuedMailsDAO(cassandraCluster.getCassandraCluster().getConf(), new HashBlobId.Factory());
+ EnqueuedMailsDAO mailsDAO = new EnqueuedMailsDAO(cassandraCluster.getCassandraCluster().getConf(), new PlainBlobId.Factory());
MailQueueName queueName = MailQueueName.fromString(mailQueue.getName().asString());
Slice slice = Slice.of(currentSliceStartInstant(IN_SLICE_1));
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
index cea76fdd8a..fb99a4fef0 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
@@ -32,7 +32,7 @@ import java.time.Clock;
import org.apache.james.backends.rabbitmq.RabbitMQExtension;
import org.apache.james.backends.rabbitmq.RabbitMQManagementAPI;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessageStore;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
@@ -51,7 +51,7 @@ import reactor.rabbitmq.QueueSpecification;
class RabbitMqMailQueueFactoryTest implements MailQueueFactoryContract<RabbitMQMailQueue> {
private static final String VHOST = "vhost1";
- private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final PlainBlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
@RegisterExtension
static RabbitMQExtension rabbitMQExtension = RabbitMQExtension.singletonRabbitMQ()
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/api/DeleteConditionTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/api/DeleteConditionTest.java
index 9593e359cd..82c2a4401b 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/api/DeleteConditionTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/api/DeleteConditionTest.java
@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.time.Instant;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.james.core.MailAddress;
import org.apache.james.queue.api.ManageableMailQueue;
@@ -47,8 +47,8 @@ class DeleteConditionTest {
private static final MailQueueName OUT_GOING_1 = MailQueueName.fromString("OUT_GOING_1");
private static final Instant ENQUEUE_TIME = Instant.now();
private static final MimeMessagePartsId MESSAGE_PARTS_ID = MimeMessagePartsId.builder()
- .headerBlobId(new HashBlobId.Factory().parse("headerBlobId"))
- .bodyBlobId(new HashBlobId.Factory().parse("bodyBlobId"))
+ .headerBlobId(new PlainBlobId.Factory().parse("headerBlobId"))
+ .bodyBlobId(new PlainBlobId.Factory().parse("bodyBlobId"))
.build();
@Nested
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java
index 8b36012c82..c55f6e5c35 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueViewTestFactory.java
@@ -22,7 +22,7 @@ package org.apache.james.queue.rabbitmq.view.cassandra;
import java.time.Clock;
import java.util.Optional;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessageStore;
import org.apache.james.queue.rabbitmq.MailQueueName;
import org.apache.james.queue.rabbitmq.view.cassandra.configuration.CassandraMailQueueViewConfiguration;
@@ -35,7 +35,7 @@ public class CassandraMailQueueViewTestFactory {
public static CassandraMailQueueView.Factory factory(Clock clock, CqlSession session,
CassandraMailQueueViewConfiguration configuration,
MimeMessageStore.Factory mimeMessageStoreFactory) {
- HashBlobId.Factory blobIdFactory = new HashBlobId.Factory();
+ PlainBlobId.Factory blobIdFactory = new PlainBlobId.Factory();
EnqueuedMailsDAO enqueuedMailsDao = new EnqueuedMailsDAO(session, blobIdFactory);
BrowseStartDAO browseStartDao = new BrowseStartDAO(session);
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoTest.java
index 27dee9acde..b70e7a01d7 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDaoTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.james.queue.rabbitmq.EnqueueId;
import org.apache.james.queue.rabbitmq.EnqueuedItem;
@@ -54,7 +54,7 @@ class EnqueuedMailsDaoTest {
private static final Instant NOW = Instant.now();
private static final Slice SLICE_OF_NOW = Slice.of(NOW);
- private static final BlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
+ private static final BlobId.Factory BLOB_ID_FACTORY = new PlainBlobId.Factory();
private static final BlobId HEADER_BLOB_ID = BLOB_ID_FACTORY.parse("header blob id");
private static final BlobId BODY_BLOB_ID = BLOB_ID_FACTORY.parse("body blob id");
private static final MimeMessagePartsId MIME_MESSAGE_PARTS_ID = MimeMessagePartsId.builder()
@@ -71,7 +71,7 @@ class EnqueuedMailsDaoTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- BlobId.Factory blobFactory = new HashBlobId.Factory();
+ BlobId.Factory blobFactory = new PlainBlobId.Factory();
testee = new EnqueuedMailsDAO(
cassandra.getConf(),
blobFactory);
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
index 38f7710609..e6476c1e01 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/model/EnqueuedItemWithSlicingContextTest.java
@@ -25,7 +25,7 @@ import java.time.Instant;
import jakarta.mail.MessagingException;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.mail.MimeMessagePartsId;
import org.apache.james.queue.rabbitmq.EnqueueId;
import org.apache.james.queue.rabbitmq.EnqueuedItem;
@@ -49,8 +49,8 @@ class EnqueuedItemWithSlicingContextTest {
.build())
.enqueuedTime(Instant.now())
.mimeMessagePartsId(MimeMessagePartsId.builder()
- .headerBlobId(new HashBlobId.Factory().parse("headerBlodId"))
- .bodyBlobId(new HashBlobId.Factory().parse("bodyBlodId"))
+ .headerBlobId(new PlainBlobId.Factory().parse("headerBlodId"))
+ .bodyBlobId(new PlainBlobId.Factory().parse("bodyBlodId"))
.build())
.build();
slicingContext = EnqueuedItemWithSlicingContext.SlicingContext.of(BucketedSlices.BucketId.of(1), Instant.now());
diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java
index 8923d3c3b2..3795267ec1 100644
--- a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java
+++ b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java
@@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.api.PlainBlobId;
import org.apache.james.blob.export.api.BlobExportMechanism;
import org.apache.james.blob.export.api.FileExtension;
import org.apache.james.blob.memory.MemoryBlobStoreFactory;
@@ -55,12 +55,12 @@ class LinshareBlobExportMechanismTest {
private BlobStore blobStore;
private LinshareBlobExportMechanism testee;
- private HashBlobId.Factory blobIdFactory;
+ private PlainBlobId.Factory blobIdFactory;
private LinshareAPIForUserTesting user2API;
@BeforeEach
void setUp() throws Exception {
- blobIdFactory = new HashBlobId.Factory();
+ blobIdFactory = new PlainBlobId.Factory();
blobStore = MemoryBlobStoreFactory.builder()
.blobIdFactory(blobIdFactory)
.defaultBucketName()
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org