You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/05/22 02:45:54 UTC
[james-project] 01/06: JAMES-3140 cacheEnabled option for
BlobStoreConfiguration
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 0b7f239101d98697a777d411797fe5ec1675aef5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 21 09:40:14 2020 +0700
JAMES-3140 cacheEnabled option for BlobStoreConfiguration
---
.../modules/blobstore/BlobStoreConfiguration.java | 46 +++++++++++++++++-----
.../james/CassandraRabbitMQAwsS3JmapTestRule.java | 2 +-
.../james/CassandraRabbitMQJamesServerFixture.java | 2 +-
.../james/CassandraRabbitMQSwiftJmapTestRule.java | 2 +-
.../blobstore/BlobStoreConfigurationTest.java | 31 ++++++++++++++-
.../blobstore/BlobStoreModulesChooserTest.java | 2 +-
.../CassandraRabbitMQLdapJmapJamesServerTest.java | 4 +-
.../rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 2 +-
.../RabbitMQAwsS3SpamAssassinContractTest.java | 2 +-
.../cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 2 +-
.../distributed/DistributedEchoMethodTest.java | 2 +-
.../rabbitmq/ConsistencyTasksIntegrationTest.java | 2 +-
.../rabbitmq/FixingGhostMailboxTest.java | 2 +-
.../rabbitmq/RabbitMQAuthorizedEndpointsTest.java | 2 +-
.../RabbitMQEventDeadLettersIntegrationTest.java | 2 +-
...stViewProjectionHealthCheckIntegrationTest.java | 2 +-
.../rabbitmq/RabbitMQForwardIntegrationTest.java | 2 +-
.../rabbitmq/RabbitMQJmapExtension.java | 2 +-
.../rabbitmq/RabbitMQJwtFilterIntegrationTest.java | 2 +-
...RabbitMQReindexingWithEventDeadLettersTest.java | 2 +-
.../RabbitMQWebAdminServerIntegrationTest.java | 2 +-
...dminServerTaskSerializationIntegrationTest.java | 2 +-
...RabbitMQDeletedMessageVaultIntegrationTest.java | 2 +-
...LinshareBlobExportMechanismIntegrationTest.java | 2 +-
24 files changed, 90 insertions(+), 33 deletions(-)
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/blobstore/BlobStoreConfiguration.java b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/blobstore/BlobStoreConfiguration.java
index bc210f6..c6044fa 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/blobstore/BlobStoreConfiguration.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/blobstore/BlobStoreConfiguration.java
@@ -39,6 +39,22 @@ import com.google.common.base.MoreObjects;
public class BlobStoreConfiguration {
private static final Logger LOGGER = LoggerFactory.getLogger(BlobStoreConfiguration.class);
+ public static class CacheChoice {
+ private final BlobStoreImplName implementation;
+
+ private CacheChoice(BlobStoreImplName implementation) {
+ this.implementation = implementation;
+ }
+
+ public BlobStoreConfiguration enableCache() {
+ return new BlobStoreConfiguration(implementation, CACHE_ENABLED);
+ }
+
+ public BlobStoreConfiguration disableCache() {
+ return new BlobStoreConfiguration(implementation, !CACHE_ENABLED);
+ }
+ }
+
public enum BlobStoreImplName {
CASSANDRA("cassandra"),
OBJECTSTORAGE("objectstorage"),
@@ -70,6 +86,8 @@ public class BlobStoreConfiguration {
}
static final String BLOBSTORE_IMPLEMENTATION_PROPERTY = "implementation";
+ static final String CACHE_ENABLE_PROPERTY = "cache.enable";
+ static final boolean CACHE_ENABLED = true;
public static BlobStoreConfiguration parse(org.apache.james.server.core.configuration.Configuration configuration) throws ConfigurationException {
PropertiesProvider propertiesProvider = new PropertiesProvider(new FileSystemImpl(configuration.directories()),
@@ -96,25 +114,33 @@ public class BlobStoreConfiguration {
.orElseThrow(() -> new IllegalStateException(String.format("%s property is missing please use one of " +
"supported values in: %s", BLOBSTORE_IMPLEMENTATION_PROPERTY, BlobStoreImplName.supportedImplNames())));
- return new BlobStoreConfiguration(blobStoreImplName);
+ boolean cacheEnabled = configuration.getBoolean(CACHE_ENABLE_PROPERTY, false);
+
+ return new BlobStoreConfiguration(blobStoreImplName, cacheEnabled);
}
public static BlobStoreConfiguration cassandra() {
- return new BlobStoreConfiguration(BlobStoreImplName.CASSANDRA);
+ return new BlobStoreConfiguration(BlobStoreImplName.CASSANDRA, !CACHE_ENABLED);
}
- public static BlobStoreConfiguration objectStorage() {
- return new BlobStoreConfiguration(BlobStoreImplName.OBJECTSTORAGE);
+ public static CacheChoice objectStorage() {
+ return new CacheChoice(BlobStoreImplName.OBJECTSTORAGE);
}
public static BlobStoreConfiguration hybrid() {
- return new BlobStoreConfiguration(BlobStoreImplName.HYBRID);
+ return new BlobStoreConfiguration(BlobStoreImplName.HYBRID, !CACHE_ENABLED);
}
private final BlobStoreImplName implementation;
+ private final boolean cacheEnabled;
+
+ BlobStoreConfiguration(BlobStoreImplName implementation, boolean cacheEnabled) {
+ this.implementation = implementation;
+ this.cacheEnabled = cacheEnabled;
+ }
- BlobStoreConfiguration(BlobStoreImplName implementation) {
- this.implementation = implementation;
+ public boolean cacheEnabled() {
+ return cacheEnabled;
}
BlobStoreImplName getImplementation() {
@@ -126,20 +152,22 @@ public class BlobStoreConfiguration {
if (o instanceof BlobStoreConfiguration) {
BlobStoreConfiguration that = (BlobStoreConfiguration) o;
- return Objects.equals(this.implementation, that.implementation);
+ return Objects.equals(this.implementation, that.implementation)
+ && Objects.equals(this.cacheEnabled, that.cacheEnabled);
}
return false;
}
@Override
public final int hashCode() {
- return Objects.hash(implementation);
+ return Objects.hash(implementation, cacheEnabled);
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("implementation", implementation)
+ .add("cacheEnabled", cacheEnabled)
.toString();
}
}
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
index 06b3849..2dbaf51 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
@@ -64,7 +64,7 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule {
CassandraRabbitMQJamesConfiguration configuration = CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(temporaryFolder.newFolder())
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build();
return CassandraRabbitMQJamesServerMain.createServer(configuration)
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
index daf7539..3d220f0 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
@@ -40,7 +40,7 @@ public class CassandraRabbitMQJamesServerFixture {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java
index 009e6a8..2ed747f 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java
@@ -63,7 +63,7 @@ public class CassandraRabbitMQSwiftJmapTestRule implements TestRule {
CassandraRabbitMQJamesConfiguration configuration = CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(temporaryFolder.newFolder())
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build();
return CassandraRabbitMQJamesServerMain.createServer(configuration)
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationTest.java
index 0d65d03..a1ae0c7 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationTest.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationTest.java
@@ -97,7 +97,7 @@ class BlobStoreConfigurationTest {
.build();
assertThat(parse(propertyProvider))
- .isEqualTo(BlobStoreConfiguration.objectStorage());
+ .isEqualTo(BlobStoreConfiguration.objectStorage().disableCache());
}
@Test
@@ -223,4 +223,33 @@ class BlobStoreConfigurationTest {
.getName())
.isEqualTo(CASSANDRA);
}
+
+ @Test
+ void cacheEnabledShouldBeTrueWhenSpecified() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.addProperty("implementation", BlobStoreConfiguration.BlobStoreImplName.OBJECTSTORAGE.getName());
+ configuration.addProperty("cache.enable", true);
+
+ assertThat(BlobStoreConfiguration.from(configuration).cacheEnabled())
+ .isTrue();
+ }
+
+ @Test
+ void cacheEnabledShouldBeFalseWhenSpecified() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.addProperty("implementation", BlobStoreConfiguration.BlobStoreImplName.OBJECTSTORAGE.getName());
+ configuration.addProperty("cache.enable", false);
+
+ assertThat(BlobStoreConfiguration.from(configuration).cacheEnabled())
+ .isFalse();
+ }
+
+ @Test
+ void cacheEnabledShouldDefaultToFalse() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.addProperty("implementation", BlobStoreConfiguration.BlobStoreImplName.OBJECTSTORAGE.getName());
+
+ assertThat(BlobStoreConfiguration.from(configuration).cacheEnabled())
+ .isFalse();
+ }
}
\ No newline at end of file
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreModulesChooserTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreModulesChooserTest.java
index d736aa8..2b77046 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreModulesChooserTest.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreModulesChooserTest.java
@@ -84,7 +84,7 @@ class BlobStoreModulesChooserTest {
@Test
void provideBlobStoreShouldReturnObjectStoreBlobStoreWhenObjectStoreConfigured() {
- assertThat(BlobStoreModulesChooser.chooseModules(BlobStoreConfiguration.objectStorage()))
+ assertThat(BlobStoreModulesChooser.chooseModules(BlobStoreConfiguration.objectStorage().disableCache()))
.first()
.isInstanceOf(BlobStoreModulesChooser.ObjectStorageDeclarationModule.class);
}
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
index 5a5f671..192adbc 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
@@ -57,7 +57,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class WithSwift implements ContractSuite {
@RegisterExtension
- JamesServerExtension testExtension = baseJamesServerExtensionBuilder(BlobStoreConfiguration.objectStorage())
+ JamesServerExtension testExtension = baseJamesServerExtensionBuilder(BlobStoreConfiguration.objectStorage().disableCache())
.extension(new SwiftBlobStoreExtension())
.build();
}
@@ -66,7 +66,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class WithAwsS3 implements ContractSuite {
@RegisterExtension
- JamesServerExtension testExtension = baseJamesServerExtensionBuilder(BlobStoreConfiguration.objectStorage())
+ JamesServerExtension testExtension = baseJamesServerExtensionBuilder(BlobStoreConfiguration.objectStorage().disableCache())
.extension(new AwsS3BlobStoreExtension())
.build();
}
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
index cb04b94..7233fb9 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
@@ -43,7 +43,7 @@ public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java
index 1c688de..3856cc8 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java
@@ -42,7 +42,7 @@ class RabbitMQAwsS3SpamAssassinContractTest implements SpamAssassinContract {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
index f9b4911..846f808 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
@@ -80,7 +80,7 @@ public class RabbitMQAwsS3Stepdefs {
CassandraRabbitMQJamesConfiguration configuration = CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(temporaryFolder.newFolder())
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build();
mainStepdefs.jmapServer = CassandraRabbitMQJamesServerMain.createServer(configuration)
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java
index 0785c18..c55787b 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java
@@ -40,7 +40,7 @@ public class DistributedEchoMethodTest implements EchoMethodContract {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java
index 732db78..5475b55 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java
@@ -127,7 +127,7 @@ class ConsistencyTasksIntegrationTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
index 94f85fd..03bd915 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
@@ -114,7 +114,7 @@ class FixingGhostMailboxTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
index 3e705ba..e4aeac4 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
@@ -43,7 +43,7 @@ class RabbitMQAuthorizedEndpointsTest extends AuthorizedEndpointsTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
index ba29e44..0057187 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
@@ -204,7 +204,7 @@ class RabbitMQEventDeadLettersIntegrationTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java
index f075d89..0871e29 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java
@@ -39,7 +39,7 @@ class RabbitMQFastViewProjectionHealthCheckIntegrationTest extends FastViewProje
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
index 21b3475..b7b726a 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
@@ -39,7 +39,7 @@ class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
index 3854232..de4760a 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java
@@ -151,7 +151,7 @@ public class RabbitMQJmapExtension implements BeforeAllCallback, AfterAllCallbac
CassandraRabbitMQJamesConfiguration configuration = CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(temporaryFolder.newFolder())
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build();
return CassandraRabbitMQJamesServerMain.createServer(configuration)
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
index 57d3f34..e3f68d2 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
@@ -41,7 +41,7 @@ class RabbitMQJwtFilterIntegrationTest extends JwtFilterIntegrationTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
index bac2a47..a16607b 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
@@ -86,7 +86,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(dockerElasticSearch)
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
index 8e1ba0d..0a1f4c8 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
@@ -63,7 +63,7 @@ class RabbitMQWebAdminServerIntegrationTest extends WebAdminServerIntegrationTes
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index 855ee86..0c165d2 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -102,7 +102,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
index ff6780f..31b6392 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
@@ -43,7 +43,7 @@ class RabbitMQDeletedMessageVaultIntegrationTest extends DeletedMessageVaultInte
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(ES_EXTENSION)
.extension(new CassandraExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
index 36ee9a1..2a175d6 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
@@ -45,7 +45,7 @@ class RabbitMQLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExp
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .blobStore(BlobStoreConfiguration.objectStorage())
+ .blobStore(BlobStoreConfiguration.objectStorage().disableCache())
.build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org