[james-project] 09/09: JAMES-3924 Fix rebase issues during 3.7.x backport

[btellier]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.7.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 7d46378ef498039ac3eb37f6aa4319e192a9581f
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Sun Aug 27 01:37:46 2023 +0700

    JAMES-3924 Fix rebase issues during 3.7.x backport
---
 .../org/apache/james/backends/cassandra/StatementRecorder.java |  4 ++++
 .../org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java | 10 +++++++---
 2 files changed, 11 insertions(+), 3 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 840f7799bc..56d47830dc 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
@@ -55,6 +55,10 @@ public class StatementRecorder {
     private final StatementRecorder.Selector selector;
     private final ConcurrentLinkedDeque statements;
 
+    public StatementRecorder() {
+        this(Selector.ALL);
+    }
+
     StatementRecorder(Selector selector) {
         this.selector = selector;
         statements = new ConcurrentLinkedDeque();
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 b2aad2c3e9..5f06257f69 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
@@ -211,7 +211,7 @@ class RabbitMQMailQueueTest {
 
             int emailCount = 250;
 
-            StatementRecorder.Selector selector = 
preparedStatementStartingWith("UPDATE browsestart");
+            StatementRecorder.Selector selector = 
preparedStatementStartingWith("UPDATE browseStart");
             StatementRecorder statementRecorder = cassandraCluster.getConf()
                 .recordStatements(selector);
 
@@ -244,7 +244,7 @@ class RabbitMQMailQueueTest {
 
             int emailCount = 250;
 
-            StatementRecorder.Selector selector = 
preparedStatementStartingWith("UPDATE contentstart");
+            StatementRecorder.Selector selector = 
preparedStatementStartingWith("UPDATE contentStart");
             StatementRecorder statementRecorder = 
cassandraCluster.getConf().recordStatements(selector);
 
             clock.setInstant(IN_SLICE_1);
@@ -1005,7 +1005,11 @@ class RabbitMQMailQueueTest {
                 .concatMap(mailQueueItem ->
                     Mono.fromCallable(() -> {
                         
assertThat(mailQueueItem.getMail().getMessage().getContent()).isEqualTo(identicalContent);
-                        mailQueueItem.done(true);
+                        try {
+                            mailQueueItem.done(true);
+                        } catch (Exception e) {
+                            // Ignore
+                        }
                         return mailQueueItem;
                     }).subscribeOn(Schedulers.elastic()))
                 .collectList()


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org