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 2018/04/24 10:19:15 UTC
[1/3] james-project git commit: JAMES-2270 Replace some uses of
constants within MIME4J Charsets
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 <dt...@gmail.com>
Authored: Wed Jan 10 18:41:07 2018 -0800
Committer: benwa <bt...@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-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/3] james-project git commit: JAMES-2361 Add some debug logs in
ExtractMDNOriginalJMAPMessageId mailet
Posted by bt...@apache.org.
JAMES-2361 Add some debug logs in ExtractMDNOriginalJMAPMessageId mailet
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ff231f90
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ff231f90
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ff231f90
Branch: refs/heads/master
Commit: ff231f907c488088b50e0e0f21e8f06104cf73dc
Parents: b633b16
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Apr 23 12:03:11 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Tue Apr 24 17:18:37 2018 +0700
----------------------------------------------------------------------
.../james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ff231f90/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java
index 06cc2e5..29392d6 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java
@@ -87,6 +87,7 @@ public class ExtractMDNOriginalJMAPMessageId extends GenericMailet {
}
private void setJmapMessageIdAsHeader(MimeMessage mimeMessage, MessageId messageId) {
+ LOGGER.debug("Adding header {}:{}", X_JAMES_MDN_JMAP_MESSAGE_ID, messageId.serialize());
try {
mimeMessage.addHeader(X_JAMES_MDN_JMAP_MESSAGE_ID, messageId.serialize());
} catch (MessagingException e) {
@@ -95,6 +96,7 @@ public class ExtractMDNOriginalJMAPMessageId extends GenericMailet {
}
private Optional<MessageId> findMessageIdForRFC822MessageId(String messageId, MailAddress recipient) {
+ LOGGER.debug("Searching message {} for recipient {}", messageId, recipient.asPrettyString());
try {
MailboxSession session = mailboxManager.createSystemSession(recipient.asString());
int limit = 1;
@@ -109,6 +111,7 @@ public class ExtractMDNOriginalJMAPMessageId extends GenericMailet {
}
private Optional<MDNReport> parseReport(Entity report) {
+ LOGGER.debug("Parsing report");
try {
return new MDNReportParser().parse(((SingleBody)report.getBody()).getInputStream(), report.getCharset());
} catch (IOException e) {
@@ -122,6 +125,7 @@ public class ExtractMDNOriginalJMAPMessageId extends GenericMailet {
}
@VisibleForTesting Optional<Entity> extractReport(Message message) {
+ LOGGER.debug("Extracting report");
if (!message.isMultipart()) {
LOGGER.debug("MDN Message must be multipart");
return Optional.empty();
@@ -146,6 +150,7 @@ public class ExtractMDNOriginalJMAPMessageId extends GenericMailet {
}
private Optional<Message> parseMessage(MimeMessage mimeMessage) {
+ LOGGER.debug("Parsing message");
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
mimeMessage.writeTo(os);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/3] james-project git commit: JAMES-2270 Replace uses of
considered-deprecated constants
Posted by bt...@apache.org.
JAMES-2270 Replace uses of considered-deprecated constants
In Java 7+ projects, constants within com.google.common.base.Charsets
are considered deprecated, and the corresponding constants from
StandardCharsets are preferred.
These changes were suggested by the Extra Hints plugin for NetBeans:
http://plugins.netbeans.org/plugin/73447/
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d3b2abe1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d3b2abe1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d3b2abe1
Branch: refs/heads/master
Commit: d3b2abe164897c263044876be40c4fe706eda580
Parents: 2d2b398
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Wed Jan 10 18:39:59 2018 -0800
Committer: benwa <bt...@linagora.com>
Committed: Tue Apr 24 10:25:08 2018 +0700
----------------------------------------------------------------------
.../src/test/java/org/apache/james/FixingGhostMailboxTest.java | 3 +--
.../testing/src/main/java/org/apache/james/utils/FakeSmtp.java | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d3b2abe1/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index a7fa339..b640d44 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -78,7 +78,6 @@ import org.junit.rules.TestRule;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -133,7 +132,7 @@ public class FixingGhostMailboxTest {
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
http://git-wip-us.apache.org/repos/asf/james-project/blob/d3b2abe1/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
index b84ac9f..a0694d2 100644
--- a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
+++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
@@ -23,6 +23,7 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import java.nio.charset.StandardCharsets;
import java.util.function.Function;
import org.apache.james.util.docker.Images;
@@ -32,7 +33,6 @@ import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.google.common.base.Charsets;
import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder;
@@ -79,7 +79,7 @@ public class FakeSmtp implements TestRule {
return new RequestSpecBuilder()
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.setPort(80)
.setBaseUri("http://" + container.getContainerIp())
.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org