JAMES-2082 Improve V1ToV2Migration naming

apache · Jul 10, 2017 · 17ed1d4 · 17ed1d4
1 parent e5a1a35
commit 17ed1d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...andra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java b/...andra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
@@ -115,7 +115,7 @@ private Stream<SimpleMailboxMessage> findAsStream(List<MessageId> messageIds, Fe
             retrieveMessages(FetchType fetchType, ImmutableList<ComposedMessageIdWithMetaData> composedMessageIds) {
 
         return FluentFutureStream.of(messageDAOV2.retrieveMessages(composedMessageIds, fetchType, Limit.unlimited()))
-            .thenComposeOnAll(v1ToV2Migration::moveFromV1toV2)
+            .thenComposeOnAll(v1ToV2Migration::getFromV2orElseFromV1AfterMigration)
             .completableFuture();
     }
 

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
@@ -239,7 +239,7 @@ private CompletableFuture<Stream<Pair<MessageWithoutAttachment, Stream<MessageAt
         List<ComposedMessageIdWithMetaData> messageIds, FetchType fetchType, Limit limit) {
 
         return FluentFutureStream.of(messageDAOV2.retrieveMessages(messageIds, fetchType, limit))
-            .thenComposeOnAll(v1ToV2Migration::moveFromV1toV2)
+            .thenComposeOnAll(v1ToV2Migration::getFromV2orElseFromV1AfterMigration)
             .completableFuture();
     }
 

diff --git a/...ndra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2Migration.java b/...ndra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2Migration.java
@@ -58,7 +58,7 @@ public V1ToV2Migration(CassandraMessageDAO messageDAOV1, CassandraMessageDAOV2 m
     }
 
     public CompletableFuture<Pair<MessageWithoutAttachment, Stream<MessageAttachmentRepresentation>>>
-            moveFromV1toV2(CassandraMessageDAOV2.MessageResult result) {
+            getFromV2orElseFromV1AfterMigration(CassandraMessageDAOV2.MessageResult result) {
 
         if (result.isFound()) {
             return CompletableFuture.completedFuture(result.message());

diff --git a/.../src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java b/.../src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java
@@ -140,7 +140,7 @@ public void migrationShouldWorkWithoutAttachments() throws Exception {
             new PropertyBuilder(), ImmutableList.of());
         messageDAOV1.save(originalMessage).join();
 
-        testee.moveFromV1toV2(CassandraMessageDAOV2.notFound(metaData)).join();
+        testee.getFromV2orElseFromV1AfterMigration(CassandraMessageDAOV2.notFound(metaData)).join();
 
         Optional<CassandraMessageDAOV2.MessageResult> messageResult = messageDAOV2.retrieveMessages(metaDataList, MessageMapper.FetchType.Full, Limit.unlimited())
             .join()
@@ -162,7 +162,7 @@ public void migrationShouldWorkWithAttachments() throws Exception {
 
         messageDAOV1.save(originalMessage).join();
 
-        testee.moveFromV1toV2(CassandraMessageDAOV2.notFound(metaData)).join();
+        testee.getFromV2orElseFromV1AfterMigration(CassandraMessageDAOV2.notFound(metaData)).join();
 
         Optional<CassandraMessageDAOV2.MessageResult> messageResult = messageDAOV2.retrieveMessages(metaDataList, MessageMapper.FetchType.Full, Limit.unlimited())
             .join()