[prev in list] [next in list] [prev in thread] [next in thread] 

List:       james-dev
Subject:    [1/9] james-project git commit: MAILBOX-321 Remove uneeded retrieveAttachment parameter
From:       aduprat () apache ! org
Date:       2017-11-30 14:22:21
Message-ID: d40915e711f64154afcfa79b193c4c00 () git ! apache ! org
[Download RAW message or body]

Repository: james-project
Updated Branches:
  refs/heads/master 4135794a1 -> a55693355


MAILBOX-321 Remove uneeded retrieveAttachment parameter


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

Branch: refs/heads/master
Commit: 58bd6d457eee3663477abb25eee52db817156c3d
Parents: 4135794
Author: benwa <btellier@linagora.com>
Authored: Tue Nov 28 10:08:36 2017 +0700
Committer: benwa <btellier@linagora.com>
Committed: Thu Nov 30 16:17:31 2017 +0700

----------------------------------------------------------------------
 .../mailbox/store/mail/model/impl/MessageParser.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/58bd6d45/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
                
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java \
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
 index 529442e..67df235 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
                
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
 @@ -35,7 +35,6 @@ import org.apache.james.mime4j.codec.DecodeMonitor;
 import org.apache.james.mime4j.dom.Body;
 import org.apache.james.mime4j.dom.Entity;
 import org.apache.james.mime4j.dom.Message;
-import org.apache.james.mime4j.dom.MessageWriter;
 import org.apache.james.mime4j.dom.Multipart;
 import org.apache.james.mime4j.dom.field.ContentDispositionField;
 import org.apache.james.mime4j.dom.field.ContentIdField;
@@ -88,7 +87,7 @@ public class MessageParser {
             Optional<ContentDispositionField> contentDisposition = \
readHeader(message, CONTENT_DISPOSITION, ContentDispositionField.class);  
             if (isMessageWithOnlyOneAttachment(contentDisposition)) {
-                return ImmutableList.of(retrieveAttachment(new \
DefaultMessageWriter(), message)); +                return \
ImmutableList.of(retrieveAttachment(message));  }
 
             if (body instanceof Multipart) {
@@ -108,14 +107,14 @@ public class MessageParser {
 
     private List<MessageAttachment> listAttachments(Multipart multipart, Context \
                context) throws IOException {
         ImmutableList.Builder<MessageAttachment> attachments = \
                ImmutableList.builder();
-        MessageWriter messageWriter = new DefaultMessageWriter();
+
         for (Entity entity : multipart.getBodyParts()) {
             if (isMultipart(entity)) {
                 attachments.addAll(listAttachments((Multipart) entity.getBody(), \
Context.fromEntity(entity)));  } else {
                 if (isAttachment(entity, context)) {
                     try {
-                        attachments.add(retrieveAttachment(messageWriter, entity));
+                        attachments.add(retrieveAttachment(entity));
                     } catch (IllegalStateException e) {
                         LOGGER.error("The attachment is not well-formed: " + \
e.getCause());  } catch (IOException e) {
@@ -127,7 +126,7 @@ public class MessageParser {
         return attachments.build();
     }
 
-    private MessageAttachment retrieveAttachment(MessageWriter messageWriter, Entity \
entity) throws IOException { +    private MessageAttachment retrieveAttachment(Entity \
                entity) throws IOException {
         Optional<ContentTypeField> contentTypeField = getContentTypeField(entity);
         Optional<ContentDispositionField> contentDispositionField = \
getContentDispositionField(entity);  Optional<String> contentType = \
contentType(contentTypeField); @@ -137,7 +136,7 @@ public class MessageParser {
 
         return MessageAttachment.builder()
                 .attachment(Attachment.builder()
-                    .bytes(getBytes(messageWriter, entity.getBody()))
+                    .bytes(getBytes(entity.getBody()))
                     .type(contentType.orElse(DEFAULT_CONTENT_TYPE))
                     .build())
                 .name(name.orElse(null))
@@ -220,7 +219,8 @@ public class MessageParser {
         return false;
     }
 
-    private byte[] getBytes(MessageWriter messageWriter, Body body) throws \
IOException { +    private byte[] getBytes(Body body) throws IOException {
+        DefaultMessageWriter messageWriter = new DefaultMessageWriter();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         messageWriter.writeBody(body, out);
         return out.toByteArray();


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


[prev in list] [next in list] [prev in thread] [next in thread]