You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/05/17 01:40:29 UTC
[james-project] 01/07: [REFACTORING] More fluent Cassandra statement recording
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 527eeec9281bf0cf2507de57371c3244412f0cf9
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue May 2 09:28:48 2023 +0700
[REFACTORING] More fluent Cassandra statement recording
---
.../backends/cassandra/StatementRecorder.java | 2 +-
.../james/backends/cassandra/TestingSession.java | 4 ++-
.../backends/cassandra/TestingSessionTest.java | 9 +++----
.../CassandraMessageIdManagerSideEffectTest.java | 3 +--
.../mail/CassandraIndexTableHandlerTest.java | 3 +--
.../mail/CassandraMessageIdMapperTest.java | 3 +--
.../cassandra/mail/CassandraMessageMapperTest.java | 27 +++++++------------
.../quota/CassandraPerUserMaxQuotaManagerTest.java | 3 +--
.../cassandra/CassandraListingTest.java | 9 +++----
.../org/apache/james/CassandraCacheQueryTest.java | 3 +--
.../blob/cassandra/cache/CachedBlobStoreTest.java | 3 +--
.../modules/mailbox/CassandraMailboxModule.java | 6 +++--
.../domainlist/cassandra/CacheDomainListTest.java | 6 ++---
.../jmap/rfc8621/distributed/ReadLevelTest.java | 30 +++++++++-------------
14 files changed, 44 insertions(+), 67 deletions(-)
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/StatementRecorder.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/StatementRecorder.java
index 412bc15162..99a0d59908 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/StatementRecorder.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/StatementRecorder.java
@@ -54,7 +54,7 @@ public class StatementRecorder {
private final ConcurrentLinkedDeque statements;
- public StatementRecorder() {
+ StatementRecorder() {
statements = new ConcurrentLinkedDeque();
}
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSession.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSession.java
index 40cfa5404f..226c60ae5c 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSession.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSession.java
@@ -84,8 +84,10 @@ public class TestingSession implements CqlSession {
this.scenario = Scenario.combine(hooks);
}
- public void recordStatements(StatementRecorder statementRecorder) {
+ public StatementRecorder recordStatements() {
+ StatementRecorder statementRecorder = new StatementRecorder();
this.statementRecorder = Optional.of(statementRecorder);
+ return statementRecorder;
}
public void stopRecordingStatements() {
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSessionTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSessionTest.java
index 7ba95d0395..537051313a 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSessionTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/TestingSessionTest.java
@@ -94,8 +94,7 @@ class TestingSessionTest {
@Test
void recordStatementsShouldKeepTraceOfExecutedStatement(CassandraCluster cassandra) {
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
dao.getCurrentSchemaVersion().block();
@@ -106,8 +105,7 @@ class TestingSessionTest {
@Test
void recordStatementsShouldKeepTraceOfExecutedStatements(CassandraCluster cassandra) {
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
dao.updateVersion(new SchemaVersion(36)).block();
dao.getCurrentSchemaVersion().block();
@@ -123,8 +121,7 @@ class TestingSessionTest {
void recordStatementsShouldNotKeepTraceOfExecutedStatementsBeforeRecording(CassandraCluster cassandra) {
dao.getCurrentSchemaVersion().block();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
assertThat(statementRecorder.listExecutedStatements())
.isEmpty();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
index f42072662f..53a30ed462 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
@@ -59,8 +59,7 @@ class CassandraMessageIdManagerSideEffectTest extends AbstractMessageIdManagerSi
givenUnlimitedQuota();
MessageId messageId = testingData.persist(mailbox2.getMailboxId(), messageUid1, FLAGS, session);
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageIdManager.setInMailboxes(messageId, ImmutableList.of(mailbox1.getMailboxId()), session);
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
index 9ce0044338..bced64eb7f 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
@@ -139,8 +139,7 @@ class CassandraIndexTableHandlerTest {
.times(1)
.whenQueryStartsWith("UPDATE mailboxcounters SET count=count+1, unseen=unseen+1 WHERE mailboxid=:mailboxid"));
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
testee.updateIndexOnAdd(message, MAILBOX_ID)
.block();
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 f493c188d3..2c1cb4f8eb 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
@@ -129,8 +129,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
mapperFactory.getMessageIdMapper(MAILBOX_SESSION).setFlags(message1.getMessageId(),
ImmutableList.of(message1.getMailboxId()),
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 e6bc711bdf..2cf24fbbfc 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
@@ -107,8 +107,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
// expected
}
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
FlagsUpdateCalculator markAsRead = new FlagsUpdateCalculator(new Flags(Flags.Flag.SEEN), MessageManager.FlagsUpdateMode.ADD);
messageMapper.updateFlags(benwaInboxMailbox, markAsRead, MessageRange.all());
@@ -122,8 +121,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void deleteMessagesShouldGroupMessageReads(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.deleteMessages(benwaInboxMailbox, ImmutableList.of(message1.getUid(), message2.getUid(), message3.getUid()));
@@ -136,8 +134,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void deleteMessagesShouldGroupCounterUpdates(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.deleteMessages(benwaInboxMailbox, ImmutableList.of(message1.getUid(), message2.getUid(), message3.getUid()));
@@ -150,8 +147,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void deleteMessagesShouldNotDeleteMessageNotMarkedAsDeletedInDeletedProjection(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.deleteMessages(benwaInboxMailbox, ImmutableList.of(message1.getUid(), message2.getUid(), message3.getUid()));
@@ -164,8 +160,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void deleteMessagesShouldNotDeleteMessageNotMarkedAsRecentInRecentProjection(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.deleteMessages(benwaInboxMailbox, ImmutableList.of(message1.getUid(), message2.getUid(), message3.getUid()));
@@ -180,8 +175,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
FlagsUpdateCalculator markAsRead = new FlagsUpdateCalculator(new Flags(Flags.Flag.SEEN), MessageManager.FlagsUpdateMode.ADD);
messageMapper.updateFlags(benwaInboxMailbox, markAsRead, MessageRange.all());
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.deleteMessages(benwaInboxMailbox, ImmutableList.of(message1.getUid(), message2.getUid(), message3.getUid()));
@@ -194,8 +188,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void updateFlagsShouldUpdateMailboxCountersOnce(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.updateFlags(benwaInboxMailbox, new FlagsUpdateCalculator(new Flags(Flags.Flag.SEEN), MessageManager.FlagsUpdateMode.REPLACE), MessageRange.all());
@@ -209,8 +202,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void findInMailboxLimitShouldLimitProjectionReadCassandraQueries(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
int limit = 2;
consume(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.all(), FetchType.FULL, limit));
@@ -225,8 +217,7 @@ class CassandraMessageMapperTest extends MessageMapperTest {
void updateFlagsShouldLimitModSeqAllocation(CassandraCluster cassandra) throws MailboxException {
saveMessages();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
messageMapper.updateFlags(benwaInboxMailbox, new FlagsUpdateCalculator(new Flags(Flags.Flag.ANSWERED), MessageManager.FlagsUpdateMode.REPLACE), MessageRange.all());
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
index d678b014e4..140ac4a522 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
@@ -48,8 +48,7 @@ class CassandraPerUserMaxQuotaManagerTest extends GenericMaxQuotaManagerTest {
@Test
void quotaDetailsShouldGroupStatements(CassandraCluster cassandra) {
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
maxQuotaManager.quotaDetails(QUOTA_ROOT);
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java
index 4284d14b58..baeca2f41d 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java
@@ -31,7 +31,7 @@ import org.apache.james.mpt.imapmailbox.suite.Listing;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-public class CassandraListingTest extends Listing {
+class CassandraListingTest extends Listing {
@RegisterExtension
static CassandraHostSystemExtension hostSystemExtension = new CassandraHostSystemExtension();
@@ -41,12 +41,11 @@ public class CassandraListingTest extends Listing {
}
@Test
- public void listShouldNotReadCounters() throws Exception {
+ void listShouldNotReadCounters() throws Exception {
CassandraHostSystem cassandraHostSystem = (CassandraHostSystem) this.system;
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandraHostSystem.getCassandra()
+ StatementRecorder statementRecorder = cassandraHostSystem.getCassandra()
.getConf()
- .recordStatements(statementRecorder);
+ .recordStatements();
simpleScriptedTestProtocol
.withLocale(Locale.US)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraCacheQueryTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraCacheQueryTest.java
index f67644828f..b24511891a 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraCacheQueryTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraCacheQueryTest.java
@@ -117,7 +117,6 @@ class CassandraCacheQueryTest {
@BeforeAll
static void beforeEach(GuiceJamesServer server) throws Exception {
- statementRecorder = new StatementRecorder();
server.getProbe(DataProbeImpl.class).fluent()
.addDomain(DOMAIN)
.addUser(JAMES_USER, PASSWORD);
@@ -125,7 +124,7 @@ class CassandraCacheQueryTest {
MailboxProbeImpl mailboxProbe = server.getProbe(MailboxProbeImpl.class);
mailboxProbe.createMailbox("#private", JAMES_USER, DefaultMailboxes.INBOX);
- server.getProbe(TestingSessionProbe.class).getTestingSession().recordStatements(statementRecorder);
+ statementRecorder = server.getProbe(TestingSessionProbe.class).getTestingSession().recordStatements();
sendAMail(server);
readAMail(server);
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 c273a25316..d4ced32241 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
@@ -370,8 +370,7 @@ public class CachedBlobStoreTest implements BlobStoreContract {
.save(message)
.block();
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
mimeMessageStore.read(partsId).block();
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
index cd0a699521..174ed29b0b 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
@@ -27,6 +27,7 @@ import org.apache.james.adapter.mailbox.MailboxUsernameChangeTaskStep;
import org.apache.james.adapter.mailbox.QuotaUsernameChangeTaskStep;
import org.apache.james.adapter.mailbox.UserRepositoryAuthenticator;
import org.apache.james.backends.cassandra.components.CassandraModule;
+import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager;
import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.events.EventListener;
@@ -257,11 +258,12 @@ public class CassandraMailboxModule extends AbstractModule {
CassandraUserMailboxRightsDAO userMailboxRightsDAO,
CassandraACLDAOV2 cassandraACLDAOV2,
CqlSession session,
- CassandraSchemaVersionManager cassandraSchemaVersionManager) {
+ CassandraSchemaVersionManager cassandraSchemaVersionManager,
+ CassandraConfiguration cassandraConfiguration) {
return new CassandraACLMapper(storeV1,
new CassandraACLMapper.StoreV2(userMailboxRightsDAO, cassandraACLDAOV2,
new CassandraEventStore(new EventStoreDao(session, JsonEventSerializer.forModules(ACLModule.ACL_UPDATE).withoutNestedType()))),
- cassandraSchemaVersionManager);
+ cassandraSchemaVersionManager, cassandraConfiguration);
}
@Singleton
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CacheDomainListTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CacheDomainListTest.java
index 39585a42f1..08a9c21981 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CacheDomainListTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CacheDomainListTest.java
@@ -66,8 +66,7 @@ class CacheDomainListTest {
void containsShouldBeCached(CassandraCluster cassandra) throws DomainListException {
domainList.addDomain(DOMAIN_1);
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
Flux.range(0, 10)
.doOnNext(Throwing.consumer(i -> domainList.containsDomain(DOMAIN_1)))
@@ -82,8 +81,7 @@ class CacheDomainListTest {
void cacheShouldBeRefreshedPeriodicallyUnderReadLoad(CassandraCluster cassandra) throws DomainListException {
domainList.addDomain(DOMAIN_1);
- StatementRecorder statementRecorder = new StatementRecorder();
- cassandra.getConf().recordStatements(statementRecorder);
+ StatementRecorder statementRecorder = cassandra.getConf().recordStatements();
Flux.range(0, 6)
.delayElements(Duration.ofMillis(500))
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/ReadLevelTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java
index 6fb0301786..8752eb5897 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java
@@ -142,10 +142,9 @@ class ReadLevelTest {
@Test
void gettingEmailMetadataShouldNotReadBlobs(GuiceJamesServer server) {
- StatementRecorder statementRecorder = new StatementRecorder();
- server.getProbe(TestingSessionProbe.class)
+ StatementRecorder statementRecorder = server.getProbe(TestingSessionProbe.class)
.getTestingSession()
- .recordStatements(statementRecorder);
+ .recordStatements();
String request = "{" +
" \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\"]," +
@@ -171,10 +170,9 @@ class ReadLevelTest {
@Test
void gettingEmailHeadersShouldReadBlobOnce(GuiceJamesServer server) {
- StatementRecorder statementRecorder = new StatementRecorder();
- server.getProbe(TestingSessionProbe.class)
+ StatementRecorder statementRecorder = server.getProbe(TestingSessionProbe.class)
.getTestingSession()
- .recordStatements(statementRecorder);
+ .recordStatements();
String request = "{" +
" \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\"]," +
@@ -202,10 +200,9 @@ class ReadLevelTest {
@Test
void gettingEmailFastViewShouldReadBlobOnce(GuiceJamesServer server) {
- StatementRecorder statementRecorder = new StatementRecorder();
- server.getProbe(TestingSessionProbe.class)
+ StatementRecorder statementRecorder = server.getProbe(TestingSessionProbe.class)
.getTestingSession()
- .recordStatements(statementRecorder);
+ .recordStatements();
String request = "{" +
" \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\"]," +
@@ -236,10 +233,9 @@ class ReadLevelTest {
void gettingEmailFastViewShouldReadBlobTwiceUponCacheMisses(GuiceJamesServer server) {
server.getProbe(JmapGuiceProbe.class).clearMessageFastViewProjection();
- StatementRecorder statementRecorder = new StatementRecorder();
- server.getProbe(TestingSessionProbe.class)
+ StatementRecorder statementRecorder = server.getProbe(TestingSessionProbe.class)
.getTestingSession()
- .recordStatements(statementRecorder);
+ .recordStatements();
String request = "{" +
" \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\"]," +
@@ -292,10 +288,9 @@ class ReadLevelTest {
.then()
.statusCode(SC_OK);
- StatementRecorder statementRecorder = new StatementRecorder();
- server.getProbe(TestingSessionProbe.class)
+ StatementRecorder statementRecorder = server.getProbe(TestingSessionProbe.class)
.getTestingSession()
- .recordStatements(statementRecorder);
+ .recordStatements();
with()
.header(HttpHeaderNames.ACCEPT.toString(), Fixture.ACCEPT_RFC8621_VERSION_HEADER())
.body(request)
@@ -308,10 +303,9 @@ class ReadLevelTest {
@Test
void gettingEmailBodyShouldReadBlobTwice(GuiceJamesServer server) {
- StatementRecorder statementRecorder = new StatementRecorder();
- server.getProbe(TestingSessionProbe.class)
+ StatementRecorder statementRecorder = server.getProbe(TestingSessionProbe.class)
.getTestingSession()
- .recordStatements(statementRecorder);
+ .recordStatements();
String request = "{" +
" \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\"]," +
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org