MAILBOX-297 add containsFailedResults to FlagsUpdateStageResult

apache · May 29, 2017 · 75cdccc · 75cdccc
1 parent 32fa054
commit 75cdccc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/...ssandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/...ssandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -282,7 +282,7 @@ public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator
 
         FlagsUpdateStageResult firstResult = runUpdateStage(mailboxId, toBeUpdated, flagUpdateCalculator);
         FlagsUpdateStageResult finalResult = handleUpdatesStagedRetry(mailboxId, flagUpdateCalculator, firstResult);
-        if (!finalResult.getFailed().isEmpty()) {
+        if (finalResult.containsFailedResults()) {
             LOGGER.error("Can not update following UIDs {} for mailbox {}", finalResult.getFailed(), mailboxId.asUuid());
         }
         return finalResult.getSucceeded().iterator();
@@ -291,7 +291,7 @@ public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator
     private FlagsUpdateStageResult handleUpdatesStagedRetry(CassandraId mailboxId, FlagsUpdateCalculator flagUpdateCalculator, FlagsUpdateStageResult firstResult) {
         FlagsUpdateStageResult globalResult = firstResult;
         int retryCount = 0;
-        while (retryCount < maxRetries && !globalResult.getFailed().isEmpty()) {
+        while (retryCount < maxRetries && globalResult.containsFailedResults()) {
             retryCount++;
             FlagsUpdateStageResult stageResult = retryUpdatesStage(mailboxId, flagUpdateCalculator, globalResult.getFailed());
             globalResult = globalResult.keepSucceded().merge(stageResult);

diff --git a/...a/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResult.java b/...a/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResult.java
@@ -70,6 +70,10 @@ public FlagsUpdateStageResult merge(FlagsUpdateStageResult other) {
                 .build());
     }
 
+    public boolean containsFailedResults() {
+        return !failed.isEmpty();
+    }
+
     public FlagsUpdateStageResult keepSucceded() {
         return new FlagsUpdateStageResult(ImmutableList.of(), succeeded);
     }

diff --git a/...c/test/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResultTest.java b/...c/test/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResultTest.java
@@ -131,4 +131,17 @@ public void keepSuccessShouldDiscardFailedUids() {
             .isEqualTo(FlagsUpdateStageResult.success(UPDATED_FLAGS));
     }
 
+    @Test
+    public void containsFailedResultsShouldReturnTrueWhenFailed() {
+        assertThat(FlagsUpdateStageResult.fail(UID).containsFailedResults())
+            .isTrue();
+    }
+
+
+    @Test
+    public void containsFailedResultsShouldReturnFalseWhenSucceeded() {
+        assertThat(FlagsUpdateStageResult.success(UPDATED_FLAGS).containsFailedResults())
+            .isFalse();
+    }
+
 }