JAMES-1916 Extract constants
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c59faa58 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c59faa58 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c59faa58 Branch: refs/heads/master Commit: c59faa58425d67c642208e442dbed194d5db10d9 Parents: 5fd8641 Author: Raphael Ouazana <raphael.ouaz...@linagora.com> Authored: Fri Jan 27 17:23:53 2017 +0100 Committer: Raphael Ouazana <raphael.ouaz...@linagora.com> Committed: Fri Jan 27 17:23:53 2017 +0100 ---------------------------------------------------------------------- .../james/jmap/model/MessageContentExtractor.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c59faa58/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageContentExtractor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageContentExtractor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageContentExtractor.java index b5baf53..5bc3813 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageContentExtractor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageContentExtractor.java @@ -38,6 +38,9 @@ import com.github.fge.lambdas.functions.ThrowingFunction; public class MessageContentExtractor { public static final String CONTENT_ID = "Content-ID"; + public static final String MULTIPART_ALTERNATIVE = "multipart/alternative"; + public static final String TEXT_HTML = "text/html"; + public static final String TEXT_PLAIN = "text/plain"; public MessageContent extract(org.apache.james.mime4j.dom.Message message) throws IOException { Body body = message.getBody(); @@ -52,7 +55,7 @@ public class MessageContentExtractor { private MessageContent parseTextBody(Entity entity, TextBody textBody) throws IOException { String bodyContent = asString(textBody); - if ("text/html".equals(entity.getMimeType())) { + if (TEXT_HTML.equals(entity.getMimeType())) { return MessageContent.ofHtmlOnly(bodyContent); } return MessageContent.ofTextOnly(bodyContent); @@ -68,7 +71,7 @@ public class MessageContentExtractor { private MessageContent parseMultipartContent(Entity entity, Multipart multipart) throws IOException { switch(entity.getMimeType()) { - case "multipart/alternative": + case MULTIPART_ALTERNATIVE: return retrieveHtmlAndPlainTextContent(multipart); default: return retrieveFirstReadablePart(multipart); @@ -90,8 +93,8 @@ public class MessageContentExtractor { } private MessageContent retrieveHtmlAndPlainTextContent(Multipart multipart) throws IOException { - Optional<String> textBody = getFirstMatchingTextBody(multipart, "text/plain"); - Optional<String> htmlBody = getFirstMatchingTextBody(multipart, "text/html"); + Optional<String> textBody = getFirstMatchingTextBody(multipart, TEXT_PLAIN); + Optional<String> htmlBody = getFirstMatchingTextBody(multipart, TEXT_HTML); MessageContent directChildTextBodies = new MessageContent(textBody, htmlBody); if (!directChildTextBodies.isComplete()) { MessageContent fromInnerMultipart = parseFirstFoundMultipart(multipart); @@ -111,10 +114,10 @@ public class MessageContentExtractor { } private MessageContent returnIfReadable(Entity entity) throws IOException { - if (entity.getMimeType().equals("text/html") && entity.getBody() instanceof TextBody) { + if (TEXT_HTML.equals(entity.getMimeType()) && entity.getBody() instanceof TextBody) { return MessageContent.ofHtmlOnly(asString((TextBody)entity.getBody())); } - if (entity.getMimeType().equals("text/plain") && entity.getBody() instanceof TextBody) { + if (TEXT_PLAIN.equals(entity.getMimeType()) && entity.getBody() instanceof TextBody) { return MessageContent.ofTextOnly(asString((TextBody)entity.getBody())); } if (entity.isMultipart() && entity.getBody() instanceof Multipart) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
