Repository: james-project Updated Branches: refs/heads/master 2d2b3988e -> ff231f907
JAMES-2270 Replace some uses of constants within MIME4J Charsets Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b633b168 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b633b168 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b633b168 Branch: refs/heads/master Commit: b633b168cd8f8913dd19b02853acc912e466eaf4 Parents: d3b2abe Author: Daniel Trebbien <dtrebb...@gmail.com> Authored: Wed Jan 10 18:41:07 2018 -0800 Committer: benwa <btell...@linagora.com> Committed: Tue Apr 24 10:25:08 2018 +0700 ---------------------------------------------------------------------- .../jmap/methods/MIMEMessageConverter.java | 10 ++++---- .../jmap/methods/MIMEMessageConverterTest.java | 24 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b633b168/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java index 90a3ebd..a994577 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java @@ -20,6 +20,7 @@ package org.apache.james.jmap.methods; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.List; import java.util.Locale; @@ -32,7 +33,6 @@ import org.apache.james.jmap.model.CreationMessage; import org.apache.james.jmap.model.CreationMessage.DraftEmailer; import org.apache.james.jmap.model.MessageFactory; import org.apache.james.mailbox.model.MessageAttachment; -import org.apache.james.mime4j.Charsets; import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.EncoderUtil; import org.apache.james.mime4j.codec.EncoderUtil.Usage; @@ -74,7 +74,7 @@ public class MIMEMessageConverter { private static final String PLAIN_TEXT_MEDIA_TYPE = MediaType.PLAIN_TEXT_UTF_8.withoutParameters().toString(); private static final String HTML_MEDIA_TYPE = MediaType.HTML_UTF_8.withoutParameters().toString(); - private static final NameValuePair UTF_8_CHARSET = new NameValuePair("charset", Charsets.UTF_8.name()); + private static final NameValuePair UTF_8_CHARSET = new NameValuePair("charset", StandardCharsets.UTF_8.name()); private static final String ALTERNATIVE_SUB_TYPE = "alternative"; private static final String MIXED_SUB_TYPE = "mixed"; private static final String FIELD_PARAMETERS_SEPARATOR = ";"; @@ -199,7 +199,7 @@ public class MIMEMessageConverter { String body = newMessage.getHtmlBody() .orElse(newMessage.getTextBody() .orElse("")); - return bodyFactory.textBody(body, Charsets.UTF_8); + return bodyFactory.textBody(body, StandardCharsets.UTF_8); } private Multipart createMultipart(CreationMessage newMessage, ImmutableList<MessageAttachment> messageAttachments) { @@ -242,7 +242,7 @@ public class MIMEMessageConverter { if (textBody.isPresent()) { builder.addBodyPart(BodyPartBuilder.create() .use(bodyFactory) - .setBody(textBody.get(), Charsets.UTF_8) + .setBody(textBody.get(), StandardCharsets.UTF_8) .setContentType(PLAIN_TEXT_MEDIA_TYPE, UTF_8_CHARSET) .setContentTransferEncoding(QUOTED_PRINTABLE)); } @@ -252,7 +252,7 @@ public class MIMEMessageConverter { if (htmlBody.isPresent()) { builder.addBodyPart(BodyPartBuilder.create() .use(bodyFactory) - .setBody(htmlBody.get(), Charsets.UTF_8) + .setBody(htmlBody.get(), StandardCharsets.UTF_8) .setContentType(HTML_MEDIA_TYPE, UTF_8_CHARSET) .setContentTransferEncoding(QUOTED_PRINTABLE)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b633b168/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/MIMEMessageConverterTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/MIMEMessageConverterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/MIMEMessageConverterTest.java index 43bd544..148a11c 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/MIMEMessageConverterTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/MIMEMessageConverterTest.java @@ -21,6 +21,7 @@ package org.apache.james.jmap.methods; import static org.assertj.core.api.Assertions.assertThat; +import java.nio.charset.StandardCharsets; import java.sql.Date; import java.time.Instant; import java.time.ZoneId; @@ -33,7 +34,6 @@ import org.apache.james.jmap.model.CreationMessageId; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.Cid; import org.apache.james.mailbox.model.MessageAttachment; -import org.apache.james.mime4j.Charsets; import org.apache.james.mime4j.codec.EncoderUtil; import org.apache.james.mime4j.codec.EncoderUtil.Usage; import org.apache.james.mime4j.dom.Entity; @@ -368,7 +368,7 @@ public class MIMEMessageConverterTest { public void convertToMimeShouldSetTextBodyWhenProvided() { // Given MIMEMessageConverter sut = new MIMEMessageConverter(); - TextBody expected = new BasicBodyFactory().textBody("Hello all!", Charsets.UTF_8); + TextBody expected = new BasicBodyFactory().textBody("Hello all!", StandardCharsets.UTF_8); CreationMessage testMessage = CreationMessage.builder() .mailboxId("dead-bada55") @@ -389,7 +389,7 @@ public class MIMEMessageConverterTest { public void convertToMimeShouldSetEmptyBodyWhenNoBodyProvided() { // Given MIMEMessageConverter sut = new MIMEMessageConverter(); - TextBody expected = new BasicBodyFactory().textBody("", Charsets.UTF_8); + TextBody expected = new BasicBodyFactory().textBody("", StandardCharsets.UTF_8); CreationMessage testMessage = CreationMessage.builder() .mailboxId("dead-bada55") @@ -409,7 +409,7 @@ public class MIMEMessageConverterTest { public void convertToMimeShouldSetHtmlBodyWhenProvided() { // Given MIMEMessageConverter sut = new MIMEMessageConverter(); - TextBody expected = new BasicBodyFactory().textBody("Hello <b>all</b>!", Charsets.UTF_8); + TextBody expected = new BasicBodyFactory().textBody("Hello <b>all</b>!", StandardCharsets.UTF_8); CreationMessage testMessage = CreationMessage.builder() .mailboxId("dead-bada55") @@ -481,7 +481,7 @@ public class MIMEMessageConverterTest { CreationMessageId.of("user|mailbox|1"), testMessage), ImmutableList.of()); // Then - String actual = new String(convert, Charsets.UTF_8); + String actual = new String(convert, StandardCharsets.UTF_8); assertThat(actual).startsWith(expectedHeaders); assertThat(actual).contains(expectedPart1); assertThat(actual).contains(expectedPart2); @@ -531,7 +531,7 @@ public class MIMEMessageConverterTest { public void convertToMimeShouldSetEmptyHtmlBodyWhenProvided() { // Given MIMEMessageConverter sut = new MIMEMessageConverter(); - TextBody expected = new BasicBodyFactory().textBody("", Charsets.UTF_8); + TextBody expected = new BasicBodyFactory().textBody("", StandardCharsets.UTF_8); CreationMessage testMessage = CreationMessage.builder() .mailboxId("dead-bada55") @@ -553,7 +553,7 @@ public class MIMEMessageConverterTest { public void convertToMimeShouldSetEmptyTextBodyWhenProvided() { // Given MIMEMessageConverter sut = new MIMEMessageConverter(); - TextBody expected = new BasicBodyFactory().textBody("", Charsets.UTF_8); + TextBody expected = new BasicBodyFactory().textBody("", StandardCharsets.UTF_8); CreationMessage testMessage = CreationMessage.builder() .mailboxId("dead-bada55") @@ -586,7 +586,7 @@ public class MIMEMessageConverterTest { String expectedCID = "cid"; String expectedMimeType = "image/png"; String text = "123456"; - TextBody expectedBody = new BasicBodyFactory().textBody(text.getBytes(), Charsets.UTF_8); + TextBody expectedBody = new BasicBodyFactory().textBody(text.getBytes(), StandardCharsets.UTF_8); MessageAttachment attachment = MessageAttachment.builder() .attachment(org.apache.james.mailbox.model.Attachment.builder() .attachmentId(AttachmentId.from("blodId")) @@ -626,13 +626,13 @@ public class MIMEMessageConverterTest { .textBody("Hello all!") .htmlBody("Hello <b>all<b>!") .build(); - TextBody expectedTextBody = new BasicBodyFactory().textBody("Hello all!".getBytes(), Charsets.UTF_8); - TextBody expectedHtmlBody = new BasicBodyFactory().textBody("Hello <b>all<b>!".getBytes(), Charsets.UTF_8); + TextBody expectedTextBody = new BasicBodyFactory().textBody("Hello all!".getBytes(), StandardCharsets.UTF_8); + TextBody expectedHtmlBody = new BasicBodyFactory().textBody("Hello <b>all<b>!".getBytes(), StandardCharsets.UTF_8); String expectedCID = "cid"; String expectedMimeType = "image/png"; String text = "123456"; - TextBody expectedAttachmentBody = new BasicBodyFactory().textBody(text.getBytes(), Charsets.UTF_8); + TextBody expectedAttachmentBody = new BasicBodyFactory().textBody(text.getBytes(), StandardCharsets.UTF_8); MessageAttachment attachment = MessageAttachment.builder() .attachment(org.apache.james.mailbox.model.Attachment.builder() .attachmentId(AttachmentId.from("blodId")) @@ -689,7 +689,7 @@ public class MIMEMessageConverterTest { String expectedEncodedContent = "Some non-ASCII characters: =C3=A1=C3=84=C3=8E=C3=9F=C3=BF"; // Then - String actual = new String(convert, Charsets.US_ASCII); + String actual = new String(convert, StandardCharsets.US_ASCII); assertThat(actual).contains(expectedEncodedContent); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
