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 ma...@apache.org on 2017/09/11 08:56:34 UTC

[11/18] james-project git commit: fixup! MAILBOX-304 Piloting blobDAO should be a responsibility of AttachmentMapper

fixup! MAILBOX-304 Piloting blobDAO should be a responsibility of AttachmentMapper


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/36f447f6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/36f447f6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/36f447f6

Branch: refs/heads/master
Commit: 36f447f6c78c9428c12f5d1b9cd89921829831bd
Parents: 2eb7730
Author: benwa <bt...@linagora.com>
Authored: Thu Sep 7 15:54:41 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Sep 7 15:54:41 2017 +0700

----------------------------------------------------------------------
 .../james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java | 2 +-
 .../mailbox/cassandra/mail/CassandraAttachmentMapper.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/36f447f6/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
index 98cd0e5..96dd8ae 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
@@ -65,7 +65,7 @@ public class CassandraAttachmentDAOV2 {
             return attachmentId;
         }
 
-        public org.apache.james.mailbox.cassandra.ids.BlobId getBlobId() {
+        public BlobId getBlobId() {
             return blobId;
         }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/36f447f6/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
index 3d5e256..f0429ff 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
@@ -75,11 +75,11 @@ public class CassandraAttachmentMapper implements AttachmentMapper {
     }
 
     @Nullable
-    private CompletionStage<Optional<Attachment>> retrievePayload(Optional<DAOAttachmentModel> input) {
-        if (!input.isPresent()) {
+    private CompletionStage<Optional<Attachment>> retrievePayload(Optional<DAOAttachmentModel> optionalModel) {
+        if (!optionalModel.isPresent()) {
             return CompletableFuture.completedFuture(Optional.empty());
         }
-        DAOAttachmentModel model = input.get();
+        DAOAttachmentModel model = optionalModel.get();
         return blobsDAO.read(model.getBlobId())
             .thenApply(bytes -> Optional.of(model.toAttachment(bytes)));
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org