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 bt...@apache.org on 2017/08/23 02:33:50 UTC
[2/3] james-project git commit: JAMES-2126 Rely on Mime4J helpers in
MessageParser
JAMES-2126 Rely on Mime4J helpers in MessageParser
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/42cfec1d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/42cfec1d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/42cfec1d
Branch: refs/heads/master
Commit: 42cfec1d0554954054fad88508b6c8e5b3157836
Parents: 4be31c3
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 22 09:49:56 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 23 09:32:45 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/store/mail/model/impl/MessageParser.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/42cfec1d/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 378da5a..f5aabf7 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
@@ -31,8 +31,6 @@ import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.Cid;
import org.apache.james.mailbox.model.MessageAttachment;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.codec.DecodeMonitor;
-import org.apache.james.mime4j.codec.DecoderUtil;
import org.apache.james.mime4j.dom.Body;
import org.apache.james.mime4j.dom.Entity;
import org.apache.james.mime4j.dom.Message;
@@ -46,6 +44,7 @@ import org.apache.james.mime4j.message.DefaultMessageBuilder;
import org.apache.james.mime4j.message.DefaultMessageWriter;
import org.apache.james.mime4j.stream.Field;
import org.apache.james.mime4j.stream.MimeConfig;
+import org.apache.james.mime4j.util.MimeUtil;
import org.apache.james.util.OptionalConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -168,11 +167,7 @@ public class MessageParser {
private Optional<String> name(Optional<ContentTypeField> contentTypeField) {
return contentTypeField
.flatMap(field -> Optional.ofNullable(field.getParameter("name"))
- .map(
- fieldValue -> {
- DecodeMonitor monitor = null;
- return DecoderUtil.decodeEncodedWords(fieldValue, monitor);
- }));
+ .map(MimeUtil::unscrambleHeaderValue));
}
private Optional<Cid> cid(Optional<ContentIdField> contentIdField) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org